diff --git a/Source/Bind/Structures/Function.cs b/Source/Bind/Structures/Function.cs
index 47813f6a..71884b6f 100644
--- a/Source/Bind/Structures/Function.cs
+++ b/Source/Bind/Structures/Function.cs
@@ -608,9 +608,9 @@ namespace Bind.Structures
         {
             int ret = Name.CompareTo(other.Name);
             if (ret == 0)
-                ret = Parameters.ToString().CompareTo(other.Parameters.ToString());
+                ret = Parameters.CompareTo(other.Parameters);
             if (ret == 0)
-                ret = ReturnType.ToString().CompareTo(other.ReturnType.ToString());
+                ret = ReturnType.CompareTo(other.ReturnType);
             return ret;
         }
 
diff --git a/Source/Bind/Structures/Parameter.cs b/Source/Bind/Structures/Parameter.cs
index f9c09ad1..1f1249e5 100644
--- a/Source/Bind/Structures/Parameter.cs
+++ b/Source/Bind/Structures/Parameter.cs
@@ -15,7 +15,7 @@ namespace Bind.Structures
     /// <summary>
     /// Represents a single parameter of an opengl function.
     /// </summary>
-    public class Parameter : Type
+    public class Parameter : Type, IComparable<Parameter>
     {
         string cache;
         bool rebuild;
@@ -350,12 +350,24 @@ namespace Bind.Structures
         }
         
         #endregion
+
+        #region IComparable<Parameter> Members
+
+        public int CompareTo(Parameter other)
+        {
+            int result = base.CompareTo(other);
+            if (result == 0)
+                result = Name.CompareTo(other.Name);
+            return result;
+        }
+
+        #endregion
     }
 
     /// <summary>
     /// Holds the parameter list of an opengl function.
     /// </summary>
-    public class ParameterCollection : List<Parameter>
+    public class ParameterCollection : List<Parameter>, IComparable<ParameterCollection>
     {
         string cache = String.Empty;
         string callStringCache = String.Empty;
@@ -642,5 +654,31 @@ namespace Bind.Structures
                     return true;
             return false;
         }
+
+        #region IComparable<ParameterCollection> Members
+
+        public int CompareTo(ParameterCollection other)
+        {
+            if (Count < other.Count)
+            {
+                return -1;
+            }
+            else if (Count > other.Count)
+            {
+                return 1;
+            }
+            else
+            {
+                for (int i = 0; i < Count; i++)
+                {
+                    int result = this[i].CompareTo(other[i]);
+                    if (result != 0)
+                        return result;
+                }
+                return 0;
+            }
+        }
+
+        #endregion
     }
 }
diff --git a/Source/Bind/Structures/Type.cs b/Source/Bind/Structures/Type.cs
index 1b4564da..3a8b814c 100644
--- a/Source/Bind/Structures/Type.cs
+++ b/Source/Bind/Structures/Type.cs
@@ -11,7 +11,7 @@ using System.Xml.XPath;
 
 namespace Bind.Structures
 {
-    public class Type
+    public class Type : IComparable<Type>
     {
         internal static Dictionary<string, string> GLTypes;
         internal static Dictionary<string, string> CSTypes;
@@ -461,5 +461,28 @@ namespace Bind.Structures
         }
 
         #endregion
+
+        #region IComparable<Type> Members
+
+        public int CompareTo(Type other)
+        {
+            // Make sure that Pointer parameters are sorted last to avoid bug [#1098].
+            // The rest of the comparisons are not important, but they are there to
+            // guarantee a stable order between program executions.
+            int result = this.CurrentType.CompareTo(other.CurrentType);
+            if (result == 0)
+                result = Pointer.CompareTo(other.Pointer);
+            if (result == 0)
+                result = Reference.CompareTo(other.Reference);
+            if (result == 0)
+                result = Array.CompareTo(other.Array);
+            if (result == 0)
+                result = CLSCompliant.CompareTo(other.CLSCompliant);
+            if (result == 0)
+                result = ElementCount.CompareTo(other.ElementCount);
+            return result;
+        }
+
+        #endregion
     }
 }
diff --git a/Source/OpenTK/Graphics/ES20/ES.cs b/Source/OpenTK/Graphics/ES20/ES.cs
index f3d26c14..293ebced 100644
--- a/Source/OpenTK/Graphics/ES20/ES.cs
+++ b/Source/OpenTK/Graphics/ES20/ES.cs
@@ -69,21 +69,6 @@ namespace OpenTK.Graphics.ES20
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeletePerfMonitorsAMD")]
-            public static 
-            unsafe void DeletePerfMonitors(Int32 n, Int32* monitors)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glDeletePerfMonitorsAMD((Int32)n, (UInt32*)monitors);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeletePerfMonitorsAMD")]
             public static 
             void DeletePerfMonitors(Int32 n, Int32[] monitors)
@@ -124,6 +109,42 @@ namespace OpenTK.Graphics.ES20
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeletePerfMonitorsAMD")]
+            public static 
+            unsafe void DeletePerfMonitors(Int32 n, Int32* monitors)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glDeletePerfMonitorsAMD((Int32)n, (UInt32*)monitors);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeletePerfMonitorsAMD")]
+            public static 
+            void DeletePerfMonitors(Int32 n, UInt32[] monitors)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* monitors_ptr = monitors)
+                    {
+                        Delegates.glDeletePerfMonitorsAMD((Int32)n, (UInt32*)monitors_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeletePerfMonitorsAMD")]
             public static 
@@ -160,27 +181,6 @@ namespace OpenTK.Graphics.ES20
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeletePerfMonitorsAMD")]
-            public static 
-            void DeletePerfMonitors(Int32 n, UInt32[] monitors)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* monitors_ptr = monitors)
-                    {
-                        Delegates.glDeletePerfMonitorsAMD((Int32)n, (UInt32*)monitors_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glEndPerfMonitorAMD")]
             public static 
             void EndPerfMonitor(Int32 monitor)
@@ -210,21 +210,6 @@ namespace OpenTK.Graphics.ES20
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenPerfMonitorsAMD")]
-            public static 
-            unsafe void GenPerfMonitors(Int32 n, [OutAttribute] Int32* monitors)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGenPerfMonitorsAMD((Int32)n, (UInt32*)monitors);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenPerfMonitorsAMD")]
             public static 
             void GenPerfMonitors(Int32 n, [OutAttribute] Int32[] monitors)
@@ -269,29 +254,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenPerfMonitorsAMD")]
             public static 
-            void GenPerfMonitors(Int32 n, [OutAttribute] out UInt32 monitors)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* monitors_ptr = &monitors)
-                    {
-                        Delegates.glGenPerfMonitorsAMD((Int32)n, (UInt32*)monitors_ptr);
-                        monitors = *monitors_ptr;
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenPerfMonitorsAMD")]
-            public static 
-            unsafe void GenPerfMonitors(Int32 n, [OutAttribute] UInt32* monitors)
+            unsafe void GenPerfMonitors(Int32 n, [OutAttribute] Int32* monitors)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -325,15 +288,37 @@ namespace OpenTK.Graphics.ES20
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetPerfMonitorCounterDataAMD")]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenPerfMonitorsAMD")]
             public static 
-            unsafe void GetPerfMonitorCounterData(Int32 monitor, OpenTK.Graphics.ES20.All pname, Int32 dataSize, [OutAttribute] Int32* data, [OutAttribute] Int32* bytesWritten)
+            void GenPerfMonitors(Int32 n, [OutAttribute] out UInt32 monitors)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetPerfMonitorCounterDataAMD((UInt32)monitor, (OpenTK.Graphics.ES20.All)pname, (Int32)dataSize, (UInt32*)data, (Int32*)bytesWritten);
+                unsafe
+                {
+                    fixed (UInt32* monitors_ptr = &monitors)
+                    {
+                        Delegates.glGenPerfMonitorsAMD((Int32)n, (UInt32*)monitors_ptr);
+                        monitors = *monitors_ptr;
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenPerfMonitorsAMD")]
+            public static 
+            unsafe void GenPerfMonitors(Int32 n, [OutAttribute] UInt32* monitors)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGenPerfMonitorsAMD((Int32)n, (UInt32*)monitors);
                 #if DEBUG
                 }
                 #endif
@@ -383,6 +368,43 @@ namespace OpenTK.Graphics.ES20
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetPerfMonitorCounterDataAMD")]
+            public static 
+            unsafe void GetPerfMonitorCounterData(Int32 monitor, OpenTK.Graphics.ES20.All pname, Int32 dataSize, [OutAttribute] Int32* data, [OutAttribute] Int32* bytesWritten)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetPerfMonitorCounterDataAMD((UInt32)monitor, (OpenTK.Graphics.ES20.All)pname, (Int32)dataSize, (UInt32*)data, (Int32*)bytesWritten);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetPerfMonitorCounterDataAMD")]
+            public static 
+            void GetPerfMonitorCounterData(UInt32 monitor, OpenTK.Graphics.ES20.All pname, Int32 dataSize, [OutAttribute] UInt32[] data, [OutAttribute] Int32[] bytesWritten)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* data_ptr = data)
+                    fixed (Int32* bytesWritten_ptr = bytesWritten)
+                    {
+                        Delegates.glGetPerfMonitorCounterDataAMD((UInt32)monitor, (OpenTK.Graphics.ES20.All)pname, (Int32)dataSize, (UInt32*)data_ptr, (Int32*)bytesWritten_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetPerfMonitorCounterDataAMD")]
             public static 
@@ -422,23 +444,15 @@ namespace OpenTK.Graphics.ES20
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetPerfMonitorCounterDataAMD")]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetPerfMonitorCounterInfoAMD")]
             public static 
-            void GetPerfMonitorCounterData(UInt32 monitor, OpenTK.Graphics.ES20.All pname, Int32 dataSize, [OutAttribute] UInt32[] data, [OutAttribute] Int32[] bytesWritten)
+            void GetPerfMonitorCounterInfo(Int32 group, Int32 counter, OpenTK.Graphics.ES20.All pname, [OutAttribute] IntPtr data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                unsafe
-                {
-                    fixed (UInt32* data_ptr = data)
-                    fixed (Int32* bytesWritten_ptr = bytesWritten)
-                    {
-                        Delegates.glGetPerfMonitorCounterDataAMD((UInt32)monitor, (OpenTK.Graphics.ES20.All)pname, (Int32)dataSize, (UInt32*)data_ptr, (Int32*)bytesWritten_ptr);
-                    }
-                }
+                Delegates.glGetPerfMonitorCounterInfoAMD((UInt32)group, (UInt32)counter, (OpenTK.Graphics.ES20.All)pname, (IntPtr)data);
                 #if DEBUG
                 }
                 #endif
@@ -446,31 +460,7 @@ namespace OpenTK.Graphics.ES20
 
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetPerfMonitorCounterInfoAMD")]
             public static 
-            void GetPerfMonitorCounterInfo<T3>(Int32 group, Int32 counter, OpenTK.Graphics.ES20.All pname, [InAttribute, OutAttribute] ref T3 data)
-                where T3 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetPerfMonitorCounterInfoAMD((UInt32)group, (UInt32)counter, (OpenTK.Graphics.ES20.All)pname, (IntPtr)data_ptr.AddrOfPinnedObject());
-                    data = (T3)data_ptr.Target;
-                }
-                finally
-                {
-                    data_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetPerfMonitorCounterInfoAMD")]
-            public static 
-            void GetPerfMonitorCounterInfo<T3>(Int32 group, Int32 counter, OpenTK.Graphics.ES20.All pname, [InAttribute, OutAttribute] T3[,,] data)
+            void GetPerfMonitorCounterInfo<T3>(Int32 group, Int32 counter, OpenTK.Graphics.ES20.All pname, [InAttribute, OutAttribute] T3[] data)
                 where T3 : struct
             {
                 #if DEBUG
@@ -516,7 +506,7 @@ namespace OpenTK.Graphics.ES20
 
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetPerfMonitorCounterInfoAMD")]
             public static 
-            void GetPerfMonitorCounterInfo<T3>(Int32 group, Int32 counter, OpenTK.Graphics.ES20.All pname, [InAttribute, OutAttribute] T3[] data)
+            void GetPerfMonitorCounterInfo<T3>(Int32 group, Int32 counter, OpenTK.Graphics.ES20.All pname, [InAttribute, OutAttribute] T3[,,] data)
                 where T3 : struct
             {
                 #if DEBUG
@@ -539,22 +529,7 @@ namespace OpenTK.Graphics.ES20
 
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetPerfMonitorCounterInfoAMD")]
             public static 
-            void GetPerfMonitorCounterInfo(Int32 group, Int32 counter, OpenTK.Graphics.ES20.All pname, [OutAttribute] IntPtr data)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetPerfMonitorCounterInfoAMD((UInt32)group, (UInt32)counter, (OpenTK.Graphics.ES20.All)pname, (IntPtr)data);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetPerfMonitorCounterInfoAMD")]
-            public static 
-            void GetPerfMonitorCounterInfo<T3>(UInt32 group, UInt32 counter, OpenTK.Graphics.ES20.All pname, [InAttribute, OutAttribute] ref T3 data)
+            void GetPerfMonitorCounterInfo<T3>(Int32 group, Int32 counter, OpenTK.Graphics.ES20.All pname, [InAttribute, OutAttribute] ref T3 data)
                 where T3 : struct
             {
                 #if DEBUG
@@ -579,7 +554,22 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetPerfMonitorCounterInfoAMD")]
             public static 
-            void GetPerfMonitorCounterInfo<T3>(UInt32 group, UInt32 counter, OpenTK.Graphics.ES20.All pname, [InAttribute, OutAttribute] T3[,,] data)
+            void GetPerfMonitorCounterInfo(UInt32 group, UInt32 counter, OpenTK.Graphics.ES20.All pname, [OutAttribute] IntPtr data)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetPerfMonitorCounterInfoAMD((UInt32)group, (UInt32)counter, (OpenTK.Graphics.ES20.All)pname, (IntPtr)data);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetPerfMonitorCounterInfoAMD")]
+            public static 
+            void GetPerfMonitorCounterInfo<T3>(UInt32 group, UInt32 counter, OpenTK.Graphics.ES20.All pname, [InAttribute, OutAttribute] T3[] data)
                 where T3 : struct
             {
                 #if DEBUG
@@ -627,7 +617,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetPerfMonitorCounterInfoAMD")]
             public static 
-            void GetPerfMonitorCounterInfo<T3>(UInt32 group, UInt32 counter, OpenTK.Graphics.ES20.All pname, [InAttribute, OutAttribute] T3[] data)
+            void GetPerfMonitorCounterInfo<T3>(UInt32 group, UInt32 counter, OpenTK.Graphics.ES20.All pname, [InAttribute, OutAttribute] T3[,,] data)
                 where T3 : struct
             {
                 #if DEBUG
@@ -651,28 +641,23 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetPerfMonitorCounterInfoAMD")]
             public static 
-            void GetPerfMonitorCounterInfo(UInt32 group, UInt32 counter, OpenTK.Graphics.ES20.All pname, [OutAttribute] IntPtr data)
+            void GetPerfMonitorCounterInfo<T3>(UInt32 group, UInt32 counter, OpenTK.Graphics.ES20.All pname, [InAttribute, OutAttribute] ref T3 data)
+                where T3 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetPerfMonitorCounterInfoAMD((UInt32)group, (UInt32)counter, (OpenTK.Graphics.ES20.All)pname, (IntPtr)data);
-                #if DEBUG
+                GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetPerfMonitorCounterInfoAMD((UInt32)group, (UInt32)counter, (OpenTK.Graphics.ES20.All)pname, (IntPtr)data_ptr.AddrOfPinnedObject());
+                    data = (T3)data_ptr.Target;
                 }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetPerfMonitorCountersAMD")]
-            public static 
-            unsafe void GetPerfMonitorCounters(Int32 group, [OutAttribute] Int32* numCounters, [OutAttribute] Int32* maxActiveCounters, Int32 counterSize, [OutAttribute] Int32* counters)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                finally
                 {
-                #endif
-                Delegates.glGetPerfMonitorCountersAMD((UInt32)group, (Int32*)numCounters, (Int32*)maxActiveCounters, (Int32)counterSize, (UInt32*)counters);
+                    data_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -728,7 +713,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetPerfMonitorCountersAMD")]
             public static 
-            unsafe void GetPerfMonitorCounters(UInt32 group, [OutAttribute] Int32* numCounters, [OutAttribute] Int32* maxActiveCounters, Int32 counterSize, [OutAttribute] UInt32* counters)
+            unsafe void GetPerfMonitorCounters(Int32 group, [OutAttribute] Int32* numCounters, [OutAttribute] Int32* maxActiveCounters, Int32 counterSize, [OutAttribute] Int32* counters)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -790,15 +775,15 @@ namespace OpenTK.Graphics.ES20
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetPerfMonitorCounterStringAMD")]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetPerfMonitorCountersAMD")]
             public static 
-            unsafe void GetPerfMonitorCounterString(Int32 group, Int32 counter, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder counterString)
+            unsafe void GetPerfMonitorCounters(UInt32 group, [OutAttribute] Int32* numCounters, [OutAttribute] Int32* maxActiveCounters, Int32 counterSize, [OutAttribute] UInt32* counters)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetPerfMonitorCounterStringAMD((UInt32)group, (UInt32)counter, (Int32)bufSize, (Int32*)length, (StringBuilder)counterString);
+                Delegates.glGetPerfMonitorCountersAMD((UInt32)group, (Int32*)numCounters, (Int32*)maxActiveCounters, (Int32)counterSize, (UInt32*)counters);
                 #if DEBUG
                 }
                 #endif
@@ -848,7 +833,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetPerfMonitorCounterStringAMD")]
             public static 
-            unsafe void GetPerfMonitorCounterString(UInt32 group, UInt32 counter, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder counterString)
+            unsafe void GetPerfMonitorCounterString(Int32 group, Int32 counter, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder counterString)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -904,30 +889,15 @@ namespace OpenTK.Graphics.ES20
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetPerfMonitorGroupsAMD")]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetPerfMonitorCounterStringAMD")]
             public static 
-            unsafe void GetPerfMonitorGroup([OutAttribute] Int32* numGroups, Int32 groupsSize, [OutAttribute] Int32* groups)
+            unsafe void GetPerfMonitorCounterString(UInt32 group, UInt32 counter, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder counterString)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetPerfMonitorGroupsAMD((Int32*)numGroups, (Int32)groupsSize, (UInt32*)groups);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetPerfMonitorGroupsAMD")]
-            public static 
-            unsafe void GetPerfMonitorGroup([OutAttribute] Int32* numGroups, Int32 groupsSize, [OutAttribute] UInt32* groups)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetPerfMonitorGroupsAMD((Int32*)numGroups, (Int32)groupsSize, (UInt32*)groups);
+                Delegates.glGetPerfMonitorCounterStringAMD((UInt32)group, (UInt32)counter, (Int32)bufSize, (Int32*)length, (StringBuilder)counterString);
                 #if DEBUG
                 }
                 #endif
@@ -1024,15 +994,30 @@ namespace OpenTK.Graphics.ES20
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetPerfMonitorGroupStringAMD")]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetPerfMonitorGroupsAMD")]
             public static 
-            unsafe void GetPerfMonitorGroupString(Int32 group, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder groupString)
+            unsafe void GetPerfMonitorGroup([OutAttribute] Int32* numGroups, Int32 groupsSize, [OutAttribute] Int32* groups)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetPerfMonitorGroupStringAMD((UInt32)group, (Int32)bufSize, (Int32*)length, (StringBuilder)groupString);
+                Delegates.glGetPerfMonitorGroupsAMD((Int32*)numGroups, (Int32)groupsSize, (UInt32*)groups);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetPerfMonitorGroupsAMD")]
+            public static 
+            unsafe void GetPerfMonitorGroup([OutAttribute] Int32* numGroups, Int32 groupsSize, [OutAttribute] UInt32* groups)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetPerfMonitorGroupsAMD((Int32*)numGroups, (Int32)groupsSize, (UInt32*)groups);
                 #if DEBUG
                 }
                 #endif
@@ -1082,7 +1067,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetPerfMonitorGroupStringAMD")]
             public static 
-            unsafe void GetPerfMonitorGroupString(UInt32 group, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder groupString)
+            unsafe void GetPerfMonitorGroupString(Int32 group, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder groupString)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -1138,15 +1123,15 @@ namespace OpenTK.Graphics.ES20
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glSelectPerfMonitorCountersAMD")]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetPerfMonitorGroupStringAMD")]
             public static 
-            unsafe void SelectPerfMonitorCounters(Int32 monitor, bool enable, Int32 group, Int32 numCounters, Int32* countersList)
+            unsafe void GetPerfMonitorGroupString(UInt32 group, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder groupString)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glSelectPerfMonitorCountersAMD((UInt32)monitor, (bool)enable, (UInt32)group, (Int32)numCounters, (UInt32*)countersList);
+                Delegates.glGetPerfMonitorGroupStringAMD((UInt32)group, (Int32)bufSize, (Int32*)length, (StringBuilder)groupString);
                 #if DEBUG
                 }
                 #endif
@@ -1192,6 +1177,42 @@ namespace OpenTK.Graphics.ES20
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glSelectPerfMonitorCountersAMD")]
+            public static 
+            unsafe void SelectPerfMonitorCounters(Int32 monitor, bool enable, Int32 group, Int32 numCounters, Int32* countersList)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glSelectPerfMonitorCountersAMD((UInt32)monitor, (bool)enable, (UInt32)group, (Int32)numCounters, (UInt32*)countersList);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glSelectPerfMonitorCountersAMD")]
+            public static 
+            void SelectPerfMonitorCounters(UInt32 monitor, bool enable, UInt32 group, Int32 numCounters, UInt32[] countersList)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* countersList_ptr = countersList)
+                    {
+                        Delegates.glSelectPerfMonitorCountersAMD((UInt32)monitor, (bool)enable, (UInt32)group, (Int32)numCounters, (UInt32*)countersList_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glSelectPerfMonitorCountersAMD")]
             public static 
@@ -1228,27 +1249,6 @@ namespace OpenTK.Graphics.ES20
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glSelectPerfMonitorCountersAMD")]
-            public static 
-            void SelectPerfMonitorCounters(UInt32 monitor, bool enable, UInt32 group, Int32 numCounters, UInt32[] countersList)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* countersList_ptr = countersList)
-                    {
-                        Delegates.glSelectPerfMonitorCountersAMD((UInt32)monitor, (bool)enable, (UInt32)group, (Int32)numCounters, (UInt32*)countersList_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
         }
 
         
@@ -1736,23 +1736,13 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glBufferData")]
         public static 
-        void BufferData<T2>(OpenTK.Graphics.ES20.BufferTarget target, IntPtr size, [InAttribute, OutAttribute] ref T2 data, OpenTK.Graphics.ES20.BufferUsage usage)
-            where T2 : struct
+        void BufferData(OpenTK.Graphics.ES20.BufferTarget target, IntPtr size, IntPtr data, OpenTK.Graphics.ES20.BufferUsage usage)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glBufferData((OpenTK.Graphics.ES20.BufferTarget)target, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject(), (OpenTK.Graphics.ES20.BufferUsage)usage);
-                data = (T2)data_ptr.Target;
-            }
-            finally
-            {
-                data_ptr.Free();
-            }
+            Delegates.glBufferData((OpenTK.Graphics.ES20.BufferTarget)target, (IntPtr)size, (IntPtr)data, (OpenTK.Graphics.ES20.BufferUsage)usage);
             #if DEBUG
             }
             #endif
@@ -1784,7 +1774,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glBufferData")]
         public static 
-        void BufferData<T2>(OpenTK.Graphics.ES20.BufferTarget target, IntPtr size, [InAttribute, OutAttribute] T2[,,] data, OpenTK.Graphics.ES20.BufferUsage usage)
+        void BufferData<T2>(OpenTK.Graphics.ES20.BufferTarget target, IntPtr size, [InAttribute, OutAttribute] T2[] data, OpenTK.Graphics.ES20.BufferUsage usage)
             where T2 : struct
         {
             #if DEBUG
@@ -1878,7 +1868,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glBufferData")]
         public static 
-        void BufferData<T2>(OpenTK.Graphics.ES20.BufferTarget target, IntPtr size, [InAttribute, OutAttribute] T2[] data, OpenTK.Graphics.ES20.BufferUsage usage)
+        void BufferData<T2>(OpenTK.Graphics.ES20.BufferTarget target, IntPtr size, [InAttribute, OutAttribute] T2[,,] data, OpenTK.Graphics.ES20.BufferUsage usage)
             where T2 : struct
         {
             #if DEBUG
@@ -1925,46 +1915,8 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glBufferData")]
         public static 
-        void BufferData(OpenTK.Graphics.ES20.BufferTarget target, IntPtr size, IntPtr data, OpenTK.Graphics.ES20.BufferUsage usage)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glBufferData((OpenTK.Graphics.ES20.BufferTarget)target, (IntPtr)size, (IntPtr)data, (OpenTK.Graphics.ES20.BufferUsage)usage);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Updates a subset of a buffer object's data store
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target buffer object. The symbolic constant must be GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, or GL_PIXEL_UNPACK_BUFFER.
-        /// </para>
-        /// </param>
-        /// <param name="offset">
-        /// <para>
-        /// Specifies the offset into the buffer object's data store where data replacement will begin, measured in bytes.
-        /// </para>
-        /// </param>
-        /// <param name="size">
-        /// <para>
-        /// Specifies the size in bytes of the data store region being replaced.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the new data that will be copied into the data store.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glBufferSubData")]
-        public static 
-        void BufferSubData<T3>(OpenTK.Graphics.ES20.BufferTarget target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] ref T3 data)
-            where T3 : struct
+        void BufferData<T2>(OpenTK.Graphics.ES20.BufferTarget target, IntPtr size, [InAttribute, OutAttribute] ref T2 data, OpenTK.Graphics.ES20.BufferUsage usage)
+            where T2 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -1973,8 +1925,8 @@ namespace OpenTK.Graphics.ES20
             GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
             try
             {
-                Delegates.glBufferSubData((OpenTK.Graphics.ES20.BufferTarget)target, (IntPtr)offset, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject());
-                data = (T3)data_ptr.Target;
+                Delegates.glBufferData((OpenTK.Graphics.ES20.BufferTarget)target, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject(), (OpenTK.Graphics.ES20.BufferUsage)usage);
+                data = (T2)data_ptr.Target;
             }
             finally
             {
@@ -2011,7 +1963,45 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glBufferSubData")]
         public static 
-        void BufferSubData<T3>(OpenTK.Graphics.ES20.BufferTarget target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[,,] data)
+        void BufferSubData(OpenTK.Graphics.ES20.BufferTarget target, IntPtr offset, IntPtr size, IntPtr data)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glBufferSubData((OpenTK.Graphics.ES20.BufferTarget)target, (IntPtr)offset, (IntPtr)size, (IntPtr)data);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Updates a subset of a buffer object's data store
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target buffer object. The symbolic constant must be GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, or GL_PIXEL_UNPACK_BUFFER.
+        /// </para>
+        /// </param>
+        /// <param name="offset">
+        /// <para>
+        /// Specifies the offset into the buffer object's data store where data replacement will begin, measured in bytes.
+        /// </para>
+        /// </param>
+        /// <param name="size">
+        /// <para>
+        /// Specifies the size in bytes of the data store region being replaced.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the new data that will be copied into the data store.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glBufferSubData")]
+        public static 
+        void BufferSubData<T3>(OpenTK.Graphics.ES20.BufferTarget target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[] data)
             where T3 : struct
         {
             #if DEBUG
@@ -2105,7 +2095,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glBufferSubData")]
         public static 
-        void BufferSubData<T3>(OpenTK.Graphics.ES20.BufferTarget target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[] data)
+        void BufferSubData<T3>(OpenTK.Graphics.ES20.BufferTarget target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[,,] data)
             where T3 : struct
         {
             #if DEBUG
@@ -2152,13 +2142,23 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glBufferSubData")]
         public static 
-        void BufferSubData(OpenTK.Graphics.ES20.BufferTarget target, IntPtr offset, IntPtr size, IntPtr data)
+        void BufferSubData<T3>(OpenTK.Graphics.ES20.BufferTarget target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] ref T3 data)
+            where T3 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glBufferSubData((OpenTK.Graphics.ES20.BufferTarget)target, (IntPtr)offset, (IntPtr)size, (IntPtr)data);
+            GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glBufferSubData((OpenTK.Graphics.ES20.BufferTarget)target, (IntPtr)offset, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject());
+                data = (T3)data_ptr.Target;
+            }
+            finally
+            {
+                data_ptr.Free();
+            }
             #if DEBUG
             }
             #endif
@@ -2386,23 +2386,13 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glCompressedTexImage2D")]
         public static 
-        void CompressedTexImage2D<T7>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T7 data)
-            where T7 : struct
+        void CompressedTexImage2D(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, IntPtr data)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glCompressedTexImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (OpenTK.Graphics.ES20.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
-                data = (T7)data_ptr.Target;
-            }
-            finally
-            {
-                data_ptr.Free();
-            }
+            Delegates.glCompressedTexImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (OpenTK.Graphics.ES20.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)data);
             #if DEBUG
             }
             #endif
@@ -2454,7 +2444,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glCompressedTexImage2D")]
         public static 
-        void CompressedTexImage2D<T7>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[,,] data)
+        void CompressedTexImage2D<T7>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[] data)
             where T7 : struct
         {
             #if DEBUG
@@ -2588,7 +2578,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glCompressedTexImage2D")]
         public static 
-        void CompressedTexImage2D<T7>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[] data)
+        void CompressedTexImage2D<T7>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[,,] data)
             where T7 : struct
         {
             #if DEBUG
@@ -2655,71 +2645,8 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glCompressedTexImage2D")]
         public static 
-        void CompressedTexImage2D(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, IntPtr data)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glCompressedTexImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (OpenTK.Graphics.ES20.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)data);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Specify a two-dimensional texture subimage in a compressed format
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target texture. Must be GL_TEXTURE_2D, GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, or GL_TEXTURE_CUBE_MAP_NEGATIVE_Z.
-        /// </para>
-        /// </param>
-        /// <param name="level">
-        /// <para>
-        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
-        /// </para>
-        /// </param>
-        /// <param name="xoffset">
-        /// <para>
-        /// Specifies a texel offset in the x direction within the texture array.
-        /// </para>
-        /// </param>
-        /// <param name="yoffset">
-        /// <para>
-        /// Specifies a texel offset in the y direction within the texture array.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// Specifies the width of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="height">
-        /// <para>
-        /// Specifies the height of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Specifies the format of the compressed image data stored at address data.
-        /// </para>
-        /// </param>
-        /// <param name="imageSize">
-        /// <para>
-        /// Specifies the number of unsigned bytes of image data starting at the address specified by data.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the compressed image data in memory.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glCompressedTexSubImage2D")]
-        public static 
-        void CompressedTexSubImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T8 data)
-            where T8 : struct
+        void CompressedTexImage2D<T7>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T7 data)
+            where T7 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -2728,8 +2655,8 @@ namespace OpenTK.Graphics.ES20
             GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
             try
             {
-                Delegates.glCompressedTexSubImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
-                data = (T8)data_ptr.Target;
+                Delegates.glCompressedTexImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (OpenTK.Graphics.ES20.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                data = (T7)data_ptr.Target;
             }
             finally
             {
@@ -2791,7 +2718,70 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glCompressedTexSubImage2D")]
         public static 
-        void CompressedTexSubImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T8[,,] data)
+        void CompressedTexSubImage2D(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, Int32 imageSize, IntPtr data)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glCompressedTexSubImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (Int32)imageSize, (IntPtr)data);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Specify a two-dimensional texture subimage in a compressed format
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target texture. Must be GL_TEXTURE_2D, GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, or GL_TEXTURE_CUBE_MAP_NEGATIVE_Z.
+        /// </para>
+        /// </param>
+        /// <param name="level">
+        /// <para>
+        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
+        /// </para>
+        /// </param>
+        /// <param name="xoffset">
+        /// <para>
+        /// Specifies a texel offset in the x direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="yoffset">
+        /// <para>
+        /// Specifies a texel offset in the y direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// Specifies the width of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="height">
+        /// <para>
+        /// Specifies the height of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Specifies the format of the compressed image data stored at address data.
+        /// </para>
+        /// </param>
+        /// <param name="imageSize">
+        /// <para>
+        /// Specifies the number of unsigned bytes of image data starting at the address specified by data.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the compressed image data in memory.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glCompressedTexSubImage2D")]
+        public static 
+        void CompressedTexSubImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T8[] data)
             where T8 : struct
         {
             #if DEBUG
@@ -2935,7 +2925,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glCompressedTexSubImage2D")]
         public static 
-        void CompressedTexSubImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T8[] data)
+        void CompressedTexSubImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T8[,,] data)
             where T8 : struct
         {
             #if DEBUG
@@ -3007,13 +2997,23 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glCompressedTexSubImage2D")]
         public static 
-        void CompressedTexSubImage2D(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, Int32 imageSize, IntPtr data)
+        void CompressedTexSubImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T8 data)
+            where T8 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glCompressedTexSubImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (Int32)imageSize, (IntPtr)data);
+            GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glCompressedTexSubImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                data = (T8)data_ptr.Target;
+            }
+            finally
+            {
+                data_ptr.Free();
+            }
             #if DEBUG
             }
             #endif
@@ -3190,35 +3190,6 @@ namespace OpenTK.Graphics.ES20
         }
 
         
-        /// <summary>
-        /// Delete named buffer objects
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of buffer objects to be deleted.
-        /// </para>
-        /// </param>
-        /// <param name="buffers">
-        /// <para>
-        /// Specifies an array of buffer objects to be deleted.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeleteBuffers")]
-        public static 
-        unsafe void DeleteBuffers(Int32 n, Int32* buffers)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glDeleteBuffers((Int32)n, (UInt32*)buffers);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Delete named buffer objects
         /// </summary>
@@ -3287,6 +3258,70 @@ namespace OpenTK.Graphics.ES20
         }
 
         
+        /// <summary>
+        /// Delete named buffer objects
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of buffer objects to be deleted.
+        /// </para>
+        /// </param>
+        /// <param name="buffers">
+        /// <para>
+        /// Specifies an array of buffer objects to be deleted.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeleteBuffers")]
+        public static 
+        unsafe void DeleteBuffers(Int32 n, Int32* buffers)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glDeleteBuffers((Int32)n, (UInt32*)buffers);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Delete named buffer objects
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of buffer objects to be deleted.
+        /// </para>
+        /// </param>
+        /// <param name="buffers">
+        /// <para>
+        /// Specifies an array of buffer objects to be deleted.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeleteBuffers")]
+        public static 
+        void DeleteBuffers(Int32 n, UInt32[] buffers)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* buffers_ptr = buffers)
+                {
+                    Delegates.glDeleteBuffers((Int32)n, (UInt32*)buffers_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Delete named buffer objects
         /// </summary>
@@ -3350,56 +3385,6 @@ namespace OpenTK.Graphics.ES20
             #endif
         }
 
-        
-        /// <summary>
-        /// Delete named buffer objects
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of buffer objects to be deleted.
-        /// </para>
-        /// </param>
-        /// <param name="buffers">
-        /// <para>
-        /// Specifies an array of buffer objects to be deleted.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeleteBuffers")]
-        public static 
-        void DeleteBuffers(Int32 n, UInt32[] buffers)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* buffers_ptr = buffers)
-                {
-                    Delegates.glDeleteBuffers((Int32)n, (UInt32*)buffers_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeleteFramebuffers")]
-        public static 
-        unsafe void DeleteFramebuffers(Int32 n, Int32* framebuffers)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glDeleteFramebuffers((Int32)n, (UInt32*)framebuffers);
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeleteFramebuffers")]
         public static 
         void DeleteFramebuffers(Int32 n, Int32[] framebuffers)
@@ -3440,6 +3425,42 @@ namespace OpenTK.Graphics.ES20
             #endif
         }
 
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeleteFramebuffers")]
+        public static 
+        unsafe void DeleteFramebuffers(Int32 n, Int32* framebuffers)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glDeleteFramebuffers((Int32)n, (UInt32*)framebuffers);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeleteFramebuffers")]
+        public static 
+        void DeleteFramebuffers(Int32 n, UInt32[] framebuffers)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* framebuffers_ptr = framebuffers)
+                {
+                    Delegates.glDeleteFramebuffers((Int32)n, (UInt32*)framebuffers_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeleteFramebuffers")]
         public static 
@@ -3476,27 +3497,6 @@ namespace OpenTK.Graphics.ES20
             #endif
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeleteFramebuffers")]
-        public static 
-        void DeleteFramebuffers(Int32 n, UInt32[] framebuffers)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* framebuffers_ptr = framebuffers)
-                {
-                    Delegates.glDeleteFramebuffers((Int32)n, (UInt32*)framebuffers_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
         
         /// <summary>
         /// Deletes a program object
@@ -3544,21 +3544,6 @@ namespace OpenTK.Graphics.ES20
             #endif
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeleteRenderbuffers")]
-        public static 
-        unsafe void DeleteRenderbuffers(Int32 n, Int32* renderbuffers)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glDeleteRenderbuffers((Int32)n, (UInt32*)renderbuffers);
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeleteRenderbuffers")]
         public static 
         void DeleteRenderbuffers(Int32 n, Int32[] renderbuffers)
@@ -3599,6 +3584,42 @@ namespace OpenTK.Graphics.ES20
             #endif
         }
 
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeleteRenderbuffers")]
+        public static 
+        unsafe void DeleteRenderbuffers(Int32 n, Int32* renderbuffers)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glDeleteRenderbuffers((Int32)n, (UInt32*)renderbuffers);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeleteRenderbuffers")]
+        public static 
+        void DeleteRenderbuffers(Int32 n, UInt32[] renderbuffers)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* renderbuffers_ptr = renderbuffers)
+                {
+                    Delegates.glDeleteRenderbuffers((Int32)n, (UInt32*)renderbuffers_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeleteRenderbuffers")]
         public static 
@@ -3635,27 +3656,6 @@ namespace OpenTK.Graphics.ES20
             #endif
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeleteRenderbuffers")]
-        public static 
-        void DeleteRenderbuffers(Int32 n, UInt32[] renderbuffers)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* renderbuffers_ptr = renderbuffers)
-                {
-                    Delegates.glDeleteRenderbuffers((Int32)n, (UInt32*)renderbuffers_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
         
         /// <summary>
         /// Deletes a shader object
@@ -3704,35 +3704,6 @@ namespace OpenTK.Graphics.ES20
         }
 
         
-        /// <summary>
-        /// Delete named textures
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of textures to be deleted.
-        /// </para>
-        /// </param>
-        /// <param name="textures">
-        /// <para>
-        /// Specifies an array of textures to be deleted.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeleteTextures")]
-        public static 
-        unsafe void DeleteTextures(Int32 n, Int32* textures)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glDeleteTextures((Int32)n, (UInt32*)textures);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Delete named textures
         /// </summary>
@@ -3801,6 +3772,70 @@ namespace OpenTK.Graphics.ES20
         }
 
         
+        /// <summary>
+        /// Delete named textures
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of textures to be deleted.
+        /// </para>
+        /// </param>
+        /// <param name="textures">
+        /// <para>
+        /// Specifies an array of textures to be deleted.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeleteTextures")]
+        public static 
+        unsafe void DeleteTextures(Int32 n, Int32* textures)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glDeleteTextures((Int32)n, (UInt32*)textures);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Delete named textures
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of textures to be deleted.
+        /// </para>
+        /// </param>
+        /// <param name="textures">
+        /// <para>
+        /// Specifies an array of textures to be deleted.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeleteTextures")]
+        public static 
+        void DeleteTextures(Int32 n, UInt32[] textures)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* textures_ptr = textures)
+                {
+                    Delegates.glDeleteTextures((Int32)n, (UInt32*)textures_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Delete named textures
         /// </summary>
@@ -3865,41 +3900,6 @@ namespace OpenTK.Graphics.ES20
         }
 
         
-        /// <summary>
-        /// Delete named textures
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of textures to be deleted.
-        /// </para>
-        /// </param>
-        /// <param name="textures">
-        /// <para>
-        /// Specifies an array of textures to be deleted.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeleteTextures")]
-        public static 
-        void DeleteTextures(Int32 n, UInt32[] textures)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* textures_ptr = textures)
-                {
-                    Delegates.glDeleteTextures((Int32)n, (UInt32*)textures_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify the value used for depth buffer comparisons
         /// </summary>
@@ -4161,23 +4161,13 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDrawElements")]
         public static 
-        void DrawElements<T3>(OpenTK.Graphics.ES20.BeginMode mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices)
-            where T3 : struct
+        void DrawElements(OpenTK.Graphics.ES20.BeginMode mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, IntPtr indices)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glDrawElements((OpenTK.Graphics.ES20.BeginMode)mode, (Int32)count, (OpenTK.Graphics.ES20.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject());
-                indices = (T3)indices_ptr.Target;
-            }
-            finally
-            {
-                indices_ptr.Free();
-            }
+            Delegates.glDrawElements((OpenTK.Graphics.ES20.BeginMode)mode, (Int32)count, (OpenTK.Graphics.ES20.DrawElementsType)type, (IntPtr)indices);
             #if DEBUG
             }
             #endif
@@ -4209,7 +4199,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDrawElements")]
         public static 
-        void DrawElements<T3>(OpenTK.Graphics.ES20.BeginMode mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices)
+        void DrawElements<T3>(OpenTK.Graphics.ES20.BeginMode mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices)
             where T3 : struct
         {
             #if DEBUG
@@ -4303,7 +4293,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDrawElements")]
         public static 
-        void DrawElements<T3>(OpenTK.Graphics.ES20.BeginMode mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices)
+        void DrawElements<T3>(OpenTK.Graphics.ES20.BeginMode mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices)
             where T3 : struct
         {
             #if DEBUG
@@ -4350,13 +4340,23 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDrawElements")]
         public static 
-        void DrawElements(OpenTK.Graphics.ES20.BeginMode mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, IntPtr indices)
+        void DrawElements<T3>(OpenTK.Graphics.ES20.BeginMode mode, Int32 count, OpenTK.Graphics.ES20.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices)
+            where T3 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glDrawElements((OpenTK.Graphics.ES20.BeginMode)mode, (Int32)count, (OpenTK.Graphics.ES20.DrawElementsType)type, (IntPtr)indices);
+            GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glDrawElements((OpenTK.Graphics.ES20.BeginMode)mode, (Int32)count, (OpenTK.Graphics.ES20.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject());
+                indices = (T3)indices_ptr.Target;
+            }
+            finally
+            {
+                indices_ptr.Free();
+            }
             #if DEBUG
             }
             #endif
@@ -4579,35 +4579,6 @@ namespace OpenTK.Graphics.ES20
         }
 
         
-        /// <summary>
-        /// Generate buffer object names
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of buffer object names to be generated.
-        /// </para>
-        /// </param>
-        /// <param name="buffers">
-        /// <para>
-        /// Specifies an array in which the generated buffer object names are stored.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenBuffers")]
-        public static 
-        unsafe void GenBuffers(Int32 n, [OutAttribute] Int32* buffers)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGenBuffers((Int32)n, (UInt32*)buffers);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Generate buffer object names
         /// </summary>
@@ -4677,6 +4648,70 @@ namespace OpenTK.Graphics.ES20
         }
 
         
+        /// <summary>
+        /// Generate buffer object names
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of buffer object names to be generated.
+        /// </para>
+        /// </param>
+        /// <param name="buffers">
+        /// <para>
+        /// Specifies an array in which the generated buffer object names are stored.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenBuffers")]
+        public static 
+        unsafe void GenBuffers(Int32 n, [OutAttribute] Int32* buffers)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGenBuffers((Int32)n, (UInt32*)buffers);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Generate buffer object names
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of buffer object names to be generated.
+        /// </para>
+        /// </param>
+        /// <param name="buffers">
+        /// <para>
+        /// Specifies an array in which the generated buffer object names are stored.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenBuffers")]
+        public static 
+        void GenBuffers(Int32 n, [OutAttribute] UInt32[] buffers)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* buffers_ptr = buffers)
+                {
+                    Delegates.glGenBuffers((Int32)n, (UInt32*)buffers_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Generate buffer object names
         /// </summary>
@@ -4741,41 +4776,6 @@ namespace OpenTK.Graphics.ES20
             #endif
         }
 
-        
-        /// <summary>
-        /// Generate buffer object names
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of buffer object names to be generated.
-        /// </para>
-        /// </param>
-        /// <param name="buffers">
-        /// <para>
-        /// Specifies an array in which the generated buffer object names are stored.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenBuffers")]
-        public static 
-        void GenBuffers(Int32 n, [OutAttribute] UInt32[] buffers)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* buffers_ptr = buffers)
-                {
-                    Delegates.glGenBuffers((Int32)n, (UInt32*)buffers_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenerateMipmap")]
         public static 
         void GenerateMipmap(OpenTK.Graphics.ES20.TextureTarget target)
@@ -4790,21 +4790,6 @@ namespace OpenTK.Graphics.ES20
             #endif
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenFramebuffers")]
-        public static 
-        unsafe void GenFramebuffers(Int32 n, [OutAttribute] Int32* framebuffers)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGenFramebuffers((Int32)n, (UInt32*)framebuffers);
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenFramebuffers")]
         public static 
         void GenFramebuffers(Int32 n, [OutAttribute] Int32[] framebuffers)
@@ -4849,29 +4834,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenFramebuffers")]
         public static 
-        void GenFramebuffers(Int32 n, [OutAttribute] out UInt32 framebuffers)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* framebuffers_ptr = &framebuffers)
-                {
-                    Delegates.glGenFramebuffers((Int32)n, (UInt32*)framebuffers_ptr);
-                    framebuffers = *framebuffers_ptr;
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenFramebuffers")]
-        public static 
-        unsafe void GenFramebuffers(Int32 n, [OutAttribute] UInt32* framebuffers)
+        unsafe void GenFramebuffers(Int32 n, [OutAttribute] Int32* framebuffers)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -4905,15 +4868,37 @@ namespace OpenTK.Graphics.ES20
         }
 
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenRenderbuffers")]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenFramebuffers")]
         public static 
-        unsafe void GenRenderbuffers(Int32 n, [OutAttribute] Int32* renderbuffers)
+        void GenFramebuffers(Int32 n, [OutAttribute] out UInt32 framebuffers)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGenRenderbuffers((Int32)n, (UInt32*)renderbuffers);
+            unsafe
+            {
+                fixed (UInt32* framebuffers_ptr = &framebuffers)
+                {
+                    Delegates.glGenFramebuffers((Int32)n, (UInt32*)framebuffers_ptr);
+                    framebuffers = *framebuffers_ptr;
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenFramebuffers")]
+        public static 
+        unsafe void GenFramebuffers(Int32 n, [OutAttribute] UInt32* framebuffers)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGenFramebuffers((Int32)n, (UInt32*)framebuffers);
             #if DEBUG
             }
             #endif
@@ -4963,29 +4948,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenRenderbuffers")]
         public static 
-        void GenRenderbuffers(Int32 n, [OutAttribute] out UInt32 renderbuffers)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* renderbuffers_ptr = &renderbuffers)
-                {
-                    Delegates.glGenRenderbuffers((Int32)n, (UInt32*)renderbuffers_ptr);
-                    renderbuffers = *renderbuffers_ptr;
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenRenderbuffers")]
-        public static 
-        unsafe void GenRenderbuffers(Int32 n, [OutAttribute] UInt32* renderbuffers)
+        unsafe void GenRenderbuffers(Int32 n, [OutAttribute] Int32* renderbuffers)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -5018,30 +4981,38 @@ namespace OpenTK.Graphics.ES20
             #endif
         }
 
-        
-        /// <summary>
-        /// Generate texture names
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of texture names to be generated.
-        /// </para>
-        /// </param>
-        /// <param name="textures">
-        /// <para>
-        /// Specifies an array in which the generated texture names are stored.
-        /// </para>
-        /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenTextures")]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenRenderbuffers")]
         public static 
-        unsafe void GenTextures(Int32 n, [OutAttribute] Int32* textures)
+        void GenRenderbuffers(Int32 n, [OutAttribute] out UInt32 renderbuffers)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGenTextures((Int32)n, (UInt32*)textures);
+            unsafe
+            {
+                fixed (UInt32* renderbuffers_ptr = &renderbuffers)
+                {
+                    Delegates.glGenRenderbuffers((Int32)n, (UInt32*)renderbuffers_ptr);
+                    renderbuffers = *renderbuffers_ptr;
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenRenderbuffers")]
+        public static 
+        unsafe void GenRenderbuffers(Int32 n, [OutAttribute] UInt32* renderbuffers)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGenRenderbuffers((Int32)n, (UInt32*)renderbuffers);
             #if DEBUG
             }
             #endif
@@ -5133,43 +5104,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenTextures")]
         public static 
-        void GenTextures(Int32 n, [OutAttribute] out UInt32 textures)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* textures_ptr = &textures)
-                {
-                    Delegates.glGenTextures((Int32)n, (UInt32*)textures_ptr);
-                    textures = *textures_ptr;
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Generate texture names
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of texture names to be generated.
-        /// </para>
-        /// </param>
-        /// <param name="textures">
-        /// <para>
-        /// Specifies an array in which the generated texture names are stored.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenTextures")]
-        public static 
-        unsafe void GenTextures(Int32 n, [OutAttribute] UInt32* textures)
+        unsafe void GenTextures(Int32 n, [OutAttribute] Int32* textures)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -5218,53 +5153,64 @@ namespace OpenTK.Graphics.ES20
 
         
         /// <summary>
-        /// Returns information about an active attribute variable for the specified program object
+        /// Generate texture names
         /// </summary>
-        /// <param name="program">
+        /// <param name="n">
         /// <para>
-        /// Specifies the program object to be queried.
+        /// Specifies the number of texture names to be generated.
         /// </para>
         /// </param>
-        /// <param name="index">
+        /// <param name="textures">
         /// <para>
-        /// Specifies the index of the attribute variable to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="bufSize">
-        /// <para>
-        /// Specifies the maximum number of characters OpenGL is allowed to write in the character buffer indicated by name.
-        /// </para>
-        /// </param>
-        /// <param name="length">
-        /// <para>
-        /// Returns the number of characters actually written by OpenGL in the string indicated by name (excluding the null terminator) if a value other than NULL is passed.
-        /// </para>
-        /// </param>
-        /// <param name="size">
-        /// <para>
-        /// Returns the size of the attribute variable.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Returns the data type of the attribute variable.
-        /// </para>
-        /// </param>
-        /// <param name="name">
-        /// <para>
-        /// Returns a null terminated string containing the name of the attribute variable.
+        /// Specifies an array in which the generated texture names are stored.
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetActiveAttrib")]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenTextures")]
         public static 
-        unsafe void GetActiveAttrib(Int32 program, Int32 index, Int32 bufsize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.ES20.ActiveAttribType* type, [OutAttribute] StringBuilder name)
+        void GenTextures(Int32 n, [OutAttribute] out UInt32 textures)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetActiveAttrib((UInt32)program, (UInt32)index, (Int32)bufsize, (Int32*)length, (Int32*)size, (OpenTK.Graphics.ES20.ActiveAttribType*)type, (StringBuilder)name);
+            unsafe
+            {
+                fixed (UInt32* textures_ptr = &textures)
+                {
+                    Delegates.glGenTextures((Int32)n, (UInt32*)textures_ptr);
+                    textures = *textures_ptr;
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Generate texture names
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of texture names to be generated.
+        /// </para>
+        /// </param>
+        /// <param name="textures">
+        /// <para>
+        /// Specifies an array in which the generated texture names are stored.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenTextures")]
+        public static 
+        unsafe void GenTextures(Int32 n, [OutAttribute] UInt32* textures)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGenTextures((Int32)n, (UInt32*)textures);
             #if DEBUG
             }
             #endif
@@ -5437,7 +5383,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetActiveAttrib")]
         public static 
-        unsafe void GetActiveAttrib(UInt32 program, UInt32 index, Int32 bufsize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.ES20.ActiveAttribType* type, [OutAttribute] StringBuilder name)
+        unsafe void GetActiveAttrib(Int32 program, Int32 index, Int32 bufsize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.ES20.ActiveAttribType* type, [OutAttribute] StringBuilder name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -5578,7 +5524,7 @@ namespace OpenTK.Graphics.ES20
 
         
         /// <summary>
-        /// Returns information about an active uniform variable for the specified program object
+        /// Returns information about an active attribute variable for the specified program object
         /// </summary>
         /// <param name="program">
         /// <para>
@@ -5587,7 +5533,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         /// <param name="index">
         /// <para>
-        /// Specifies the index of the uniform variable to be queried.
+        /// Specifies the index of the attribute variable to be queried.
         /// </para>
         /// </param>
         /// <param name="bufSize">
@@ -5602,29 +5548,29 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         /// <param name="size">
         /// <para>
-        /// Returns the size of the uniform variable.
+        /// Returns the size of the attribute variable.
         /// </para>
         /// </param>
         /// <param name="type">
         /// <para>
-        /// Returns the data type of the uniform variable.
+        /// Returns the data type of the attribute variable.
         /// </para>
         /// </param>
         /// <param name="name">
         /// <para>
-        /// Returns a null terminated string containing the name of the uniform variable.
+        /// Returns a null terminated string containing the name of the attribute variable.
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetActiveUniform")]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetActiveAttrib")]
         public static 
-        unsafe void GetActiveUniform(Int32 program, Int32 index, Int32 bufsize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.ES20.ActiveUniformType* type, [OutAttribute] StringBuilder name)
+        unsafe void GetActiveAttrib(UInt32 program, UInt32 index, Int32 bufsize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.ES20.ActiveAttribType* type, [OutAttribute] StringBuilder name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetActiveUniform((UInt32)program, (UInt32)index, (Int32)bufsize, (Int32*)length, (Int32*)size, (OpenTK.Graphics.ES20.ActiveUniformType*)type, (StringBuilder)name);
+            Delegates.glGetActiveAttrib((UInt32)program, (UInt32)index, (Int32)bufsize, (Int32*)length, (Int32*)size, (OpenTK.Graphics.ES20.ActiveAttribType*)type, (StringBuilder)name);
             #if DEBUG
             }
             #endif
@@ -5797,7 +5743,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetActiveUniform")]
         public static 
-        unsafe void GetActiveUniform(UInt32 program, UInt32 index, Int32 bufsize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.ES20.ActiveUniformType* type, [OutAttribute] StringBuilder name)
+        unsafe void GetActiveUniform(Int32 program, Int32 index, Int32 bufsize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.ES20.ActiveUniformType* type, [OutAttribute] StringBuilder name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -5938,38 +5884,53 @@ namespace OpenTK.Graphics.ES20
 
         
         /// <summary>
-        /// Returns the handles of the shader objects attached to a program object
+        /// Returns information about an active uniform variable for the specified program object
         /// </summary>
         /// <param name="program">
         /// <para>
         /// Specifies the program object to be queried.
         /// </para>
         /// </param>
-        /// <param name="maxCount">
+        /// <param name="index">
         /// <para>
-        /// Specifies the size of the array for storing the returned object names.
+        /// Specifies the index of the uniform variable to be queried.
         /// </para>
         /// </param>
-        /// <param name="count">
+        /// <param name="bufSize">
         /// <para>
-        /// Returns the number of names actually returned in objects.
+        /// Specifies the maximum number of characters OpenGL is allowed to write in the character buffer indicated by name.
         /// </para>
         /// </param>
-        /// <param name="shaders">
+        /// <param name="length">
         /// <para>
-        /// Specifies an array that is used to return the names of attached shader objects.
+        /// Returns the number of characters actually written by OpenGL in the string indicated by name (excluding the null terminator) if a value other than NULL is passed.
+        /// </para>
+        /// </param>
+        /// <param name="size">
+        /// <para>
+        /// Returns the size of the uniform variable.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Returns the data type of the uniform variable.
+        /// </para>
+        /// </param>
+        /// <param name="name">
+        /// <para>
+        /// Returns a null terminated string containing the name of the uniform variable.
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetAttachedShaders")]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetActiveUniform")]
         public static 
-        unsafe void GetAttachedShaders(Int32 program, Int32 maxcount, [OutAttribute] Int32* count, [OutAttribute] Int32* shaders)
+        unsafe void GetActiveUniform(UInt32 program, UInt32 index, Int32 bufsize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.ES20.ActiveUniformType* type, [OutAttribute] StringBuilder name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetAttachedShaders((UInt32)program, (Int32)maxcount, (Int32*)count, (UInt32*)shaders);
+            Delegates.glGetActiveUniform((UInt32)program, (UInt32)index, (Int32)bufsize, (Int32*)length, (Int32*)size, (OpenTK.Graphics.ES20.ActiveUniformType*)type, (StringBuilder)name);
             #if DEBUG
             }
             #endif
@@ -6094,7 +6055,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetAttachedShaders")]
         public static 
-        unsafe void GetAttachedShaders(UInt32 program, Int32 maxcount, [OutAttribute] Int32* count, [OutAttribute] UInt32* shaders)
+        unsafe void GetAttachedShaders(Int32 program, Int32 maxcount, [OutAttribute] Int32* count, [OutAttribute] Int32* shaders)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -6201,6 +6162,45 @@ namespace OpenTK.Graphics.ES20
         }
 
         
+        /// <summary>
+        /// Returns the handles of the shader objects attached to a program object
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// Specifies the program object to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="maxCount">
+        /// <para>
+        /// Specifies the size of the array for storing the returned object names.
+        /// </para>
+        /// </param>
+        /// <param name="count">
+        /// <para>
+        /// Returns the number of names actually returned in objects.
+        /// </para>
+        /// </param>
+        /// <param name="shaders">
+        /// <para>
+        /// Specifies an array that is used to return the names of attached shader objects.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetAttachedShaders")]
+        public static 
+        unsafe void GetAttachedShaders(UInt32 program, Int32 maxcount, [OutAttribute] Int32* count, [OutAttribute] UInt32* shaders)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetAttachedShaders((UInt32)program, (Int32)maxcount, (Int32*)count, (UInt32*)shaders);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Returns the location of an attribute variable
         /// </summary>
@@ -6257,21 +6257,6 @@ namespace OpenTK.Graphics.ES20
             #endif
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetBooleanv")]
-        public static 
-        unsafe void GetBoolean(OpenTK.Graphics.ES20.GetPName pname, [OutAttribute] bool* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGetBooleanv((OpenTK.Graphics.ES20.GetPName)pname, (bool*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetBooleanv")]
         public static 
         void GetBoolean(OpenTK.Graphics.ES20.GetPName pname, [OutAttribute] bool[] @params)
@@ -6313,35 +6298,16 @@ namespace OpenTK.Graphics.ES20
             #endif
         }
 
-        
-        /// <summary>
-        /// Return parameters of a buffer object
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target buffer object. The symbolic constant must be GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, or GL_PIXEL_UNPACK_BUFFER.
-        /// </para>
-        /// </param>
-        /// <param name="value">
-        /// <para>
-        /// Specifies the symbolic name of a buffer object parameter. Accepted values are GL_BUFFER_ACCESS, GL_BUFFER_MAPPED, GL_BUFFER_SIZE, or GL_BUFFER_USAGE.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Returns the requested parameter.
-        /// </para>
-        /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetBufferParameteriv")]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetBooleanv")]
         public static 
-        unsafe void GetBufferParameter(OpenTK.Graphics.ES20.BufferTarget target, OpenTK.Graphics.ES20.BufferParameterName pname, [OutAttribute] Int32* @params)
+        unsafe void GetBoolean(OpenTK.Graphics.ES20.GetPName pname, [OutAttribute] bool* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetBufferParameteriv((OpenTK.Graphics.ES20.BufferTarget)target, (OpenTK.Graphics.ES20.BufferParameterName)pname, (Int32*)@params);
+            Delegates.glGetBooleanv((OpenTK.Graphics.ES20.GetPName)pname, (bool*)@params);
             #if DEBUG
             }
             #endif
@@ -6426,31 +6392,35 @@ namespace OpenTK.Graphics.ES20
             #endif
         }
 
+        
+        /// <summary>
+        /// Return parameters of a buffer object
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target buffer object. The symbolic constant must be GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, or GL_PIXEL_UNPACK_BUFFER.
+        /// </para>
+        /// </param>
+        /// <param name="value">
+        /// <para>
+        /// Specifies the symbolic name of a buffer object parameter. Accepted values are GL_BUFFER_ACCESS, GL_BUFFER_MAPPED, GL_BUFFER_SIZE, or GL_BUFFER_USAGE.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Returns the requested parameter.
+        /// </para>
+        /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetDriverControlsQCOM")]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetBufferParameteriv")]
         public static 
-        unsafe void GetDriverControlsQCOM([OutAttribute] Int32* num, Int32 size, [OutAttribute] Int32* driverControls)
+        unsafe void GetBufferParameter(OpenTK.Graphics.ES20.BufferTarget target, OpenTK.Graphics.ES20.BufferParameterName pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetDriverControlsQCOM((Int32*)num, (Int32)size, (UInt32*)driverControls);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetDriverControlsQCOM")]
-        public static 
-        unsafe void GetDriverControlsQCOM([OutAttribute] Int32* num, Int32 size, [OutAttribute] UInt32* driverControls)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGetDriverControlsQCOM((Int32*)num, (Int32)size, (UInt32*)driverControls);
+            Delegates.glGetBufferParameteriv((OpenTK.Graphics.ES20.BufferTarget)target, (OpenTK.Graphics.ES20.BufferParameterName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -6547,15 +6517,30 @@ namespace OpenTK.Graphics.ES20
         }
 
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetDriverControlStringQCOM")]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetDriverControlsQCOM")]
         public static 
-        unsafe void GetDriverControlStringQCOM(Int32 driverControl, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder driverControlString)
+        unsafe void GetDriverControlsQCOM([OutAttribute] Int32* num, Int32 size, [OutAttribute] Int32* driverControls)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetDriverControlStringQCOM((UInt32)driverControl, (Int32)bufSize, (Int32*)length, (StringBuilder)driverControlString);
+            Delegates.glGetDriverControlsQCOM((Int32*)num, (Int32)size, (UInt32*)driverControls);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetDriverControlsQCOM")]
+        public static 
+        unsafe void GetDriverControlsQCOM([OutAttribute] Int32* num, Int32 size, [OutAttribute] UInt32* driverControls)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetDriverControlsQCOM((Int32*)num, (Int32)size, (UInt32*)driverControls);
             #if DEBUG
             }
             #endif
@@ -6605,7 +6590,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetDriverControlStringQCOM")]
         public static 
-        unsafe void GetDriverControlStringQCOM(UInt32 driverControl, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder driverControlString)
+        unsafe void GetDriverControlStringQCOM(Int32 driverControl, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder driverControlString)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -6660,6 +6645,21 @@ namespace OpenTK.Graphics.ES20
             #endif
         }
 
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetDriverControlStringQCOM")]
+        public static 
+        unsafe void GetDriverControlStringQCOM(UInt32 driverControl, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder driverControlString)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetDriverControlStringQCOM((UInt32)driverControl, (Int32)bufSize, (Int32*)length, (StringBuilder)driverControlString);
+            #if DEBUG
+            }
+            #endif
+        }
+
         
         /// <summary>
         /// Return error information
@@ -6671,6 +6671,26 @@ namespace OpenTK.Graphics.ES20
             return Delegates.glGetError();
         }
 
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetFloatv")]
+        public static 
+        void GetFloat(OpenTK.Graphics.ES20.GetPName pname, [OutAttribute] Single[] @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* @params_ptr = @params)
+                {
+                    Delegates.glGetFloatv((OpenTK.Graphics.ES20.GetPName)pname, (Single*)@params_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetFloatv")]
         public static 
         void GetFloat(OpenTK.Graphics.ES20.GetPName pname, [OutAttribute] out Single @params)
@@ -6707,41 +6727,6 @@ namespace OpenTK.Graphics.ES20
             #endif
         }
 
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetFloatv")]
-        public static 
-        void GetFloat(OpenTK.Graphics.ES20.GetPName pname, [OutAttribute] Single[] @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* @params_ptr = @params)
-                {
-                    Delegates.glGetFloatv((OpenTK.Graphics.ES20.GetPName)pname, (Single*)@params_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetFramebufferAttachmentParameteriv")]
-        public static 
-        unsafe void GetFramebufferAttachmentParameter(OpenTK.Graphics.ES20.FramebufferTarget target, OpenTK.Graphics.ES20.FramebufferSlot attachment, OpenTK.Graphics.ES20.FramebufferParameterName pname, [OutAttribute] Int32* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGetFramebufferAttachmentParameteriv((OpenTK.Graphics.ES20.FramebufferTarget)target, (OpenTK.Graphics.ES20.FramebufferSlot)attachment, (OpenTK.Graphics.ES20.FramebufferParameterName)pname, (Int32*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetFramebufferAttachmentParameteriv")]
         public static 
         void GetFramebufferAttachmentParameter(OpenTK.Graphics.ES20.FramebufferTarget target, OpenTK.Graphics.ES20.FramebufferSlot attachment, OpenTK.Graphics.ES20.FramebufferParameterName pname, [OutAttribute] Int32[] @params)
@@ -6784,15 +6769,15 @@ namespace OpenTK.Graphics.ES20
         }
 
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetIntegerv")]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetFramebufferAttachmentParameteriv")]
         public static 
-        unsafe void GetInteger(OpenTK.Graphics.ES20.GetPName pname, [OutAttribute] Int32* @params)
+        unsafe void GetFramebufferAttachmentParameter(OpenTK.Graphics.ES20.FramebufferTarget target, OpenTK.Graphics.ES20.FramebufferSlot attachment, OpenTK.Graphics.ES20.FramebufferParameterName pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetIntegerv((OpenTK.Graphics.ES20.GetPName)pname, (Int32*)@params);
+            Delegates.glGetFramebufferAttachmentParameteriv((OpenTK.Graphics.ES20.FramebufferTarget)target, (OpenTK.Graphics.ES20.FramebufferSlot)attachment, (OpenTK.Graphics.ES20.FramebufferParameterName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -6839,40 +6824,16 @@ namespace OpenTK.Graphics.ES20
             #endif
         }
 
-        
-        /// <summary>
-        /// Returns the information log for a program object
-        /// </summary>
-        /// <param name="program">
-        /// <para>
-        /// Specifies the program object whose information log is to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="maxLength">
-        /// <para>
-        /// Specifies the size of the character buffer for storing the returned information log.
-        /// </para>
-        /// </param>
-        /// <param name="length">
-        /// <para>
-        /// Returns the length of the string returned in infoLog (excluding the null terminator).
-        /// </para>
-        /// </param>
-        /// <param name="infoLog">
-        /// <para>
-        /// Specifies an array of characters that is used to return the information log.
-        /// </para>
-        /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramInfoLog")]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetIntegerv")]
         public static 
-        unsafe void GetProgramInfoLog(Int32 program, Int32 bufsize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infolog)
+        unsafe void GetInteger(OpenTK.Graphics.ES20.GetPName pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetProgramInfoLog((UInt32)program, (Int32)bufsize, (Int32*)length, (StringBuilder)infolog);
+            Delegates.glGetIntegerv((OpenTK.Graphics.ES20.GetPName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -6994,7 +6955,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramInfoLog")]
         public static 
-        unsafe void GetProgramInfoLog(UInt32 program, Int32 bufsize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infolog)
+        unsafe void GetProgramInfoLog(Int32 program, Int32 bufsize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infolog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -7099,33 +7060,38 @@ namespace OpenTK.Graphics.ES20
 
         
         /// <summary>
-        /// Returns a parameter from a program object
+        /// Returns the information log for a program object
         /// </summary>
         /// <param name="program">
         /// <para>
-        /// Specifies the program object to be queried.
+        /// Specifies the program object whose information log is to be queried.
         /// </para>
         /// </param>
-        /// <param name="pname">
+        /// <param name="maxLength">
         /// <para>
-        /// Specifies the object parameter. Accepted symbolic names are GL_DELETE_STATUS, GL_LINK_STATUS, GL_VALIDATE_STATUS, GL_INFO_LOG_LENGTH, GL_ATTACHED_SHADERS, GL_ACTIVE_ATTRIBUTES, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, GL_ACTIVE_UNIFORMS, GL_ACTIVE_UNIFORM_MAX_LENGTH.
+        /// Specifies the size of the character buffer for storing the returned information log.
         /// </para>
         /// </param>
-        /// <param name="params">
+        /// <param name="length">
         /// <para>
-        /// Returns the requested object parameter.
+        /// Returns the length of the string returned in infoLog (excluding the null terminator).
+        /// </para>
+        /// </param>
+        /// <param name="infoLog">
+        /// <para>
+        /// Specifies an array of characters that is used to return the information log.
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramiv")]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramInfoLog")]
         public static 
-        unsafe void GetProgram(Int32 program, OpenTK.Graphics.ES20.ProgramParameter pname, [OutAttribute] Int32* @params)
+        unsafe void GetProgramInfoLog(UInt32 program, Int32 bufsize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infolog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES20.ProgramParameter)pname, (Int32*)@params);
+            Delegates.glGetProgramInfoLog((UInt32)program, (Int32)bufsize, (Int32*)length, (StringBuilder)infolog);
             #if DEBUG
             }
             #endif
@@ -7232,7 +7198,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
-        unsafe void GetProgram(UInt32 program, OpenTK.Graphics.ES20.ProgramParameter pname, [OutAttribute] Int32* @params)
+        unsafe void GetProgram(Int32 program, OpenTK.Graphics.ES20.ProgramParameter pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -7325,16 +7291,35 @@ namespace OpenTK.Graphics.ES20
             #endif
         }
 
+        
+        /// <summary>
+        /// Returns a parameter from a program object
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// Specifies the program object to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the object parameter. Accepted symbolic names are GL_DELETE_STATUS, GL_LINK_STATUS, GL_VALIDATE_STATUS, GL_INFO_LOG_LENGTH, GL_ATTACHED_SHADERS, GL_ACTIVE_ATTRIBUTES, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, GL_ACTIVE_UNIFORMS, GL_ACTIVE_UNIFORM_MAX_LENGTH.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the requested object parameter.
+        /// </para>
+        /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetRenderbufferParameteriv")]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
-        unsafe void GetRenderbufferParameter(OpenTK.Graphics.ES20.RenderbufferTarget target, OpenTK.Graphics.ES20.RenderbufferParameterName pname, [OutAttribute] Int32* @params)
+        unsafe void GetProgram(UInt32 program, OpenTK.Graphics.ES20.ProgramParameter pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetRenderbufferParameteriv((OpenTK.Graphics.ES20.RenderbufferTarget)target, (OpenTK.Graphics.ES20.RenderbufferParameterName)pname, (Int32*)@params);
+            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.ES20.ProgramParameter)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -7381,40 +7366,16 @@ namespace OpenTK.Graphics.ES20
             #endif
         }
 
-        
-        /// <summary>
-        /// Returns the information log for a shader object
-        /// </summary>
-        /// <param name="shader">
-        /// <para>
-        /// Specifies the shader object whose information log is to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="maxLength">
-        /// <para>
-        /// Specifies the size of the character buffer for storing the returned information log.
-        /// </para>
-        /// </param>
-        /// <param name="length">
-        /// <para>
-        /// Returns the length of the string returned in infoLog (excluding the null terminator).
-        /// </para>
-        /// </param>
-        /// <param name="infoLog">
-        /// <para>
-        /// Specifies an array of characters that is used to return the information log.
-        /// </para>
-        /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetShaderInfoLog")]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetRenderbufferParameteriv")]
         public static 
-        unsafe void GetShaderInfoLog(Int32 shader, Int32 bufsize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infolog)
+        unsafe void GetRenderbufferParameter(OpenTK.Graphics.ES20.RenderbufferTarget target, OpenTK.Graphics.ES20.RenderbufferParameterName pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetShaderInfoLog((UInt32)shader, (Int32)bufsize, (Int32*)length, (StringBuilder)infolog);
+            Delegates.glGetRenderbufferParameteriv((OpenTK.Graphics.ES20.RenderbufferTarget)target, (OpenTK.Graphics.ES20.RenderbufferParameterName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -7536,7 +7497,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetShaderInfoLog")]
         public static 
-        unsafe void GetShaderInfoLog(UInt32 shader, Int32 bufsize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infolog)
+        unsafe void GetShaderInfoLog(Int32 shader, Int32 bufsize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infolog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -7641,33 +7602,38 @@ namespace OpenTK.Graphics.ES20
 
         
         /// <summary>
-        /// Returns a parameter from a shader object
+        /// Returns the information log for a shader object
         /// </summary>
         /// <param name="shader">
         /// <para>
-        /// Specifies the shader object to be queried.
+        /// Specifies the shader object whose information log is to be queried.
         /// </para>
         /// </param>
-        /// <param name="pname">
+        /// <param name="maxLength">
         /// <para>
-        /// Specifies the object parameter. Accepted symbolic names are GL_SHADER_TYPE, GL_DELETE_STATUS, GL_COMPILE_STATUS, GL_INFO_LOG_LENGTH, GL_SHADER_SOURCE_LENGTH.
+        /// Specifies the size of the character buffer for storing the returned information log.
         /// </para>
         /// </param>
-        /// <param name="params">
+        /// <param name="length">
         /// <para>
-        /// Returns the requested object parameter.
+        /// Returns the length of the string returned in infoLog (excluding the null terminator).
+        /// </para>
+        /// </param>
+        /// <param name="infoLog">
+        /// <para>
+        /// Specifies an array of characters that is used to return the information log.
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetShaderiv")]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetShaderInfoLog")]
         public static 
-        unsafe void GetShader(Int32 shader, OpenTK.Graphics.ES20.ShaderParameter pname, [OutAttribute] Int32* @params)
+        unsafe void GetShaderInfoLog(UInt32 shader, Int32 bufsize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infolog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetShaderiv((UInt32)shader, (OpenTK.Graphics.ES20.ShaderParameter)pname, (Int32*)@params);
+            Delegates.glGetShaderInfoLog((UInt32)shader, (Int32)bufsize, (Int32*)length, (StringBuilder)infolog);
             #if DEBUG
             }
             #endif
@@ -7774,7 +7740,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetShaderiv")]
         public static 
-        unsafe void GetShader(UInt32 shader, OpenTK.Graphics.ES20.ShaderParameter pname, [OutAttribute] Int32* @params)
+        unsafe void GetShader(Int32 shader, OpenTK.Graphics.ES20.ShaderParameter pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -7867,16 +7833,35 @@ namespace OpenTK.Graphics.ES20
             #endif
         }
 
+        
+        /// <summary>
+        /// Returns a parameter from a shader object
+        /// </summary>
+        /// <param name="shader">
+        /// <para>
+        /// Specifies the shader object to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the object parameter. Accepted symbolic names are GL_SHADER_TYPE, GL_DELETE_STATUS, GL_COMPILE_STATUS, GL_INFO_LOG_LENGTH, GL_SHADER_SOURCE_LENGTH.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the requested object parameter.
+        /// </para>
+        /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetShaderPrecisionFormat")]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetShaderiv")]
         public static 
-        unsafe void GetShaderPrecisionFormat(OpenTK.Graphics.ES20.ShaderType shadertype, OpenTK.Graphics.ES20.ShaderPrecision precisiontype, [OutAttribute] Int32* range, [OutAttribute] Int32* precision)
+        unsafe void GetShader(UInt32 shader, OpenTK.Graphics.ES20.ShaderParameter pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetShaderPrecisionFormat((OpenTK.Graphics.ES20.ShaderType)shadertype, (OpenTK.Graphics.ES20.ShaderPrecision)precisiontype, (Int32*)range, (Int32*)precision);
+            Delegates.glGetShaderiv((UInt32)shader, (OpenTK.Graphics.ES20.ShaderParameter)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -7926,40 +7911,16 @@ namespace OpenTK.Graphics.ES20
             #endif
         }
 
-        
-        /// <summary>
-        /// Returns the source code string from a shader object
-        /// </summary>
-        /// <param name="shader">
-        /// <para>
-        /// Specifies the shader object to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="bufSize">
-        /// <para>
-        /// Specifies the size of the character buffer for storing the returned source code string.
-        /// </para>
-        /// </param>
-        /// <param name="length">
-        /// <para>
-        /// Returns the length of the string returned in source (excluding the null terminator).
-        /// </para>
-        /// </param>
-        /// <param name="source">
-        /// <para>
-        /// Specifies an array of characters that is used to return the source code string.
-        /// </para>
-        /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetShaderSource")]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetShaderPrecisionFormat")]
         public static 
-        unsafe void GetShaderSource(Int32 shader, Int32 bufsize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder source)
+        unsafe void GetShaderPrecisionFormat(OpenTK.Graphics.ES20.ShaderType shadertype, OpenTK.Graphics.ES20.ShaderPrecision precisiontype, [OutAttribute] Int32* range, [OutAttribute] Int32* precision)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetShaderSource((UInt32)shader, (Int32)bufsize, (Int32*)length, (StringBuilder)source);
+            Delegates.glGetShaderPrecisionFormat((OpenTK.Graphics.ES20.ShaderType)shadertype, (OpenTK.Graphics.ES20.ShaderPrecision)precisiontype, (Int32*)range, (Int32*)precision);
             #if DEBUG
             }
             #endif
@@ -8081,7 +8042,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetShaderSource")]
         public static 
-        unsafe void GetShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder source)
+        unsafe void GetShaderSource(Int32 shader, Int32 bufsize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder source)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -8185,6 +8146,45 @@ namespace OpenTK.Graphics.ES20
         }
 
         
+        /// <summary>
+        /// Returns the source code string from a shader object
+        /// </summary>
+        /// <param name="shader">
+        /// <para>
+        /// Specifies the shader object to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="bufSize">
+        /// <para>
+        /// Specifies the size of the character buffer for storing the returned source code string.
+        /// </para>
+        /// </param>
+        /// <param name="length">
+        /// <para>
+        /// Returns the length of the string returned in source (excluding the null terminator).
+        /// </para>
+        /// </param>
+        /// <param name="source">
+        /// <para>
+        /// Specifies an array of characters that is used to return the source code string.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetShaderSource")]
+        public static 
+        unsafe void GetShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder source)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetShaderSource((UInt32)shader, (Int32)bufsize, (Int32*)length, (StringBuilder)source);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Return a string describing the current GL connection
         /// </summary>
@@ -8209,6 +8209,45 @@ namespace OpenTK.Graphics.ES20
         }
 
         
+        /// <summary>
+        /// Return texture parameter values
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the symbolic name of the target texture. GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, and GL_TEXTURE_CUBE_MAP are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the symbolic name of a texture parameter. GL_TEXTURE_MAG_FILTER, GL_TEXTURE_MIN_FILTER, GL_TEXTURE_MIN_LOD, GL_TEXTURE_MAX_LOD, GL_TEXTURE_BASE_LEVEL, GL_TEXTURE_MAX_LEVEL, GL_TEXTURE_WRAP_S, GL_TEXTURE_WRAP_T, GL_TEXTURE_WRAP_R, GL_TEXTURE_BORDER_COLOR, GL_TEXTURE_PRIORITY, GL_TEXTURE_RESIDENT, GL_TEXTURE_COMPARE_MODE, GL_TEXTURE_COMPARE_FUNC, GL_DEPTH_TEXTURE_MODE, and GL_GENERATE_MIPMAP are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the texture parameters.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetTexParameterfv")]
+        public static 
+        void GetTexParameter(OpenTK.Graphics.ES20.TextureTarget target, OpenTK.Graphics.ES20.GetTextureParameter pname, [OutAttribute] Single[] @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* @params_ptr = @params)
+                {
+                    Delegates.glGetTexParameterfv((OpenTK.Graphics.ES20.TextureTarget)target, (OpenTK.Graphics.ES20.GetTextureParameter)pname, (Single*)@params_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Return texture parameter values
         /// </summary>
@@ -8283,79 +8322,6 @@ namespace OpenTK.Graphics.ES20
         }
 
         
-        /// <summary>
-        /// Return texture parameter values
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the symbolic name of the target texture. GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, and GL_TEXTURE_CUBE_MAP are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the symbolic name of a texture parameter. GL_TEXTURE_MAG_FILTER, GL_TEXTURE_MIN_FILTER, GL_TEXTURE_MIN_LOD, GL_TEXTURE_MAX_LOD, GL_TEXTURE_BASE_LEVEL, GL_TEXTURE_MAX_LEVEL, GL_TEXTURE_WRAP_S, GL_TEXTURE_WRAP_T, GL_TEXTURE_WRAP_R, GL_TEXTURE_BORDER_COLOR, GL_TEXTURE_PRIORITY, GL_TEXTURE_RESIDENT, GL_TEXTURE_COMPARE_MODE, GL_TEXTURE_COMPARE_FUNC, GL_DEPTH_TEXTURE_MODE, and GL_GENERATE_MIPMAP are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the texture parameters.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetTexParameterfv")]
-        public static 
-        void GetTexParameter(OpenTK.Graphics.ES20.TextureTarget target, OpenTK.Graphics.ES20.GetTextureParameter pname, [OutAttribute] Single[] @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* @params_ptr = @params)
-                {
-                    Delegates.glGetTexParameterfv((OpenTK.Graphics.ES20.TextureTarget)target, (OpenTK.Graphics.ES20.GetTextureParameter)pname, (Single*)@params_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Return texture parameter values
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the symbolic name of the target texture. GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, and GL_TEXTURE_CUBE_MAP are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the symbolic name of a texture parameter. GL_TEXTURE_MAG_FILTER, GL_TEXTURE_MIN_FILTER, GL_TEXTURE_MIN_LOD, GL_TEXTURE_MAX_LOD, GL_TEXTURE_BASE_LEVEL, GL_TEXTURE_MAX_LEVEL, GL_TEXTURE_WRAP_S, GL_TEXTURE_WRAP_T, GL_TEXTURE_WRAP_R, GL_TEXTURE_BORDER_COLOR, GL_TEXTURE_PRIORITY, GL_TEXTURE_RESIDENT, GL_TEXTURE_COMPARE_MODE, GL_TEXTURE_COMPARE_FUNC, GL_DEPTH_TEXTURE_MODE, and GL_GENERATE_MIPMAP are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the texture parameters.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetTexParameteriv")]
-        public static 
-        unsafe void GetTexParameter(OpenTK.Graphics.ES20.TextureTarget target, OpenTK.Graphics.ES20.GetTextureParameter pname, [OutAttribute] Int32* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGetTexParameteriv((OpenTK.Graphics.ES20.TextureTarget)target, (OpenTK.Graphics.ES20.GetTextureParameter)pname, (Int32*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Return texture parameter values
         /// </summary>
@@ -8435,6 +8401,79 @@ namespace OpenTK.Graphics.ES20
         }
 
         
+        /// <summary>
+        /// Return texture parameter values
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the symbolic name of the target texture. GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, and GL_TEXTURE_CUBE_MAP are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the symbolic name of a texture parameter. GL_TEXTURE_MAG_FILTER, GL_TEXTURE_MIN_FILTER, GL_TEXTURE_MIN_LOD, GL_TEXTURE_MAX_LOD, GL_TEXTURE_BASE_LEVEL, GL_TEXTURE_MAX_LEVEL, GL_TEXTURE_WRAP_S, GL_TEXTURE_WRAP_T, GL_TEXTURE_WRAP_R, GL_TEXTURE_BORDER_COLOR, GL_TEXTURE_PRIORITY, GL_TEXTURE_RESIDENT, GL_TEXTURE_COMPARE_MODE, GL_TEXTURE_COMPARE_FUNC, GL_DEPTH_TEXTURE_MODE, and GL_GENERATE_MIPMAP are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the texture parameters.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetTexParameteriv")]
+        public static 
+        unsafe void GetTexParameter(OpenTK.Graphics.ES20.TextureTarget target, OpenTK.Graphics.ES20.GetTextureParameter pname, [OutAttribute] Int32* @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetTexParameteriv((OpenTK.Graphics.ES20.TextureTarget)target, (OpenTK.Graphics.ES20.GetTextureParameter)pname, (Int32*)@params);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Returns the value of a uniform variable
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// Specifies the program object to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the value of the specified uniform variable.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetUniformfv")]
+        public static 
+        void GetUniform(Int32 program, Int32 location, [OutAttribute] Single[] @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* @params_ptr = @params)
+                {
+                    Delegates.glGetUniformfv((UInt32)program, (Int32)location, (Single*)@params_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Returns the value of a uniform variable
         /// </summary>
@@ -8527,9 +8566,10 @@ namespace OpenTK.Graphics.ES20
         /// Returns the value of the specified uniform variable.
         /// </para>
         /// </param>
+        [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetUniformfv")]
         public static 
-        void GetUniform(Int32 program, Int32 location, [OutAttribute] Single[] @params)
+        void GetUniform(UInt32 program, Int32 location, [OutAttribute] Single[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -8623,80 +8663,6 @@ namespace OpenTK.Graphics.ES20
         }
 
         
-        /// <summary>
-        /// Returns the value of a uniform variable
-        /// </summary>
-        /// <param name="program">
-        /// <para>
-        /// Specifies the program object to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the value of the specified uniform variable.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetUniformfv")]
-        public static 
-        void GetUniform(UInt32 program, Int32 location, [OutAttribute] Single[] @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* @params_ptr = @params)
-                {
-                    Delegates.glGetUniformfv((UInt32)program, (Int32)location, (Single*)@params_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Returns the value of a uniform variable
-        /// </summary>
-        /// <param name="program">
-        /// <para>
-        /// Specifies the program object to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the value of the specified uniform variable.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetUniformiv")]
-        public static 
-        unsafe void GetUniform(Int32 program, Int32 location, [OutAttribute] Int32* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGetUniformiv((UInt32)program, (Int32)location, (Int32*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Returns the value of a uniform variable
         /// </summary>
@@ -8797,7 +8763,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetUniformiv")]
         public static 
-        unsafe void GetUniform(UInt32 program, Int32 location, [OutAttribute] Int32* @params)
+        unsafe void GetUniform(Int32 program, Int32 location, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -8891,6 +8857,40 @@ namespace OpenTK.Graphics.ES20
         }
 
         
+        /// <summary>
+        /// Returns the value of a uniform variable
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// Specifies the program object to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the value of the specified uniform variable.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetUniformiv")]
+        public static 
+        unsafe void GetUniform(UInt32 program, Int32 location, [OutAttribute] Int32* @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetUniformiv((UInt32)program, (Int32)location, (Int32*)@params);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Returns the location of a uniform variable
         /// </summary>
@@ -8948,6 +8948,45 @@ namespace OpenTK.Graphics.ES20
         }
 
         
+        /// <summary>
+        /// Return a generic vertex attribute parameter
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the generic vertex attribute parameter to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the symbolic name of the vertex attribute parameter to be queried. Accepted values are GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, GL_VERTEX_ATTRIB_ARRAY_ENABLED, GL_VERTEX_ATTRIB_ARRAY_SIZE, GL_VERTEX_ATTRIB_ARRAY_STRIDE, GL_VERTEX_ATTRIB_ARRAY_TYPE, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, or GL_CURRENT_VERTEX_ATTRIB.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the requested data.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetVertexAttribfv")]
+        public static 
+        void GetVertexAttrib(Int32 index, OpenTK.Graphics.ES20.VertexAttribParameter pname, [OutAttribute] Single[] @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* @params_ptr = @params)
+                {
+                    Delegates.glGetVertexAttribfv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribParameter)pname, (Single*)@params_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Return a generic vertex attribute parameter
         /// </summary>
@@ -9040,9 +9079,10 @@ namespace OpenTK.Graphics.ES20
         /// Returns the requested data.
         /// </para>
         /// </param>
+        [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetVertexAttribfv")]
         public static 
-        void GetVertexAttrib(Int32 index, OpenTK.Graphics.ES20.VertexAttribParameter pname, [OutAttribute] Single[] @params)
+        void GetVertexAttrib(UInt32 index, OpenTK.Graphics.ES20.VertexAttribParameter pname, [OutAttribute] Single[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -9136,80 +9176,6 @@ namespace OpenTK.Graphics.ES20
         }
 
         
-        /// <summary>
-        /// Return a generic vertex attribute parameter
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the generic vertex attribute parameter to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the symbolic name of the vertex attribute parameter to be queried. Accepted values are GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, GL_VERTEX_ATTRIB_ARRAY_ENABLED, GL_VERTEX_ATTRIB_ARRAY_SIZE, GL_VERTEX_ATTRIB_ARRAY_STRIDE, GL_VERTEX_ATTRIB_ARRAY_TYPE, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, or GL_CURRENT_VERTEX_ATTRIB.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the requested data.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetVertexAttribfv")]
-        public static 
-        void GetVertexAttrib(UInt32 index, OpenTK.Graphics.ES20.VertexAttribParameter pname, [OutAttribute] Single[] @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* @params_ptr = @params)
-                {
-                    Delegates.glGetVertexAttribfv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribParameter)pname, (Single*)@params_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Return a generic vertex attribute parameter
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the generic vertex attribute parameter to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the symbolic name of the vertex attribute parameter to be queried. Accepted values are GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, GL_VERTEX_ATTRIB_ARRAY_ENABLED, GL_VERTEX_ATTRIB_ARRAY_SIZE, GL_VERTEX_ATTRIB_ARRAY_STRIDE, GL_VERTEX_ATTRIB_ARRAY_TYPE, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, or GL_CURRENT_VERTEX_ATTRIB.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the requested data.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetVertexAttribiv")]
-        public static 
-        unsafe void GetVertexAttrib(Int32 index, OpenTK.Graphics.ES20.VertexAttribParameter pname, [OutAttribute] Int32* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGetVertexAttribiv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribParameter)pname, (Int32*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Return a generic vertex attribute parameter
         /// </summary>
@@ -9310,7 +9276,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetVertexAttribiv")]
         public static 
-        unsafe void GetVertexAttrib(UInt32 index, OpenTK.Graphics.ES20.VertexAttribParameter pname, [OutAttribute] Int32* @params)
+        unsafe void GetVertexAttrib(Int32 index, OpenTK.Graphics.ES20.VertexAttribParameter pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -9405,42 +9371,33 @@ namespace OpenTK.Graphics.ES20
 
         
         /// <summary>
-        /// Return the address of the specified generic vertex attribute pointer
+        /// Return a generic vertex attribute parameter
         /// </summary>
         /// <param name="index">
         /// <para>
-        /// Specifies the generic vertex attribute parameter to be returned.
+        /// Specifies the generic vertex attribute parameter to be queried.
         /// </para>
         /// </param>
         /// <param name="pname">
         /// <para>
-        /// Specifies the symbolic name of the generic vertex attribute parameter to be returned. Must be GL_VERTEX_ATTRIB_ARRAY_POINTER.
+        /// Specifies the symbolic name of the vertex attribute parameter to be queried. Accepted values are GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, GL_VERTEX_ATTRIB_ARRAY_ENABLED, GL_VERTEX_ATTRIB_ARRAY_SIZE, GL_VERTEX_ATTRIB_ARRAY_STRIDE, GL_VERTEX_ATTRIB_ARRAY_TYPE, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, or GL_CURRENT_VERTEX_ATTRIB.
         /// </para>
         /// </param>
-        /// <param name="pointer">
+        /// <param name="params">
         /// <para>
-        /// Returns the pointer value.
+        /// Returns the requested data.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetVertexAttribiv")]
         public static 
-        void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.ES20.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] ref T2 pointer)
-            where T2 : struct
+        unsafe void GetVertexAttrib(UInt32 index, OpenTK.Graphics.ES20.VertexAttribParameter pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribPointerParameter)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                pointer = (T2)pointer_ptr.Target;
-            }
-            finally
-            {
-                pointer_ptr.Free();
-            }
+            Delegates.glGetVertexAttribiv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribParameter)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -9467,7 +9424,40 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
         public static 
-        void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.ES20.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] T2[,,] pointer)
+        void GetVertexAttribPointer(Int32 index, OpenTK.Graphics.ES20.VertexAttribPointerParameter pname, [OutAttribute] IntPtr pointer)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribPointerParameter)pname, (IntPtr)pointer);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Return the address of the specified generic vertex attribute pointer
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the generic vertex attribute parameter to be returned.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the symbolic name of the generic vertex attribute parameter to be returned. Must be GL_VERTEX_ATTRIB_ARRAY_POINTER.
+        /// </para>
+        /// </param>
+        /// <param name="pointer">
+        /// <para>
+        /// Returns the pointer value.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
+        public static 
+        void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.ES20.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] T2[] pointer)
             where T2 : struct
         {
             #if DEBUG
@@ -9551,7 +9541,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
         public static 
-        void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.ES20.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] T2[] pointer)
+        void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.ES20.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] T2[,,] pointer)
             where T2 : struct
         {
             #if DEBUG
@@ -9593,41 +9583,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
         public static 
-        void GetVertexAttribPointer(Int32 index, OpenTK.Graphics.ES20.VertexAttribPointerParameter pname, [OutAttribute] IntPtr pointer)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribPointerParameter)pname, (IntPtr)pointer);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Return the address of the specified generic vertex attribute pointer
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the generic vertex attribute parameter to be returned.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the symbolic name of the generic vertex attribute parameter to be returned. Must be GL_VERTEX_ATTRIB_ARRAY_POINTER.
-        /// </para>
-        /// </param>
-        /// <param name="pointer">
-        /// <para>
-        /// Returns the pointer value.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
-        public static 
-        void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.ES20.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] ref T2 pointer)
+        void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.ES20.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] ref T2 pointer)
             where T2 : struct
         {
             #if DEBUG
@@ -9671,7 +9627,41 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
         public static 
-        void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.ES20.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] T2[,,] pointer)
+        void GetVertexAttribPointer(UInt32 index, OpenTK.Graphics.ES20.VertexAttribPointerParameter pname, [OutAttribute] IntPtr pointer)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribPointerParameter)pname, (IntPtr)pointer);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Return the address of the specified generic vertex attribute pointer
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the generic vertex attribute parameter to be returned.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the symbolic name of the generic vertex attribute parameter to be returned. Must be GL_VERTEX_ATTRIB_ARRAY_POINTER.
+        /// </para>
+        /// </param>
+        /// <param name="pointer">
+        /// <para>
+        /// Returns the pointer value.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
+        public static 
+        void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.ES20.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] T2[] pointer)
             where T2 : struct
         {
             #if DEBUG
@@ -9757,7 +9747,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
         public static 
-        void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.ES20.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] T2[] pointer)
+        void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.ES20.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] T2[,,] pointer)
             where T2 : struct
         {
             #if DEBUG
@@ -9800,13 +9790,23 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
         public static 
-        void GetVertexAttribPointer(UInt32 index, OpenTK.Graphics.ES20.VertexAttribPointerParameter pname, [OutAttribute] IntPtr pointer)
+        void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.ES20.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] ref T2 pointer)
+            where T2 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribPointerParameter)pname, (IntPtr)pointer);
+            GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.ES20.VertexAttribPointerParameter)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                pointer = (T2)pointer_ptr.Target;
+            }
+            finally
+            {
+                pointer_ptr.Free();
+            }
             #if DEBUG
             }
             #endif
@@ -10266,23 +10266,13 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glReadPixels")]
         public static 
-        void ReadPixels<T6>(Int32 x, Int32 y, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] ref T6 pixels)
-            where T6 : struct
+        void ReadPixels(Int32 x, Int32 y, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, IntPtr pixels)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glReadPixels((Int32)x, (Int32)y, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                pixels = (T6)pixels_ptr.Target;
-            }
-            finally
-            {
-                pixels_ptr.Free();
-            }
+            Delegates.glReadPixels((Int32)x, (Int32)y, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels);
             #if DEBUG
             }
             #endif
@@ -10319,7 +10309,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glReadPixels")]
         public static 
-        void ReadPixels<T6>(Int32 x, Int32 y, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] T6[,,] pixels)
+        void ReadPixels<T6>(Int32 x, Int32 y, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] T6[] pixels)
             where T6 : struct
         {
             #if DEBUG
@@ -10423,7 +10413,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glReadPixels")]
         public static 
-        void ReadPixels<T6>(Int32 x, Int32 y, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] T6[] pixels)
+        void ReadPixels<T6>(Int32 x, Int32 y, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] T6[,,] pixels)
             where T6 : struct
         {
             #if DEBUG
@@ -10475,13 +10465,23 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glReadPixels")]
         public static 
-        void ReadPixels(Int32 x, Int32 y, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, IntPtr pixels)
+        void ReadPixels<T6>(Int32 x, Int32 y, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] ref T6 pixels)
+            where T6 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glReadPixels((Int32)x, (Int32)y, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels);
+            GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glReadPixels((Int32)x, (Int32)y, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                pixels = (T6)pixels_ptr.Target;
+            }
+            finally
+            {
+                pixels_ptr.Free();
+            }
             #if DEBUG
             }
             #endif
@@ -10571,122 +10571,9 @@ namespace OpenTK.Graphics.ES20
             #endif
         }
 
-        [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        unsafe void ShaderBinary<T3>(Int32 n, Int32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] ref T3 binary, Int32 length)
-            where T3 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
-                binary = (T3)binary_ptr.Target;
-            }
-            finally
-            {
-                binary_ptr.Free();
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
-        public static 
-        unsafe void ShaderBinary<T3>(Int32 n, Int32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,,] binary, Int32 length)
-            where T3 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
-            }
-            finally
-            {
-                binary_ptr.Free();
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
-        public static 
-        unsafe void ShaderBinary<T3>(Int32 n, Int32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,] binary, Int32 length)
-            where T3 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
-            }
-            finally
-            {
-                binary_ptr.Free();
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
-        public static 
-        unsafe void ShaderBinary<T3>(Int32 n, Int32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[] binary, Int32 length)
-            where T3 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
-            }
-            finally
-            {
-                binary_ptr.Free();
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
-        public static 
-        unsafe void ShaderBinary(Int32 n, Int32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, IntPtr binary, Int32 length)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary, (Int32)length);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
-        public static 
-        void ShaderBinary<T3>(Int32 n, Int32[] shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] ref T3 binary, Int32 length)
-            where T3 : struct
+        void ShaderBinary(Int32 n, Int32[] shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, IntPtr binary, Int32 length)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -10696,16 +10583,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (Int32* shaders_ptr = shaders)
                 {
-                    GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
-                    try
-                    {
-                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
-                        binary = (T3)binary_ptr.Target;
-                    }
-                    finally
-                    {
-                        binary_ptr.Free();
-                    }
+                    Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary, (Int32)length);
                 }
             }
             #if DEBUG
@@ -10715,7 +10593,7 @@ namespace OpenTK.Graphics.ES20
 
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary<T3>(Int32 n, Int32[] shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,,] binary, Int32 length)
+        void ShaderBinary<T3>(Int32 n, Int32[] shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[] binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -10773,7 +10651,7 @@ namespace OpenTK.Graphics.ES20
 
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary<T3>(Int32 n, Int32[] shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[] binary, Int32 length)
+        void ShaderBinary<T3>(Int32 n, Int32[] shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,,] binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -10802,27 +10680,7 @@ namespace OpenTK.Graphics.ES20
 
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary(Int32 n, Int32[] shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, IntPtr binary, Int32 length)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Int32* shaders_ptr = shaders)
-                {
-                    Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary, (Int32)length);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
-        public static 
-        void ShaderBinary<T3>(Int32 n, ref Int32 shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] ref T3 binary, Int32 length)
+        void ShaderBinary<T3>(Int32 n, Int32[] shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] ref T3 binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -10831,7 +10689,7 @@ namespace OpenTK.Graphics.ES20
             #endif
             unsafe
             {
-                fixed (Int32* shaders_ptr = &shaders)
+                fixed (Int32* shaders_ptr = shaders)
                 {
                     GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
                     try
@@ -10852,7 +10710,27 @@ namespace OpenTK.Graphics.ES20
 
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary<T3>(Int32 n, ref Int32 shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,,] binary, Int32 length)
+        void ShaderBinary(Int32 n, ref Int32 shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, IntPtr binary, Int32 length)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Int32* shaders_ptr = &shaders)
+                {
+                    Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary, (Int32)length);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
+        public static 
+        void ShaderBinary<T3>(Int32 n, ref Int32 shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[] binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -10910,7 +10788,7 @@ namespace OpenTK.Graphics.ES20
 
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary<T3>(Int32 n, ref Int32 shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[] binary, Int32 length)
+        void ShaderBinary<T3>(Int32 n, ref Int32 shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,,] binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -10939,28 +10817,7 @@ namespace OpenTK.Graphics.ES20
 
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary(Int32 n, ref Int32 shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, IntPtr binary, Int32 length)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Int32* shaders_ptr = &shaders)
-                {
-                    Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary, (Int32)length);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
-        public static 
-        void ShaderBinary<T3>(Int32 n, ref UInt32 shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] ref T3 binary, Int32 length)
+        void ShaderBinary<T3>(Int32 n, ref Int32 shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] ref T3 binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -10969,7 +10826,7 @@ namespace OpenTK.Graphics.ES20
             #endif
             unsafe
             {
-                fixed (UInt32* shaders_ptr = &shaders)
+                fixed (Int32* shaders_ptr = &shaders)
                 {
                     GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
                     try
@@ -10991,27 +10848,36 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary<T3>(Int32 n, ref UInt32 shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,,] binary, Int32 length)
+        unsafe void ShaderBinary(Int32 n, Int32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, IntPtr binary, Int32 length)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary, (Int32)length);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
+        public static 
+        unsafe void ShaderBinary<T3>(Int32 n, Int32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[] binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            unsafe
+            GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
+            try
             {
-                fixed (UInt32* shaders_ptr = &shaders)
-                {
-                    GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
-                    try
-                    {
-                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
-                    }
-                    finally
-                    {
-                        binary_ptr.Free();
-                    }
-                }
+                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+            }
+            finally
+            {
+                binary_ptr.Free();
             }
             #if DEBUG
             }
@@ -11021,27 +10887,21 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary<T3>(Int32 n, ref UInt32 shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,] binary, Int32 length)
+        unsafe void ShaderBinary<T3>(Int32 n, Int32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,] binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            unsafe
+            GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
+            try
             {
-                fixed (UInt32* shaders_ptr = &shaders)
-                {
-                    GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
-                    try
-                    {
-                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
-                    }
-                    finally
-                    {
-                        binary_ptr.Free();
-                    }
-                }
+                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+            }
+            finally
+            {
+                binary_ptr.Free();
             }
             #if DEBUG
             }
@@ -11051,27 +10911,21 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary<T3>(Int32 n, ref UInt32 shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[] binary, Int32 length)
+        unsafe void ShaderBinary<T3>(Int32 n, Int32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,,] binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            unsafe
+            GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
+            try
             {
-                fixed (UInt32* shaders_ptr = &shaders)
-                {
-                    GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
-                    try
-                    {
-                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
-                    }
-                    finally
-                    {
-                        binary_ptr.Free();
-                    }
-                }
+                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+            }
+            finally
+            {
+                binary_ptr.Free();
             }
             #if DEBUG
             }
@@ -11081,28 +10935,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary(Int32 n, ref UInt32 shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, IntPtr binary, Int32 length)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* shaders_ptr = &shaders)
-                {
-                    Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary, (Int32)length);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
-        public static 
-        unsafe void ShaderBinary<T3>(Int32 n, UInt32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] ref T3 binary, Int32 length)
+        unsafe void ShaderBinary<T3>(Int32 n, Int32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] ref T3 binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -11127,95 +10960,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        unsafe void ShaderBinary<T3>(Int32 n, UInt32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,,] binary, Int32 length)
-            where T3 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
-            }
-            finally
-            {
-                binary_ptr.Free();
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
-        public static 
-        unsafe void ShaderBinary<T3>(Int32 n, UInt32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,] binary, Int32 length)
-            where T3 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
-            }
-            finally
-            {
-                binary_ptr.Free();
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
-        public static 
-        unsafe void ShaderBinary<T3>(Int32 n, UInt32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[] binary, Int32 length)
-            where T3 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
-            }
-            finally
-            {
-                binary_ptr.Free();
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
-        public static 
-        unsafe void ShaderBinary(Int32 n, UInt32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, IntPtr binary, Int32 length)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary, (Int32)length);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
-        public static 
-        void ShaderBinary<T3>(Int32 n, UInt32[] shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] ref T3 binary, Int32 length)
-            where T3 : struct
+        void ShaderBinary(Int32 n, UInt32[] shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, IntPtr binary, Int32 length)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -11225,16 +10970,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (UInt32* shaders_ptr = shaders)
                 {
-                    GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
-                    try
-                    {
-                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
-                        binary = (T3)binary_ptr.Target;
-                    }
-                    finally
-                    {
-                        binary_ptr.Free();
-                    }
+                    Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary, (Int32)length);
                 }
             }
             #if DEBUG
@@ -11245,7 +10981,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary<T3>(Int32 n, UInt32[] shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,,] binary, Int32 length)
+        void ShaderBinary<T3>(Int32 n, UInt32[] shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[] binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -11305,7 +11041,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary<T3>(Int32 n, UInt32[] shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[] binary, Int32 length)
+        void ShaderBinary<T3>(Int32 n, UInt32[] shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,,] binary, Int32 length)
             where T3 : struct
         {
             #if DEBUG
@@ -11335,7 +11071,8 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        void ShaderBinary(Int32 n, UInt32[] shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, IntPtr binary, Int32 length)
+        void ShaderBinary<T3>(Int32 n, UInt32[] shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] ref T3 binary, Int32 length)
+            where T3 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -11344,6 +11081,36 @@ namespace OpenTK.Graphics.ES20
             unsafe
             {
                 fixed (UInt32* shaders_ptr = shaders)
+                {
+                    GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
+                    try
+                    {
+                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                        binary = (T3)binary_ptr.Target;
+                    }
+                    finally
+                    {
+                        binary_ptr.Free();
+                    }
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
+        public static 
+        void ShaderBinary(Int32 n, ref UInt32 shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, IntPtr binary, Int32 length)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* shaders_ptr = &shaders)
                 {
                     Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary, (Int32)length);
                 }
@@ -11353,40 +11120,234 @@ namespace OpenTK.Graphics.ES20
             #endif
         }
 
-        
-        /// <summary>
-        /// Replaces the source code in a shader object
-        /// </summary>
-        /// <param name="shader">
-        /// <para>
-        /// Specifies the handle of the shader object whose source code is to be replaced.
-        /// </para>
-        /// </param>
-        /// <param name="count">
-        /// <para>
-        /// Specifies the number of elements in the string and length arrays.
-        /// </para>
-        /// </param>
-        /// <param name="string">
-        /// <para>
-        /// Specifies an array of pointers to strings containing the source code to be loaded into the shader.
-        /// </para>
-        /// </param>
-        /// <param name="length">
-        /// <para>
-        /// Specifies an array of string lengths.
-        /// </para>
-        /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderSource")]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
         public static 
-        unsafe void ShaderSource(Int32 shader, Int32 count, String[] @string, Int32* length)
+        void ShaderBinary<T3>(Int32 n, ref UInt32 shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[] binary, Int32 length)
+            where T3 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glShaderSource((UInt32)shader, (Int32)count, (String[])@string, (Int32*)length);
+            unsafe
+            {
+                fixed (UInt32* shaders_ptr = &shaders)
+                {
+                    GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
+                    try
+                    {
+                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                    }
+                    finally
+                    {
+                        binary_ptr.Free();
+                    }
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
+        public static 
+        void ShaderBinary<T3>(Int32 n, ref UInt32 shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,] binary, Int32 length)
+            where T3 : struct
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* shaders_ptr = &shaders)
+                {
+                    GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
+                    try
+                    {
+                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                    }
+                    finally
+                    {
+                        binary_ptr.Free();
+                    }
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
+        public static 
+        void ShaderBinary<T3>(Int32 n, ref UInt32 shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,,] binary, Int32 length)
+            where T3 : struct
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* shaders_ptr = &shaders)
+                {
+                    GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
+                    try
+                    {
+                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                    }
+                    finally
+                    {
+                        binary_ptr.Free();
+                    }
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
+        public static 
+        void ShaderBinary<T3>(Int32 n, ref UInt32 shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] ref T3 binary, Int32 length)
+            where T3 : struct
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* shaders_ptr = &shaders)
+                {
+                    GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
+                    try
+                    {
+                        Delegates.glShaderBinary((Int32)n, (UInt32*)shaders_ptr, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                        binary = (T3)binary_ptr.Target;
+                    }
+                    finally
+                    {
+                        binary_ptr.Free();
+                    }
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
+        public static 
+        unsafe void ShaderBinary(Int32 n, UInt32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, IntPtr binary, Int32 length)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary, (Int32)length);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
+        public static 
+        unsafe void ShaderBinary<T3>(Int32 n, UInt32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[] binary, Int32 length)
+            where T3 : struct
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+            }
+            finally
+            {
+                binary_ptr.Free();
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
+        public static 
+        unsafe void ShaderBinary<T3>(Int32 n, UInt32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,] binary, Int32 length)
+            where T3 : struct
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+            }
+            finally
+            {
+                binary_ptr.Free();
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
+        public static 
+        unsafe void ShaderBinary<T3>(Int32 n, UInt32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] T3[,,] binary, Int32 length)
+            where T3 : struct
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+            }
+            finally
+            {
+                binary_ptr.Free();
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderBinary")]
+        public static 
+        unsafe void ShaderBinary<T3>(Int32 n, UInt32* shaders, OpenTK.Graphics.ES20.ShaderBinaryFormat binaryformat, [InAttribute, OutAttribute] ref T3 binary, Int32 length)
+            where T3 : struct
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glShaderBinary((Int32)n, (UInt32*)shaders, (OpenTK.Graphics.ES20.ShaderBinaryFormat)binaryformat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                binary = (T3)binary_ptr.Target;
+            }
+            finally
+            {
+                binary_ptr.Free();
+            }
             #if DEBUG
             }
             #endif
@@ -11507,7 +11468,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderSource")]
         public static 
-        unsafe void ShaderSource(UInt32 shader, Int32 count, String[] @string, Int32* length)
+        unsafe void ShaderSource(Int32 shader, Int32 count, String[] @string, Int32* length)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -11610,6 +11571,45 @@ namespace OpenTK.Graphics.ES20
         }
 
         
+        /// <summary>
+        /// Replaces the source code in a shader object
+        /// </summary>
+        /// <param name="shader">
+        /// <para>
+        /// Specifies the handle of the shader object whose source code is to be replaced.
+        /// </para>
+        /// </param>
+        /// <param name="count">
+        /// <para>
+        /// Specifies the number of elements in the string and length arrays.
+        /// </para>
+        /// </param>
+        /// <param name="string">
+        /// <para>
+        /// Specifies an array of pointers to strings containing the source code to be loaded into the shader.
+        /// </para>
+        /// </param>
+        /// <param name="length">
+        /// <para>
+        /// Specifies an array of string lengths.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glShaderSource")]
+        public static 
+        unsafe void ShaderSource(UInt32 shader, Int32 count, String[] @string, Int32* length)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glShaderSource((UInt32)shader, (Int32)count, (String[])@string, (Int32*)length);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set front and back function and reference value for stencil testing
         /// </summary>
@@ -11979,23 +11979,13 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glTexImage2D")]
         public static 
-        void TexImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] ref T8 pixels)
-            where T8 : struct
+        void TexImage2D(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, IntPtr pixels)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glTexImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (OpenTK.Graphics.ES20.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                pixels = (T8)pixels_ptr.Target;
-            }
-            finally
-            {
-                pixels_ptr.Free();
-            }
+            Delegates.glTexImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (OpenTK.Graphics.ES20.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels);
             #if DEBUG
             }
             #endif
@@ -12052,7 +12042,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glTexImage2D")]
         public static 
-        void TexImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] T8[,,] pixels)
+        void TexImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] T8[] pixels)
             where T8 : struct
         {
             #if DEBUG
@@ -12196,7 +12186,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glTexImage2D")]
         public static 
-        void TexImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] T8[] pixels)
+        void TexImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] T8[,,] pixels)
             where T8 : struct
         {
             #if DEBUG
@@ -12268,13 +12258,23 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glTexImage2D")]
         public static 
-        void TexImage2D(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, IntPtr pixels)
+        void TexImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, OpenTK.Graphics.ES20.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] ref T8 pixels)
+            where T8 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glTexImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (OpenTK.Graphics.ES20.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels);
+            GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glTexImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (OpenTK.Graphics.ES20.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                pixels = (T8)pixels_ptr.Target;
+            }
+            finally
+            {
+                pixels_ptr.Free();
+            }
             #if DEBUG
             }
             #endif
@@ -12314,40 +12314,6 @@ namespace OpenTK.Graphics.ES20
         }
 
         
-        /// <summary>
-        /// Set texture parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target texture, which must be either GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, or GL_TEXTURE_CUBE_MAP.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the symbolic name of a single-valued texture parameter. pname can be one of the following: GL_TEXTURE_MIN_FILTER, GL_TEXTURE_MAG_FILTER, GL_TEXTURE_MIN_LOD, GL_TEXTURE_MAX_LOD, GL_TEXTURE_BASE_LEVEL, GL_TEXTURE_MAX_LEVEL, GL_TEXTURE_WRAP_S, GL_TEXTURE_WRAP_T, GL_TEXTURE_WRAP_R, GL_TEXTURE_PRIORITY, GL_TEXTURE_COMPARE_MODE, GL_TEXTURE_COMPARE_FUNC, GL_DEPTH_TEXTURE_MODE, or GL_GENERATE_MIPMAP.
-        /// </para>
-        /// </param>
-        /// <param name="param">
-        /// <para>
-        /// Specifies the value of pname.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glTexParameterfv")]
-        public static 
-        unsafe void TexParameter(OpenTK.Graphics.ES20.TextureTarget target, OpenTK.Graphics.ES20.TextureParameterName pname, Single* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glTexParameterfv((OpenTK.Graphics.ES20.TextureTarget)target, (OpenTK.Graphics.ES20.TextureParameterName)pname, (Single*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set texture parameters
         /// </summary>
@@ -12405,15 +12371,16 @@ namespace OpenTK.Graphics.ES20
         /// Specifies the value of pname.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glTexParameteri")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glTexParameterfv")]
         public static 
-        void TexParameter(OpenTK.Graphics.ES20.TextureTarget target, OpenTK.Graphics.ES20.TextureParameterName pname, Int32 param)
+        unsafe void TexParameter(OpenTK.Graphics.ES20.TextureTarget target, OpenTK.Graphics.ES20.TextureParameterName pname, Single* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glTexParameteri((OpenTK.Graphics.ES20.TextureTarget)target, (OpenTK.Graphics.ES20.TextureParameterName)pname, (Int32)param);
+            Delegates.glTexParameterfv((OpenTK.Graphics.ES20.TextureTarget)target, (OpenTK.Graphics.ES20.TextureParameterName)pname, (Single*)@params);
             #if DEBUG
             }
             #endif
@@ -12438,16 +12405,15 @@ namespace OpenTK.Graphics.ES20
         /// Specifies the value of pname.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glTexParameteriv")]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glTexParameteri")]
         public static 
-        unsafe void TexParameter(OpenTK.Graphics.ES20.TextureTarget target, OpenTK.Graphics.ES20.TextureParameterName pname, Int32* @params)
+        void TexParameter(OpenTK.Graphics.ES20.TextureTarget target, OpenTK.Graphics.ES20.TextureParameterName pname, Int32 param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glTexParameteriv((OpenTK.Graphics.ES20.TextureTarget)target, (OpenTK.Graphics.ES20.TextureParameterName)pname, (Int32*)@params);
+            Delegates.glTexParameteri((OpenTK.Graphics.ES20.TextureTarget)target, (OpenTK.Graphics.ES20.TextureParameterName)pname, (Int32)param);
             #if DEBUG
             }
             #endif
@@ -12494,72 +12460,33 @@ namespace OpenTK.Graphics.ES20
 
         
         /// <summary>
-        /// Specify a two-dimensional texture subimage
+        /// Set texture parameters
         /// </summary>
         /// <param name="target">
         /// <para>
-        /// Specifies the target texture. Must be GL_TEXTURE_2D, GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, or GL_TEXTURE_CUBE_MAP_NEGATIVE_Z.
+        /// Specifies the target texture, which must be either GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, or GL_TEXTURE_CUBE_MAP.
         /// </para>
         /// </param>
-        /// <param name="level">
+        /// <param name="pname">
         /// <para>
-        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
+        /// Specifies the symbolic name of a single-valued texture parameter. pname can be one of the following: GL_TEXTURE_MIN_FILTER, GL_TEXTURE_MAG_FILTER, GL_TEXTURE_MIN_LOD, GL_TEXTURE_MAX_LOD, GL_TEXTURE_BASE_LEVEL, GL_TEXTURE_MAX_LEVEL, GL_TEXTURE_WRAP_S, GL_TEXTURE_WRAP_T, GL_TEXTURE_WRAP_R, GL_TEXTURE_PRIORITY, GL_TEXTURE_COMPARE_MODE, GL_TEXTURE_COMPARE_FUNC, GL_DEPTH_TEXTURE_MODE, or GL_GENERATE_MIPMAP.
         /// </para>
         /// </param>
-        /// <param name="xoffset">
+        /// <param name="param">
         /// <para>
-        /// Specifies a texel offset in the x direction within the texture array.
+        /// Specifies the value of pname.
         /// </para>
         /// </param>
-        /// <param name="yoffset">
-        /// <para>
-        /// Specifies a texel offset in the y direction within the texture array.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// Specifies the width of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="height">
-        /// <para>
-        /// Specifies the height of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Specifies the format of the pixel data. The following symbolic values are accepted: GL_COLOR_INDEX, GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the data type of the pixel data. The following symbolic values are accepted: GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the image data in memory.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glTexSubImage2D")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glTexParameteriv")]
         public static 
-        void TexSubImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] ref T8 pixels)
-            where T8 : struct
+        unsafe void TexParameter(OpenTK.Graphics.ES20.TextureTarget target, OpenTK.Graphics.ES20.TextureParameterName pname, Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glTexSubImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                pixels = (T8)pixels_ptr.Target;
-            }
-            finally
-            {
-                pixels_ptr.Free();
-            }
+            Delegates.glTexParameteriv((OpenTK.Graphics.ES20.TextureTarget)target, (OpenTK.Graphics.ES20.TextureParameterName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -12616,7 +12543,70 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glTexSubImage2D")]
         public static 
-        void TexSubImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] T8[,,] pixels)
+        void TexSubImage2D(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, IntPtr pixels)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glTexSubImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Specify a two-dimensional texture subimage
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target texture. Must be GL_TEXTURE_2D, GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, or GL_TEXTURE_CUBE_MAP_NEGATIVE_Z.
+        /// </para>
+        /// </param>
+        /// <param name="level">
+        /// <para>
+        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
+        /// </para>
+        /// </param>
+        /// <param name="xoffset">
+        /// <para>
+        /// Specifies a texel offset in the x direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="yoffset">
+        /// <para>
+        /// Specifies a texel offset in the y direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// Specifies the width of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="height">
+        /// <para>
+        /// Specifies the height of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Specifies the format of the pixel data. The following symbolic values are accepted: GL_COLOR_INDEX, GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the data type of the pixel data. The following symbolic values are accepted: GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the image data in memory.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glTexSubImage2D")]
+        public static 
+        void TexSubImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] T8[] pixels)
             where T8 : struct
         {
             #if DEBUG
@@ -12760,7 +12750,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glTexSubImage2D")]
         public static 
-        void TexSubImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] T8[] pixels)
+        void TexSubImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] T8[,,] pixels)
             where T8 : struct
         {
             #if DEBUG
@@ -12832,13 +12822,23 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glTexSubImage2D")]
         public static 
-        void TexSubImage2D(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, IntPtr pixels)
+        void TexSubImage2D<T8>(OpenTK.Graphics.ES20.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.ES20.PixelFormat format, OpenTK.Graphics.ES20.PixelType type, [InAttribute, OutAttribute] ref T8 pixels)
+            where T8 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glTexSubImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels);
+            GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glTexSubImage2D((OpenTK.Graphics.ES20.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.ES20.PixelFormat)format, (OpenTK.Graphics.ES20.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                pixels = (T8)pixels_ptr.Target;
+            }
+            finally
+            {
+                pixels_ptr.Free();
+            }
             #if DEBUG
             }
             #endif
@@ -12873,6 +12873,40 @@ namespace OpenTK.Graphics.ES20
         }
 
         
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glUniform1fv")]
+        public static 
+        void Uniform1(Int32 location, Int32 count, Single[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* v_ptr = v)
+                {
+                    Delegates.glUniform1fv((Int32)location, (Int32)count, (Single*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -12936,40 +12970,6 @@ namespace OpenTK.Graphics.ES20
         }
 
         
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glUniform1fv")]
-        public static 
-        void Uniform1(Int32 location, Int32 count, Single[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* v_ptr = v)
-                {
-                    Delegates.glUniform1fv((Int32)location, (Int32)count, (Single*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -12998,35 +12998,6 @@ namespace OpenTK.Graphics.ES20
         }
 
         
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glUniform1iv")]
-        public static 
-        unsafe void Uniform1(Int32 location, Int32 count, Int32* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glUniform1iv((Int32)location, (Int32)count, (Int32*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -13095,6 +13066,35 @@ namespace OpenTK.Graphics.ES20
         }
 
         
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glUniform1iv")]
+        public static 
+        unsafe void Uniform1(Int32 location, Int32 count, Int32* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glUniform1iv((Int32)location, (Int32)count, (Int32*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -13123,6 +13123,40 @@ namespace OpenTK.Graphics.ES20
         }
 
         
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glUniform2fv")]
+        public static 
+        void Uniform2(Int32 location, Int32 count, Single[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* v_ptr = v)
+                {
+                    Delegates.glUniform2fv((Int32)location, (Int32)count, (Single*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -13186,40 +13220,6 @@ namespace OpenTK.Graphics.ES20
         }
 
         
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glUniform2fv")]
-        public static 
-        void Uniform2(Int32 location, Int32 count, Single[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* v_ptr = v)
-                {
-                    Delegates.glUniform2fv((Int32)location, (Int32)count, (Single*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -13248,35 +13248,6 @@ namespace OpenTK.Graphics.ES20
         }
 
         
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glUniform2iv")]
-        public static 
-        unsafe void Uniform2(Int32 location, Int32 count, Int32* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glUniform2iv((Int32)location, (Int32)count, (Int32*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -13311,6 +13282,35 @@ namespace OpenTK.Graphics.ES20
         }
 
         
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glUniform2iv")]
+        public static 
+        unsafe void Uniform2(Int32 location, Int32 count, Int32* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glUniform2iv((Int32)location, (Int32)count, (Int32*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -13339,6 +13339,40 @@ namespace OpenTK.Graphics.ES20
         }
 
         
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glUniform3fv")]
+        public static 
+        void Uniform3(Int32 location, Int32 count, Single[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* v_ptr = v)
+                {
+                    Delegates.glUniform3fv((Int32)location, (Int32)count, (Single*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -13402,40 +13436,6 @@ namespace OpenTK.Graphics.ES20
         }
 
         
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glUniform3fv")]
-        public static 
-        void Uniform3(Int32 location, Int32 count, Single[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* v_ptr = v)
-                {
-                    Delegates.glUniform3fv((Int32)location, (Int32)count, (Single*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -13464,35 +13464,6 @@ namespace OpenTK.Graphics.ES20
         }
 
         
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glUniform3iv")]
-        public static 
-        unsafe void Uniform3(Int32 location, Int32 count, Int32* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glUniform3iv((Int32)location, (Int32)count, (Int32*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -13561,6 +13532,35 @@ namespace OpenTK.Graphics.ES20
         }
 
         
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glUniform3iv")]
+        public static 
+        unsafe void Uniform3(Int32 location, Int32 count, Int32* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glUniform3iv((Int32)location, (Int32)count, (Int32*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -13589,6 +13589,40 @@ namespace OpenTK.Graphics.ES20
         }
 
         
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glUniform4fv")]
+        public static 
+        void Uniform4(Int32 location, Int32 count, Single[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* v_ptr = v)
+                {
+                    Delegates.glUniform4fv((Int32)location, (Int32)count, (Single*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -13652,40 +13686,6 @@ namespace OpenTK.Graphics.ES20
         }
 
         
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glUniform4fv")]
-        public static 
-        void Uniform4(Int32 location, Int32 count, Single[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* v_ptr = v)
-                {
-                    Delegates.glUniform4fv((Int32)location, (Int32)count, (Single*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -13714,35 +13714,6 @@ namespace OpenTK.Graphics.ES20
         }
 
         
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glUniform4iv")]
-        public static 
-        unsafe void Uniform4(Int32 location, Int32 count, Int32* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glUniform4iv((Int32)location, (Int32)count, (Int32*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -13810,6 +13781,55 @@ namespace OpenTK.Graphics.ES20
             #endif
         }
 
+        
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glUniform4iv")]
+        public static 
+        unsafe void Uniform4(Int32 location, Int32 count, Int32* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glUniform4iv((Int32)location, (Int32)count, (Int32*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glUniformMatrix2fv")]
+        public static 
+        void UniformMatrix2(Int32 location, Int32 count, bool transpose, Single[] value)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* value_ptr = value)
+                {
+                    Delegates.glUniformMatrix2fv((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glUniformMatrix2fv")]
         public static 
         void UniformMatrix2(Int32 location, Int32 count, bool transpose, ref Single value)
@@ -13845,9 +13865,9 @@ namespace OpenTK.Graphics.ES20
             #endif
         }
 
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glUniformMatrix2fv")]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glUniformMatrix3fv")]
         public static 
-        void UniformMatrix2(Int32 location, Int32 count, bool transpose, Single[] value)
+        void UniformMatrix3(Int32 location, Int32 count, bool transpose, Single[] value)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -13857,7 +13877,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (Single* value_ptr = value)
                 {
-                    Delegates.glUniformMatrix2fv((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
+                    Delegates.glUniformMatrix3fv((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
                 }
             }
             #if DEBUG
@@ -13900,9 +13920,9 @@ namespace OpenTK.Graphics.ES20
             #endif
         }
 
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glUniformMatrix3fv")]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glUniformMatrix4fv")]
         public static 
-        void UniformMatrix3(Int32 location, Int32 count, bool transpose, Single[] value)
+        void UniformMatrix4(Int32 location, Int32 count, bool transpose, Single[] value)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -13912,7 +13932,7 @@ namespace OpenTK.Graphics.ES20
             {
                 fixed (Single* value_ptr = value)
                 {
-                    Delegates.glUniformMatrix3fv((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
+                    Delegates.glUniformMatrix4fv((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
                 }
             }
             #if DEBUG
@@ -13955,26 +13975,6 @@ namespace OpenTK.Graphics.ES20
             #endif
         }
 
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glUniformMatrix4fv")]
-        public static 
-        void UniformMatrix4(Int32 location, Int32 count, bool transpose, Single[] value)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* value_ptr = value)
-                {
-                    Delegates.glUniformMatrix4fv((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
         
         /// <summary>
         /// Installs a program object as part of current rendering state
@@ -14127,35 +14127,6 @@ namespace OpenTK.Graphics.ES20
         }
 
         
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttrib1fv")]
-        public static 
-        unsafe void VertexAttrib1(Int32 indx, Single* values)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glVertexAttrib1fv((UInt32)indx, (Single*)values);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -14206,7 +14177,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttrib1fv")]
         public static 
-        unsafe void VertexAttrib1(UInt32 indx, Single* values)
+        unsafe void VertexAttrib1(Int32 indx, Single* values)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -14254,6 +14225,35 @@ namespace OpenTK.Graphics.ES20
         }
 
         
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttrib1fv")]
+        public static 
+        unsafe void VertexAttrib1(UInt32 indx, Single* values)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glVertexAttrib1fv((UInt32)indx, (Single*)values);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -14311,6 +14311,40 @@ namespace OpenTK.Graphics.ES20
         }
 
         
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttrib2fv")]
+        public static 
+        void VertexAttrib2(Int32 indx, Single[] values)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* values_ptr = values)
+                {
+                    Delegates.glVertexAttrib2fv((UInt32)indx, (Single*)values_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -14387,9 +14421,10 @@ namespace OpenTK.Graphics.ES20
         /// Specifies the new values to be used for the specified vertex attribute.
         /// </para>
         /// </param>
+        [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttrib2fv")]
         public static 
-        void VertexAttrib2(Int32 indx, Single[] values)
+        void VertexAttrib2(UInt32 indx, Single[] values)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -14472,41 +14507,6 @@ namespace OpenTK.Graphics.ES20
         }
 
         
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttrib2fv")]
-        public static 
-        void VertexAttrib2(UInt32 indx, Single[] values)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* values_ptr = values)
-                {
-                    Delegates.glVertexAttrib2fv((UInt32)indx, (Single*)values_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -14564,6 +14564,40 @@ namespace OpenTK.Graphics.ES20
         }
 
         
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttrib3fv")]
+        public static 
+        void VertexAttrib3(Int32 indx, Single[] values)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* values_ptr = values)
+                {
+                    Delegates.glVertexAttrib3fv((UInt32)indx, (Single*)values_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -14640,9 +14674,10 @@ namespace OpenTK.Graphics.ES20
         /// Specifies the new values to be used for the specified vertex attribute.
         /// </para>
         /// </param>
+        [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttrib3fv")]
         public static 
-        void VertexAttrib3(Int32 indx, Single[] values)
+        void VertexAttrib3(UInt32 indx, Single[] values)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -14725,41 +14760,6 @@ namespace OpenTK.Graphics.ES20
         }
 
         
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttrib3fv")]
-        public static 
-        void VertexAttrib3(UInt32 indx, Single[] values)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* values_ptr = values)
-                {
-                    Delegates.glVertexAttrib3fv((UInt32)indx, (Single*)values_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -14817,6 +14817,40 @@ namespace OpenTK.Graphics.ES20
         }
 
         
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttrib4fv")]
+        public static 
+        void VertexAttrib4(Int32 indx, Single[] values)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* values_ptr = values)
+                {
+                    Delegates.glVertexAttrib4fv((UInt32)indx, (Single*)values_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -14893,9 +14927,10 @@ namespace OpenTK.Graphics.ES20
         /// Specifies the new values to be used for the specified vertex attribute.
         /// </para>
         /// </param>
+        [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttrib4fv")]
         public static 
-        void VertexAttrib4(Int32 indx, Single[] values)
+        void VertexAttrib4(UInt32 indx, Single[] values)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -14979,34 +15014,47 @@ namespace OpenTK.Graphics.ES20
 
         
         /// <summary>
-        /// Specifies the value of a generic vertex attribute
+        /// Define an array of generic vertex attribute data
         /// </summary>
         /// <param name="index">
         /// <para>
         /// Specifies the index of the generic vertex attribute to be modified.
         /// </para>
         /// </param>
-        /// <param name="v0">
+        /// <param name="size">
         /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
+        /// Specifies the number of components per generic vertex attribute. Must be 1, 2, 3, or 4. The initial value is 4.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttrib4fv")]
+        /// <param name="type">
+        /// <para>
+        /// Specifies the data type of each component in the array. Symbolic constants GL_BYTE, GL_UNSIGNED_BYTE, GL_SHORT, GL_UNSIGNED_SHORT, GL_INT, GL_UNSIGNED_INT, GL_FLOAT, or GL_DOUBLE are accepted. The initial value is GL_FLOAT.
+        /// </para>
+        /// </param>
+        /// <param name="normalized">
+        /// <para>
+        /// Specifies whether fixed-point data values should be normalized (GL_TRUE) or converted directly as fixed-point values (GL_FALSE) when they are accessed.
+        /// </para>
+        /// </param>
+        /// <param name="stride">
+        /// <para>
+        /// Specifies the byte offset between consecutive generic vertex attributes. If stride is 0, the generic vertex attributes are understood to be tightly packed in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+        /// <param name="pointer">
+        /// <para>
+        /// Specifies a pointer to the first component of the first generic vertex attribute in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
         public static 
-        void VertexAttrib4(UInt32 indx, Single[] values)
+        void VertexAttribPointer(Int32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribPointerType type, bool normalized, Int32 stride, IntPtr ptr)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            unsafe
-            {
-                fixed (Single* values_ptr = values)
-                {
-                    Delegates.glVertexAttrib4fv((UInt32)indx, (Single*)values_ptr);
-                }
-            }
+            Delegates.glVertexAttribPointer((UInt32)indx, (Int32)size, (OpenTK.Graphics.ES20.VertexAttribPointerType)type, (bool)normalized, (Int32)stride, (IntPtr)ptr);
             #if DEBUG
             }
             #endif
@@ -15048,65 +15096,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
         public static 
-        void VertexAttribPointer<T5>(Int32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] ref T5 ptr)
-            where T5 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle ptr_ptr = GCHandle.Alloc(ptr, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glVertexAttribPointer((UInt32)indx, (Int32)size, (OpenTK.Graphics.ES20.VertexAttribPointerType)type, (bool)normalized, (Int32)stride, (IntPtr)ptr_ptr.AddrOfPinnedObject());
-                ptr = (T5)ptr_ptr.Target;
-            }
-            finally
-            {
-                ptr_ptr.Free();
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Define an array of generic vertex attribute data
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="size">
-        /// <para>
-        /// Specifies the number of components per generic vertex attribute. Must be 1, 2, 3, or 4. The initial value is 4.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the data type of each component in the array. Symbolic constants GL_BYTE, GL_UNSIGNED_BYTE, GL_SHORT, GL_UNSIGNED_SHORT, GL_INT, GL_UNSIGNED_INT, GL_FLOAT, or GL_DOUBLE are accepted. The initial value is GL_FLOAT.
-        /// </para>
-        /// </param>
-        /// <param name="normalized">
-        /// <para>
-        /// Specifies whether fixed-point data values should be normalized (GL_TRUE) or converted directly as fixed-point values (GL_FALSE) when they are accessed.
-        /// </para>
-        /// </param>
-        /// <param name="stride">
-        /// <para>
-        /// Specifies the byte offset between consecutive generic vertex attributes. If stride is 0, the generic vertex attributes are understood to be tightly packed in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-        /// <param name="pointer">
-        /// <para>
-        /// Specifies a pointer to the first component of the first generic vertex attribute in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
-        public static 
-        void VertexAttribPointer<T5>(Int32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[,,] ptr)
+        void VertexAttribPointer<T5>(Int32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[] ptr)
             where T5 : struct
         {
             #if DEBUG
@@ -15220,7 +15210,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
         public static 
-        void VertexAttribPointer<T5>(Int32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[] ptr)
+        void VertexAttribPointer<T5>(Int32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[,,] ptr)
             where T5 : struct
         {
             #if DEBUG
@@ -15277,56 +15267,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
         public static 
-        void VertexAttribPointer(Int32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribPointerType type, bool normalized, Int32 stride, IntPtr ptr)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glVertexAttribPointer((UInt32)indx, (Int32)size, (OpenTK.Graphics.ES20.VertexAttribPointerType)type, (bool)normalized, (Int32)stride, (IntPtr)ptr);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Define an array of generic vertex attribute data
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="size">
-        /// <para>
-        /// Specifies the number of components per generic vertex attribute. Must be 1, 2, 3, or 4. The initial value is 4.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the data type of each component in the array. Symbolic constants GL_BYTE, GL_UNSIGNED_BYTE, GL_SHORT, GL_UNSIGNED_SHORT, GL_INT, GL_UNSIGNED_INT, GL_FLOAT, or GL_DOUBLE are accepted. The initial value is GL_FLOAT.
-        /// </para>
-        /// </param>
-        /// <param name="normalized">
-        /// <para>
-        /// Specifies whether fixed-point data values should be normalized (GL_TRUE) or converted directly as fixed-point values (GL_FALSE) when they are accessed.
-        /// </para>
-        /// </param>
-        /// <param name="stride">
-        /// <para>
-        /// Specifies the byte offset between consecutive generic vertex attributes. If stride is 0, the generic vertex attributes are understood to be tightly packed in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-        /// <param name="pointer">
-        /// <para>
-        /// Specifies a pointer to the first component of the first generic vertex attribute in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
-        public static 
-        void VertexAttribPointer<T5>(UInt32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] ref T5 ptr)
+        void VertexAttribPointer<T5>(Int32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] ref T5 ptr)
             where T5 : struct
         {
             #if DEBUG
@@ -15385,7 +15326,56 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
         public static 
-        void VertexAttribPointer<T5>(UInt32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[,,] ptr)
+        void VertexAttribPointer(UInt32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribPointerType type, bool normalized, Int32 stride, IntPtr ptr)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glVertexAttribPointer((UInt32)indx, (Int32)size, (OpenTK.Graphics.ES20.VertexAttribPointerType)type, (bool)normalized, (Int32)stride, (IntPtr)ptr);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Define an array of generic vertex attribute data
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="size">
+        /// <para>
+        /// Specifies the number of components per generic vertex attribute. Must be 1, 2, 3, or 4. The initial value is 4.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the data type of each component in the array. Symbolic constants GL_BYTE, GL_UNSIGNED_BYTE, GL_SHORT, GL_UNSIGNED_SHORT, GL_INT, GL_UNSIGNED_INT, GL_FLOAT, or GL_DOUBLE are accepted. The initial value is GL_FLOAT.
+        /// </para>
+        /// </param>
+        /// <param name="normalized">
+        /// <para>
+        /// Specifies whether fixed-point data values should be normalized (GL_TRUE) or converted directly as fixed-point values (GL_FALSE) when they are accessed.
+        /// </para>
+        /// </param>
+        /// <param name="stride">
+        /// <para>
+        /// Specifies the byte offset between consecutive generic vertex attributes. If stride is 0, the generic vertex attributes are understood to be tightly packed in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+        /// <param name="pointer">
+        /// <para>
+        /// Specifies a pointer to the first component of the first generic vertex attribute in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
+        public static 
+        void VertexAttribPointer<T5>(UInt32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[] ptr)
             where T5 : struct
         {
             #if DEBUG
@@ -15501,7 +15491,7 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
         public static 
-        void VertexAttribPointer<T5>(UInt32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[] ptr)
+        void VertexAttribPointer<T5>(UInt32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[,,] ptr)
             where T5 : struct
         {
             #if DEBUG
@@ -15559,13 +15549,23 @@ namespace OpenTK.Graphics.ES20
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
         public static 
-        void VertexAttribPointer(UInt32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribPointerType type, bool normalized, Int32 stride, IntPtr ptr)
+        void VertexAttribPointer<T5>(UInt32 indx, Int32 size, OpenTK.Graphics.ES20.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] ref T5 ptr)
+            where T5 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glVertexAttribPointer((UInt32)indx, (Int32)size, (OpenTK.Graphics.ES20.VertexAttribPointerType)type, (bool)normalized, (Int32)stride, (IntPtr)ptr);
+            GCHandle ptr_ptr = GCHandle.Alloc(ptr, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glVertexAttribPointer((UInt32)indx, (Int32)size, (OpenTK.Graphics.ES20.VertexAttribPointerType)type, (bool)normalized, (Int32)stride, (IntPtr)ptr_ptr.AddrOfPinnedObject());
+                ptr = (T5)ptr_ptr.Target;
+            }
+            finally
+            {
+                ptr_ptr.Free();
+            }
             #if DEBUG
             }
             #endif
@@ -15601,21 +15601,6 @@ namespace OpenTK.Graphics.ES20
 
         public static partial class NV
         {
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeleteFencesNV")]
-            public static 
-            unsafe void DeleteFences(Int32 n, Int32* fences)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glDeleteFencesNV((Int32)n, (UInt32*)fences);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeleteFencesNV")]
             public static 
             void DeleteFences(Int32 n, Int32[] fences)
@@ -15656,6 +15641,42 @@ namespace OpenTK.Graphics.ES20
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeleteFencesNV")]
+            public static 
+            unsafe void DeleteFences(Int32 n, Int32* fences)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glDeleteFencesNV((Int32)n, (UInt32*)fences);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeleteFencesNV")]
+            public static 
+            void DeleteFences(Int32 n, UInt32[] fences)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* fences_ptr = fences)
+                    {
+                        Delegates.glDeleteFencesNV((Int32)n, (UInt32*)fences_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeleteFencesNV")]
             public static 
@@ -15692,27 +15713,6 @@ namespace OpenTK.Graphics.ES20
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glDeleteFencesNV")]
-            public static 
-            void DeleteFences(Int32 n, UInt32[] fences)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* fences_ptr = fences)
-                    {
-                        Delegates.glDeleteFencesNV((Int32)n, (UInt32*)fences_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glFinishFenceNV")]
             public static 
             void FinishFence(Int32 fence)
@@ -15742,21 +15742,6 @@ namespace OpenTK.Graphics.ES20
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenFencesNV")]
-            public static 
-            unsafe void GenFences(Int32 n, [OutAttribute] Int32* fences)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGenFencesNV((Int32)n, (UInt32*)fences);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenFencesNV")]
             public static 
             void GenFences(Int32 n, [OutAttribute] Int32[] fences)
@@ -15801,29 +15786,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenFencesNV")]
             public static 
-            void GenFences(Int32 n, [OutAttribute] out UInt32 fences)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* fences_ptr = &fences)
-                    {
-                        Delegates.glGenFencesNV((Int32)n, (UInt32*)fences_ptr);
-                        fences = *fences_ptr;
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenFencesNV")]
-            public static 
-            unsafe void GenFences(Int32 n, [OutAttribute] UInt32* fences)
+            unsafe void GenFences(Int32 n, [OutAttribute] Int32* fences)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -15857,15 +15820,37 @@ namespace OpenTK.Graphics.ES20
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetFenceivNV")]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenFencesNV")]
             public static 
-            unsafe void GetFence(Int32 fence, [OutAttribute] Int32* @params)
+            void GenFences(Int32 n, [OutAttribute] out UInt32 fences)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetFenceivNV((UInt32)fence, (Int32*)@params);
+                unsafe
+                {
+                    fixed (UInt32* fences_ptr = &fences)
+                    {
+                        Delegates.glGenFencesNV((Int32)n, (UInt32*)fences_ptr);
+                        fences = *fences_ptr;
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGenFencesNV")]
+            public static 
+            unsafe void GenFences(Int32 n, [OutAttribute] UInt32* fences)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGenFencesNV((Int32)n, (UInt32*)fences);
                 #if DEBUG
                 }
                 #endif
@@ -15915,7 +15900,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetFenceivNV")]
             public static 
-            unsafe void GetFence(UInt32 fence, [OutAttribute] Int32* @params)
+            unsafe void GetFence(Int32 fence, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -15970,6 +15955,21 @@ namespace OpenTK.Graphics.ES20
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetFenceivNV")]
+            public static 
+            unsafe void GetFence(UInt32 fence, [OutAttribute] Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetFenceivNV((UInt32)fence, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glIsFenceNV")]
             public static 
             bool IsFence(Int32 fence)
@@ -16112,23 +16112,13 @@ namespace OpenTK.Graphics.ES20
         /// </param>
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glCompressedTexImage3DOES")]
             public static 
-            void CompressedTexImage3D<T8>(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T8 data)
-                where T8 : struct
+            void CompressedTexImage3D(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, IntPtr data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glCompressedTexImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (OpenTK.Graphics.ES20.All)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
-                    data = (T8)data_ptr.Target;
-                }
-                finally
-                {
-                    data_ptr.Free();
-                }
+                Delegates.glCompressedTexImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (OpenTK.Graphics.ES20.All)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)data);
                 #if DEBUG
                 }
                 #endif
@@ -16185,7 +16175,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glCompressedTexImage3DOES")]
             public static 
-            void CompressedTexImage3D<T8>(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[,,] data)
+            void CompressedTexImage3D<T8>(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[] data)
                 where T8 : struct
             {
                 #if DEBUG
@@ -16329,7 +16319,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glCompressedTexImage3DOES")]
             public static 
-            void CompressedTexImage3D<T8>(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[] data)
+            void CompressedTexImage3D<T8>(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[,,] data)
                 where T8 : struct
             {
                 #if DEBUG
@@ -16401,76 +16391,8 @@ namespace OpenTK.Graphics.ES20
         /// </param>
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glCompressedTexImage3DOES")]
             public static 
-            void CompressedTexImage3D(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, IntPtr data)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glCompressedTexImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (OpenTK.Graphics.ES20.All)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)data);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Specify a three-dimensional texture subimage in a compressed format
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target texture. Must be GL_TEXTURE_3D.
-        /// </para>
-        /// </param>
-        /// <param name="level">
-        /// <para>
-        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
-        /// </para>
-        /// </param>
-        /// <param name="xoffset">
-        /// <para>
-        /// Specifies a texel offset in the x direction within the texture array.
-        /// </para>
-        /// </param>
-        /// <param name="yoffset">
-        /// <para>
-        /// Specifies a texel offset in the y direction within the texture array.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// Specifies the width of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="height">
-        /// <para>
-        /// Specifies the height of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="depth">
-        /// <para>
-        /// Specifies the depth of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Specifies the format of the compressed image data stored at address data.
-        /// </para>
-        /// </param>
-        /// <param name="imageSize">
-        /// <para>
-        /// Specifies the number of unsigned bytes of image data starting at the address specified by data.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the compressed image data in memory.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glCompressedTexSubImage3DOES")]
-            public static 
-            void CompressedTexSubImage3D<T10>(OpenTK.Graphics.ES20.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, Int32 imageSize, [InAttribute, OutAttribute] ref T10 data)
-                where T10 : struct
+            void CompressedTexImage3D<T8>(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T8 data)
+                where T8 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -16479,8 +16401,8 @@ namespace OpenTK.Graphics.ES20
                 GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glCompressedTexSubImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.ES20.All)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
-                    data = (T10)data_ptr.Target;
+                    Delegates.glCompressedTexImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (OpenTK.Graphics.ES20.All)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                    data = (T8)data_ptr.Target;
                 }
                 finally
                 {
@@ -16547,7 +16469,75 @@ namespace OpenTK.Graphics.ES20
         /// </param>
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glCompressedTexSubImage3DOES")]
             public static 
-            void CompressedTexSubImage3D<T10>(OpenTK.Graphics.ES20.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, Int32 imageSize, [InAttribute, OutAttribute] T10[,,] data)
+            void CompressedTexSubImage3D(OpenTK.Graphics.ES20.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, Int32 imageSize, IntPtr data)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glCompressedTexSubImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.ES20.All)format, (Int32)imageSize, (IntPtr)data);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Specify a three-dimensional texture subimage in a compressed format
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target texture. Must be GL_TEXTURE_3D.
+        /// </para>
+        /// </param>
+        /// <param name="level">
+        /// <para>
+        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
+        /// </para>
+        /// </param>
+        /// <param name="xoffset">
+        /// <para>
+        /// Specifies a texel offset in the x direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="yoffset">
+        /// <para>
+        /// Specifies a texel offset in the y direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// Specifies the width of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="height">
+        /// <para>
+        /// Specifies the height of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="depth">
+        /// <para>
+        /// Specifies the depth of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Specifies the format of the compressed image data stored at address data.
+        /// </para>
+        /// </param>
+        /// <param name="imageSize">
+        /// <para>
+        /// Specifies the number of unsigned bytes of image data starting at the address specified by data.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the compressed image data in memory.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glCompressedTexSubImage3DOES")]
+            public static 
+            void CompressedTexSubImage3D<T10>(OpenTK.Graphics.ES20.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, Int32 imageSize, [InAttribute, OutAttribute] T10[] data)
                 where T10 : struct
             {
                 #if DEBUG
@@ -16701,7 +16691,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glCompressedTexSubImage3DOES")]
             public static 
-            void CompressedTexSubImage3D<T10>(OpenTK.Graphics.ES20.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, Int32 imageSize, [InAttribute, OutAttribute] T10[] data)
+            void CompressedTexSubImage3D<T10>(OpenTK.Graphics.ES20.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, Int32 imageSize, [InAttribute, OutAttribute] T10[,,] data)
                 where T10 : struct
             {
                 #if DEBUG
@@ -16778,13 +16768,23 @@ namespace OpenTK.Graphics.ES20
         /// </param>
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glCompressedTexSubImage3DOES")]
             public static 
-            void CompressedTexSubImage3D(OpenTK.Graphics.ES20.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, Int32 imageSize, IntPtr data)
+            void CompressedTexSubImage3D<T10>(OpenTK.Graphics.ES20.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, Int32 imageSize, [InAttribute, OutAttribute] ref T10 data)
+                where T10 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glCompressedTexSubImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.ES20.All)format, (Int32)imageSize, (IntPtr)data);
+                GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glCompressedTexSubImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.ES20.All)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                    data = (T10)data_ptr.Target;
+                }
+                finally
+                {
+                    data_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -16907,23 +16907,13 @@ namespace OpenTK.Graphics.ES20
 
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetBufferPointervOES")]
             public static 
-            void GetBufferPointer<T2>(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, [InAttribute, OutAttribute] ref T2 @params)
-                where T2 : struct
+            void GetBufferPointer(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, [OutAttribute] IntPtr @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle @params_ptr = GCHandle.Alloc(@params, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.All)target, (OpenTK.Graphics.ES20.All)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
-                    @params = (T2)@params_ptr.Target;
-                }
-                finally
-                {
-                    @params_ptr.Free();
-                }
+                Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.All)target, (OpenTK.Graphics.ES20.All)pname, (IntPtr)@params);
                 #if DEBUG
                 }
                 #endif
@@ -16931,7 +16921,7 @@ namespace OpenTK.Graphics.ES20
 
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetBufferPointervOES")]
             public static 
-            void GetBufferPointer<T2>(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, [InAttribute, OutAttribute] T2[,,] @params)
+            void GetBufferPointer<T2>(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, [InAttribute, OutAttribute] T2[] @params)
                 where T2 : struct
             {
                 #if DEBUG
@@ -16977,7 +16967,7 @@ namespace OpenTK.Graphics.ES20
 
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetBufferPointervOES")]
             public static 
-            void GetBufferPointer<T2>(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, [InAttribute, OutAttribute] T2[] @params)
+            void GetBufferPointer<T2>(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, [InAttribute, OutAttribute] T2[,,] @params)
                 where T2 : struct
             {
                 #if DEBUG
@@ -17000,134 +16990,31 @@ namespace OpenTK.Graphics.ES20
 
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetBufferPointervOES")]
             public static 
-            void GetBufferPointer(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, [OutAttribute] IntPtr @params)
+            void GetBufferPointer<T2>(OpenTK.Graphics.ES20.All target, OpenTK.Graphics.ES20.All pname, [InAttribute, OutAttribute] ref T2 @params)
+                where T2 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.All)target, (OpenTK.Graphics.ES20.All)pname, (IntPtr)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
-            public static 
-            unsafe void GetProgramBinary<T4>(Int32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] OpenTK.Graphics.ES20.All* binaryFormat, [InAttribute, OutAttribute] ref T4 binary)
-                where T4 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
+                GCHandle @params_ptr = GCHandle.Alloc(@params, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length, (OpenTK.Graphics.ES20.All*)binaryFormat, (IntPtr)binary_ptr.AddrOfPinnedObject());
-                    binary = (T4)binary_ptr.Target;
+                    Delegates.glGetBufferPointervOES((OpenTK.Graphics.ES20.All)target, (OpenTK.Graphics.ES20.All)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
+                    @params = (T2)@params_ptr.Target;
                 }
                 finally
                 {
-                    binary_ptr.Free();
+                    @params_ptr.Free();
                 }
                 #if DEBUG
                 }
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
-            public static 
-            unsafe void GetProgramBinary<T4>(Int32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] OpenTK.Graphics.ES20.All* binaryFormat, [InAttribute, OutAttribute] T4[,,] binary)
-                where T4 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length, (OpenTK.Graphics.ES20.All*)binaryFormat, (IntPtr)binary_ptr.AddrOfPinnedObject());
-                }
-                finally
-                {
-                    binary_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
-            public static 
-            unsafe void GetProgramBinary<T4>(Int32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] OpenTK.Graphics.ES20.All* binaryFormat, [InAttribute, OutAttribute] T4[,] binary)
-                where T4 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length, (OpenTK.Graphics.ES20.All*)binaryFormat, (IntPtr)binary_ptr.AddrOfPinnedObject());
-                }
-                finally
-                {
-                    binary_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
-            public static 
-            unsafe void GetProgramBinary<T4>(Int32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] OpenTK.Graphics.ES20.All* binaryFormat, [InAttribute, OutAttribute] T4[] binary)
-                where T4 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length, (OpenTK.Graphics.ES20.All*)binaryFormat, (IntPtr)binary_ptr.AddrOfPinnedObject());
-                }
-                finally
-                {
-                    binary_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
-            public static 
-            unsafe void GetProgramBinary(Int32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] OpenTK.Graphics.ES20.All* binaryFormat, [OutAttribute] IntPtr binary)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length, (OpenTK.Graphics.ES20.All*)binaryFormat, (IntPtr)binary);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
             public static 
-            void GetProgramBinary<T4>(Int32 program, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] OpenTK.Graphics.ES20.All[] binaryFormat, [InAttribute, OutAttribute] ref T4 binary)
-                where T4 : struct
+            void GetProgramBinary(Int32 program, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] OpenTK.Graphics.ES20.All[] binaryFormat, [OutAttribute] IntPtr binary)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -17138,16 +17025,7 @@ namespace OpenTK.Graphics.ES20
                     fixed (Int32* length_ptr = length)
                     fixed (OpenTK.Graphics.ES20.All* binaryFormat_ptr = binaryFormat)
                     {
-                        GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
-                        try
-                        {
-                            Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length_ptr, (OpenTK.Graphics.ES20.All*)binaryFormat_ptr, (IntPtr)binary_ptr.AddrOfPinnedObject());
-                            binary = (T4)binary_ptr.Target;
-                        }
-                        finally
-                        {
-                            binary_ptr.Free();
-                        }
+                        Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length_ptr, (OpenTK.Graphics.ES20.All*)binaryFormat_ptr, (IntPtr)binary);
                     }
                 }
                 #if DEBUG
@@ -17157,7 +17035,7 @@ namespace OpenTK.Graphics.ES20
 
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
             public static 
-            void GetProgramBinary<T4>(Int32 program, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] OpenTK.Graphics.ES20.All[] binaryFormat, [InAttribute, OutAttribute] T4[,,] binary)
+            void GetProgramBinary<T4>(Int32 program, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] OpenTK.Graphics.ES20.All[] binaryFormat, [InAttribute, OutAttribute] T4[] binary)
                 where T4 : struct
             {
                 #if DEBUG
@@ -17217,7 +17095,7 @@ namespace OpenTK.Graphics.ES20
 
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
             public static 
-            void GetProgramBinary<T4>(Int32 program, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] OpenTK.Graphics.ES20.All[] binaryFormat, [InAttribute, OutAttribute] T4[] binary)
+            void GetProgramBinary<T4>(Int32 program, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] OpenTK.Graphics.ES20.All[] binaryFormat, [InAttribute, OutAttribute] T4[,,] binary)
                 where T4 : struct
             {
                 #if DEBUG
@@ -17247,7 +17125,8 @@ namespace OpenTK.Graphics.ES20
 
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
             public static 
-            void GetProgramBinary(Int32 program, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] OpenTK.Graphics.ES20.All[] binaryFormat, [OutAttribute] IntPtr binary)
+            void GetProgramBinary<T4>(Int32 program, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] OpenTK.Graphics.ES20.All[] binaryFormat, [InAttribute, OutAttribute] ref T4 binary)
+                where T4 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -17257,35 +17136,11 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* length_ptr = length)
                     fixed (OpenTK.Graphics.ES20.All* binaryFormat_ptr = binaryFormat)
-                    {
-                        Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length_ptr, (OpenTK.Graphics.ES20.All*)binaryFormat_ptr, (IntPtr)binary);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
-            public static 
-            void GetProgramBinary<T4>(Int32 program, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out OpenTK.Graphics.ES20.All binaryFormat, [InAttribute, OutAttribute] ref T4 binary)
-                where T4 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Int32* length_ptr = &length)
-                    fixed (OpenTK.Graphics.ES20.All* binaryFormat_ptr = &binaryFormat)
                     {
                         GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
                         try
                         {
                             Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length_ptr, (OpenTK.Graphics.ES20.All*)binaryFormat_ptr, (IntPtr)binary_ptr.AddrOfPinnedObject());
-                            length = *length_ptr;
-                            binaryFormat = *binaryFormat_ptr;
                             binary = (T4)binary_ptr.Target;
                         }
                         finally
@@ -17301,7 +17156,30 @@ namespace OpenTK.Graphics.ES20
 
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
             public static 
-            void GetProgramBinary<T4>(Int32 program, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out OpenTK.Graphics.ES20.All binaryFormat, [InAttribute, OutAttribute] T4[,,] binary)
+            void GetProgramBinary(Int32 program, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out OpenTK.Graphics.ES20.All binaryFormat, [OutAttribute] IntPtr binary)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Int32* length_ptr = &length)
+                    fixed (OpenTK.Graphics.ES20.All* binaryFormat_ptr = &binaryFormat)
+                    {
+                        Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length_ptr, (OpenTK.Graphics.ES20.All*)binaryFormat_ptr, (IntPtr)binary);
+                        length = *length_ptr;
+                        binaryFormat = *binaryFormat_ptr;
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
+            public static 
+            void GetProgramBinary<T4>(Int32 program, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out OpenTK.Graphics.ES20.All binaryFormat, [InAttribute, OutAttribute] T4[] binary)
                 where T4 : struct
             {
                 #if DEBUG
@@ -17365,7 +17243,7 @@ namespace OpenTK.Graphics.ES20
 
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
             public static 
-            void GetProgramBinary<T4>(Int32 program, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out OpenTK.Graphics.ES20.All binaryFormat, [InAttribute, OutAttribute] T4[] binary)
+            void GetProgramBinary<T4>(Int32 program, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out OpenTK.Graphics.ES20.All binaryFormat, [InAttribute, OutAttribute] T4[,,] binary)
                 where T4 : struct
             {
                 #if DEBUG
@@ -17397,7 +17275,8 @@ namespace OpenTK.Graphics.ES20
 
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
             public static 
-            void GetProgramBinary(Int32 program, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out OpenTK.Graphics.ES20.All binaryFormat, [OutAttribute] IntPtr binary)
+            void GetProgramBinary<T4>(Int32 program, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out OpenTK.Graphics.ES20.All binaryFormat, [InAttribute, OutAttribute] ref T4 binary)
+                where T4 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -17408,9 +17287,18 @@ namespace OpenTK.Graphics.ES20
                     fixed (Int32* length_ptr = &length)
                     fixed (OpenTK.Graphics.ES20.All* binaryFormat_ptr = &binaryFormat)
                     {
-                        Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length_ptr, (OpenTK.Graphics.ES20.All*)binaryFormat_ptr, (IntPtr)binary);
-                        length = *length_ptr;
-                        binaryFormat = *binaryFormat_ptr;
+                        GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
+                        try
+                        {
+                            Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length_ptr, (OpenTK.Graphics.ES20.All*)binaryFormat_ptr, (IntPtr)binary_ptr.AddrOfPinnedObject());
+                            length = *length_ptr;
+                            binaryFormat = *binaryFormat_ptr;
+                            binary = (T4)binary_ptr.Target;
+                        }
+                        finally
+                        {
+                            binary_ptr.Free();
+                        }
                     }
                 }
                 #if DEBUG
@@ -17421,7 +17309,94 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
             public static 
-            unsafe void GetProgramBinary<T4>(UInt32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] OpenTK.Graphics.ES20.All* binaryFormat, [InAttribute, OutAttribute] ref T4 binary)
+            unsafe void GetProgramBinary(Int32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] OpenTK.Graphics.ES20.All* binaryFormat, [OutAttribute] IntPtr binary)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length, (OpenTK.Graphics.ES20.All*)binaryFormat, (IntPtr)binary);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
+            public static 
+            unsafe void GetProgramBinary<T4>(Int32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] OpenTK.Graphics.ES20.All* binaryFormat, [InAttribute, OutAttribute] T4[] binary)
+                where T4 : struct
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length, (OpenTK.Graphics.ES20.All*)binaryFormat, (IntPtr)binary_ptr.AddrOfPinnedObject());
+                }
+                finally
+                {
+                    binary_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
+            public static 
+            unsafe void GetProgramBinary<T4>(Int32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] OpenTK.Graphics.ES20.All* binaryFormat, [InAttribute, OutAttribute] T4[,] binary)
+                where T4 : struct
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length, (OpenTK.Graphics.ES20.All*)binaryFormat, (IntPtr)binary_ptr.AddrOfPinnedObject());
+                }
+                finally
+                {
+                    binary_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
+            public static 
+            unsafe void GetProgramBinary<T4>(Int32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] OpenTK.Graphics.ES20.All* binaryFormat, [InAttribute, OutAttribute] T4[,,] binary)
+                where T4 : struct
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length, (OpenTK.Graphics.ES20.All*)binaryFormat, (IntPtr)binary_ptr.AddrOfPinnedObject());
+                }
+                finally
+                {
+                    binary_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
+            public static 
+            unsafe void GetProgramBinary<T4>(Int32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] OpenTK.Graphics.ES20.All* binaryFormat, [InAttribute, OutAttribute] ref T4 binary)
                 where T4 : struct
             {
                 #if DEBUG
@@ -17446,95 +17421,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
             public static 
-            unsafe void GetProgramBinary<T4>(UInt32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] OpenTK.Graphics.ES20.All* binaryFormat, [InAttribute, OutAttribute] T4[,,] binary)
-                where T4 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length, (OpenTK.Graphics.ES20.All*)binaryFormat, (IntPtr)binary_ptr.AddrOfPinnedObject());
-                }
-                finally
-                {
-                    binary_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
-            public static 
-            unsafe void GetProgramBinary<T4>(UInt32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] OpenTK.Graphics.ES20.All* binaryFormat, [InAttribute, OutAttribute] T4[,] binary)
-                where T4 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length, (OpenTK.Graphics.ES20.All*)binaryFormat, (IntPtr)binary_ptr.AddrOfPinnedObject());
-                }
-                finally
-                {
-                    binary_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
-            public static 
-            unsafe void GetProgramBinary<T4>(UInt32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] OpenTK.Graphics.ES20.All* binaryFormat, [InAttribute, OutAttribute] T4[] binary)
-                where T4 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length, (OpenTK.Graphics.ES20.All*)binaryFormat, (IntPtr)binary_ptr.AddrOfPinnedObject());
-                }
-                finally
-                {
-                    binary_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
-            public static 
-            unsafe void GetProgramBinary(UInt32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] OpenTK.Graphics.ES20.All* binaryFormat, [OutAttribute] IntPtr binary)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length, (OpenTK.Graphics.ES20.All*)binaryFormat, (IntPtr)binary);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
-            public static 
-            void GetProgramBinary<T4>(UInt32 program, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] OpenTK.Graphics.ES20.All[] binaryFormat, [InAttribute, OutAttribute] ref T4 binary)
-                where T4 : struct
+            void GetProgramBinary(UInt32 program, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] OpenTK.Graphics.ES20.All[] binaryFormat, [OutAttribute] IntPtr binary)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -17545,16 +17432,7 @@ namespace OpenTK.Graphics.ES20
                     fixed (Int32* length_ptr = length)
                     fixed (OpenTK.Graphics.ES20.All* binaryFormat_ptr = binaryFormat)
                     {
-                        GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
-                        try
-                        {
-                            Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length_ptr, (OpenTK.Graphics.ES20.All*)binaryFormat_ptr, (IntPtr)binary_ptr.AddrOfPinnedObject());
-                            binary = (T4)binary_ptr.Target;
-                        }
-                        finally
-                        {
-                            binary_ptr.Free();
-                        }
+                        Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length_ptr, (OpenTK.Graphics.ES20.All*)binaryFormat_ptr, (IntPtr)binary);
                     }
                 }
                 #if DEBUG
@@ -17565,7 +17443,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
             public static 
-            void GetProgramBinary<T4>(UInt32 program, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] OpenTK.Graphics.ES20.All[] binaryFormat, [InAttribute, OutAttribute] T4[,,] binary)
+            void GetProgramBinary<T4>(UInt32 program, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] OpenTK.Graphics.ES20.All[] binaryFormat, [InAttribute, OutAttribute] T4[] binary)
                 where T4 : struct
             {
                 #if DEBUG
@@ -17627,7 +17505,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
             public static 
-            void GetProgramBinary<T4>(UInt32 program, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] OpenTK.Graphics.ES20.All[] binaryFormat, [InAttribute, OutAttribute] T4[] binary)
+            void GetProgramBinary<T4>(UInt32 program, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] OpenTK.Graphics.ES20.All[] binaryFormat, [InAttribute, OutAttribute] T4[,,] binary)
                 where T4 : struct
             {
                 #if DEBUG
@@ -17658,7 +17536,8 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
             public static 
-            void GetProgramBinary(UInt32 program, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] OpenTK.Graphics.ES20.All[] binaryFormat, [OutAttribute] IntPtr binary)
+            void GetProgramBinary<T4>(UInt32 program, Int32 bufSize, [OutAttribute] Int32[] length, [OutAttribute] OpenTK.Graphics.ES20.All[] binaryFormat, [InAttribute, OutAttribute] ref T4 binary)
+                where T4 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -17668,36 +17547,11 @@ namespace OpenTK.Graphics.ES20
                 {
                     fixed (Int32* length_ptr = length)
                     fixed (OpenTK.Graphics.ES20.All* binaryFormat_ptr = binaryFormat)
-                    {
-                        Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length_ptr, (OpenTK.Graphics.ES20.All*)binaryFormat_ptr, (IntPtr)binary);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
-            public static 
-            void GetProgramBinary<T4>(UInt32 program, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out OpenTK.Graphics.ES20.All binaryFormat, [InAttribute, OutAttribute] ref T4 binary)
-                where T4 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Int32* length_ptr = &length)
-                    fixed (OpenTK.Graphics.ES20.All* binaryFormat_ptr = &binaryFormat)
                     {
                         GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
                         try
                         {
                             Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length_ptr, (OpenTK.Graphics.ES20.All*)binaryFormat_ptr, (IntPtr)binary_ptr.AddrOfPinnedObject());
-                            length = *length_ptr;
-                            binaryFormat = *binaryFormat_ptr;
                             binary = (T4)binary_ptr.Target;
                         }
                         finally
@@ -17714,7 +17568,31 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
             public static 
-            void GetProgramBinary<T4>(UInt32 program, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out OpenTK.Graphics.ES20.All binaryFormat, [InAttribute, OutAttribute] T4[,,] binary)
+            void GetProgramBinary(UInt32 program, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out OpenTK.Graphics.ES20.All binaryFormat, [OutAttribute] IntPtr binary)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Int32* length_ptr = &length)
+                    fixed (OpenTK.Graphics.ES20.All* binaryFormat_ptr = &binaryFormat)
+                    {
+                        Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length_ptr, (OpenTK.Graphics.ES20.All*)binaryFormat_ptr, (IntPtr)binary);
+                        length = *length_ptr;
+                        binaryFormat = *binaryFormat_ptr;
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
+            public static 
+            void GetProgramBinary<T4>(UInt32 program, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out OpenTK.Graphics.ES20.All binaryFormat, [InAttribute, OutAttribute] T4[] binary)
                 where T4 : struct
             {
                 #if DEBUG
@@ -17780,7 +17658,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
             public static 
-            void GetProgramBinary<T4>(UInt32 program, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out OpenTK.Graphics.ES20.All binaryFormat, [InAttribute, OutAttribute] T4[] binary)
+            void GetProgramBinary<T4>(UInt32 program, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out OpenTK.Graphics.ES20.All binaryFormat, [InAttribute, OutAttribute] T4[,,] binary)
                 where T4 : struct
             {
                 #if DEBUG
@@ -17813,7 +17691,8 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
             public static 
-            void GetProgramBinary(UInt32 program, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out OpenTK.Graphics.ES20.All binaryFormat, [OutAttribute] IntPtr binary)
+            void GetProgramBinary<T4>(UInt32 program, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out OpenTK.Graphics.ES20.All binaryFormat, [InAttribute, OutAttribute] ref T4 binary)
+                where T4 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -17824,9 +17703,18 @@ namespace OpenTK.Graphics.ES20
                     fixed (Int32* length_ptr = &length)
                     fixed (OpenTK.Graphics.ES20.All* binaryFormat_ptr = &binaryFormat)
                     {
-                        Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length_ptr, (OpenTK.Graphics.ES20.All*)binaryFormat_ptr, (IntPtr)binary);
-                        length = *length_ptr;
-                        binaryFormat = *binaryFormat_ptr;
+                        GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
+                        try
+                        {
+                            Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length_ptr, (OpenTK.Graphics.ES20.All*)binaryFormat_ptr, (IntPtr)binary_ptr.AddrOfPinnedObject());
+                            length = *length_ptr;
+                            binaryFormat = *binaryFormat_ptr;
+                            binary = (T4)binary_ptr.Target;
+                        }
+                        finally
+                        {
+                            binary_ptr.Free();
+                        }
                     }
                 }
                 #if DEBUG
@@ -17834,6 +17722,118 @@ namespace OpenTK.Graphics.ES20
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
+            public static 
+            unsafe void GetProgramBinary(UInt32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] OpenTK.Graphics.ES20.All* binaryFormat, [OutAttribute] IntPtr binary)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length, (OpenTK.Graphics.ES20.All*)binaryFormat, (IntPtr)binary);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
+            public static 
+            unsafe void GetProgramBinary<T4>(UInt32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] OpenTK.Graphics.ES20.All* binaryFormat, [InAttribute, OutAttribute] T4[] binary)
+                where T4 : struct
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length, (OpenTK.Graphics.ES20.All*)binaryFormat, (IntPtr)binary_ptr.AddrOfPinnedObject());
+                }
+                finally
+                {
+                    binary_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
+            public static 
+            unsafe void GetProgramBinary<T4>(UInt32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] OpenTK.Graphics.ES20.All* binaryFormat, [InAttribute, OutAttribute] T4[,] binary)
+                where T4 : struct
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length, (OpenTK.Graphics.ES20.All*)binaryFormat, (IntPtr)binary_ptr.AddrOfPinnedObject());
+                }
+                finally
+                {
+                    binary_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
+            public static 
+            unsafe void GetProgramBinary<T4>(UInt32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] OpenTK.Graphics.ES20.All* binaryFormat, [InAttribute, OutAttribute] T4[,,] binary)
+                where T4 : struct
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length, (OpenTK.Graphics.ES20.All*)binaryFormat, (IntPtr)binary_ptr.AddrOfPinnedObject());
+                }
+                finally
+                {
+                    binary_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glGetProgramBinaryOES")]
+            public static 
+            unsafe void GetProgramBinary<T4>(UInt32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] OpenTK.Graphics.ES20.All* binaryFormat, [InAttribute, OutAttribute] ref T4 binary)
+                where T4 : struct
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetProgramBinaryOES((UInt32)program, (Int32)bufSize, (Int32*)length, (OpenTK.Graphics.ES20.All*)binaryFormat, (IntPtr)binary_ptr.AddrOfPinnedObject());
+                    binary = (T4)binary_ptr.Target;
+                }
+                finally
+                {
+                    binary_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             
         /// <summary>
         /// Map a buffer object's data store
@@ -17865,23 +17865,13 @@ namespace OpenTK.Graphics.ES20
 
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glProgramBinaryOES")]
             public static 
-            void ProgramBinary<T2>(Int32 program, OpenTK.Graphics.ES20.All binaryFormat, [InAttribute, OutAttribute] ref T2 binary, Int32 length)
-                where T2 : struct
+            void ProgramBinary(Int32 program, OpenTK.Graphics.ES20.All binaryFormat, IntPtr binary, Int32 length)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glProgramBinaryOES((UInt32)program, (OpenTK.Graphics.ES20.All)binaryFormat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
-                    binary = (T2)binary_ptr.Target;
-                }
-                finally
-                {
-                    binary_ptr.Free();
-                }
+                Delegates.glProgramBinaryOES((UInt32)program, (OpenTK.Graphics.ES20.All)binaryFormat, (IntPtr)binary, (Int32)length);
                 #if DEBUG
                 }
                 #endif
@@ -17889,7 +17879,7 @@ namespace OpenTK.Graphics.ES20
 
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glProgramBinaryOES")]
             public static 
-            void ProgramBinary<T2>(Int32 program, OpenTK.Graphics.ES20.All binaryFormat, [InAttribute, OutAttribute] T2[,,] binary, Int32 length)
+            void ProgramBinary<T2>(Int32 program, OpenTK.Graphics.ES20.All binaryFormat, [InAttribute, OutAttribute] T2[] binary, Int32 length)
                 where T2 : struct
             {
                 #if DEBUG
@@ -17935,7 +17925,7 @@ namespace OpenTK.Graphics.ES20
 
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glProgramBinaryOES")]
             public static 
-            void ProgramBinary<T2>(Int32 program, OpenTK.Graphics.ES20.All binaryFormat, [InAttribute, OutAttribute] T2[] binary, Int32 length)
+            void ProgramBinary<T2>(Int32 program, OpenTK.Graphics.ES20.All binaryFormat, [InAttribute, OutAttribute] T2[,,] binary, Int32 length)
                 where T2 : struct
             {
                 #if DEBUG
@@ -17958,22 +17948,7 @@ namespace OpenTK.Graphics.ES20
 
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glProgramBinaryOES")]
             public static 
-            void ProgramBinary(Int32 program, OpenTK.Graphics.ES20.All binaryFormat, IntPtr binary, Int32 length)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glProgramBinaryOES((UInt32)program, (OpenTK.Graphics.ES20.All)binaryFormat, (IntPtr)binary, (Int32)length);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glProgramBinaryOES")]
-            public static 
-            void ProgramBinary<T2>(UInt32 program, OpenTK.Graphics.ES20.All binaryFormat, [InAttribute, OutAttribute] ref T2 binary, Int32 length)
+            void ProgramBinary<T2>(Int32 program, OpenTK.Graphics.ES20.All binaryFormat, [InAttribute, OutAttribute] ref T2 binary, Int32 length)
                 where T2 : struct
             {
                 #if DEBUG
@@ -17998,7 +17973,22 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glProgramBinaryOES")]
             public static 
-            void ProgramBinary<T2>(UInt32 program, OpenTK.Graphics.ES20.All binaryFormat, [InAttribute, OutAttribute] T2[,,] binary, Int32 length)
+            void ProgramBinary(UInt32 program, OpenTK.Graphics.ES20.All binaryFormat, IntPtr binary, Int32 length)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glProgramBinaryOES((UInt32)program, (OpenTK.Graphics.ES20.All)binaryFormat, (IntPtr)binary, (Int32)length);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glProgramBinaryOES")]
+            public static 
+            void ProgramBinary<T2>(UInt32 program, OpenTK.Graphics.ES20.All binaryFormat, [InAttribute, OutAttribute] T2[] binary, Int32 length)
                 where T2 : struct
             {
                 #if DEBUG
@@ -18046,7 +18036,7 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glProgramBinaryOES")]
             public static 
-            void ProgramBinary<T2>(UInt32 program, OpenTK.Graphics.ES20.All binaryFormat, [InAttribute, OutAttribute] T2[] binary, Int32 length)
+            void ProgramBinary<T2>(UInt32 program, OpenTK.Graphics.ES20.All binaryFormat, [InAttribute, OutAttribute] T2[,,] binary, Int32 length)
                 where T2 : struct
             {
                 #if DEBUG
@@ -18070,90 +18060,22 @@ namespace OpenTK.Graphics.ES20
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glProgramBinaryOES")]
             public static 
-            void ProgramBinary(UInt32 program, OpenTK.Graphics.ES20.All binaryFormat, IntPtr binary, Int32 length)
+            void ProgramBinary<T2>(UInt32 program, OpenTK.Graphics.ES20.All binaryFormat, [InAttribute, OutAttribute] ref T2 binary, Int32 length)
+                where T2 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glProgramBinaryOES((UInt32)program, (OpenTK.Graphics.ES20.All)binaryFormat, (IntPtr)binary, (Int32)length);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Specify a three-dimensional texture image
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target texture. Must be GL_TEXTURE_3D or GL_PROXY_TEXTURE_3D.
-        /// </para>
-        /// </param>
-        /// <param name="level">
-        /// <para>
-        /// Specifies the level-of-detail number. Level 0 is the base image level. Level is the n sup th mipmap reduction image.
-        /// </para>
-        /// </param>
-        /// <param name="internalFormat">
-        /// <para>
-        /// Specifies the number of color components in the texture. Must be 1, 2, 3, or 4, or one of the following symbolic constants: GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_COMPRESSED_ALPHA, GL_COMPRESSED_LUMINANCE, GL_COMPRESSED_LUMINANCE_ALPHA, GL_COMPRESSED_INTENSITY, GL_COMPRESSED_RGB, GL_COMPRESSED_RGBA, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, GL_RGBA16, GL_SLUMINANCE, GL_SLUMINANCE8, GL_SLUMINANCE_ALPHA, GL_SLUMINANCE8_ALPHA8, GL_SRGB, GL_SRGB8, GL_SRGB_ALPHA, or GL_SRGB8_ALPHA8.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// Specifies the width of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup n + 2 ( border ) for some integer . All implementations support 3D texture images that are at least 16 texels wide.
-        /// </para>
-        /// </param>
-        /// <param name="height">
-        /// <para>
-        /// Specifies the height of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup m + 2 ( border ) for some integer . All implementations support 3D texture images that are at least 16 texels high.
-        /// </para>
-        /// </param>
-        /// <param name="depth">
-        /// <para>
-        /// Specifies the depth of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup k + 2 ( border ) for some integer . All implementations support 3D texture images that are at least 16 texels deep.
-        /// </para>
-        /// </param>
-        /// <param name="border">
-        /// <para>
-        /// Specifies the width of the border. Must be either 0 or 1.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Specifies the format of the pixel data. The following symbolic values are accepted: GL_COLOR_INDEX, GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the data type of the pixel data. The following symbolic values are accepted: GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the image data in memory.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glTexImage3DOES")]
-            public static 
-            void TexImage3D<T9>(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] ref T9 pixels)
-                where T9 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
+                GCHandle binary_ptr = GCHandle.Alloc(binary, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glTexImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (OpenTK.Graphics.ES20.All)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES20.All)format, (OpenTK.Graphics.ES20.All)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                    pixels = (T9)pixels_ptr.Target;
+                    Delegates.glProgramBinaryOES((UInt32)program, (OpenTK.Graphics.ES20.All)binaryFormat, (IntPtr)binary_ptr.AddrOfPinnedObject(), (Int32)length);
+                    binary = (T2)binary_ptr.Target;
                 }
                 finally
                 {
-                    pixels_ptr.Free();
+                    binary_ptr.Free();
                 }
                 #if DEBUG
                 }
@@ -18216,7 +18138,75 @@ namespace OpenTK.Graphics.ES20
         /// </param>
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glTexImage3DOES")]
             public static 
-            void TexImage3D<T9>(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] T9[,,] pixels)
+            void TexImage3D(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, IntPtr pixels)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTexImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (OpenTK.Graphics.ES20.All)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES20.All)format, (OpenTK.Graphics.ES20.All)type, (IntPtr)pixels);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Specify a three-dimensional texture image
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target texture. Must be GL_TEXTURE_3D or GL_PROXY_TEXTURE_3D.
+        /// </para>
+        /// </param>
+        /// <param name="level">
+        /// <para>
+        /// Specifies the level-of-detail number. Level 0 is the base image level. Level is the n sup th mipmap reduction image.
+        /// </para>
+        /// </param>
+        /// <param name="internalFormat">
+        /// <para>
+        /// Specifies the number of color components in the texture. Must be 1, 2, 3, or 4, or one of the following symbolic constants: GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_COMPRESSED_ALPHA, GL_COMPRESSED_LUMINANCE, GL_COMPRESSED_LUMINANCE_ALPHA, GL_COMPRESSED_INTENSITY, GL_COMPRESSED_RGB, GL_COMPRESSED_RGBA, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, GL_RGBA16, GL_SLUMINANCE, GL_SLUMINANCE8, GL_SLUMINANCE_ALPHA, GL_SLUMINANCE8_ALPHA8, GL_SRGB, GL_SRGB8, GL_SRGB_ALPHA, or GL_SRGB8_ALPHA8.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// Specifies the width of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup n + 2 ( border ) for some integer . All implementations support 3D texture images that are at least 16 texels wide.
+        /// </para>
+        /// </param>
+        /// <param name="height">
+        /// <para>
+        /// Specifies the height of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup m + 2 ( border ) for some integer . All implementations support 3D texture images that are at least 16 texels high.
+        /// </para>
+        /// </param>
+        /// <param name="depth">
+        /// <para>
+        /// Specifies the depth of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup k + 2 ( border ) for some integer . All implementations support 3D texture images that are at least 16 texels deep.
+        /// </para>
+        /// </param>
+        /// <param name="border">
+        /// <para>
+        /// Specifies the width of the border. Must be either 0 or 1.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Specifies the format of the pixel data. The following symbolic values are accepted: GL_COLOR_INDEX, GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the data type of the pixel data. The following symbolic values are accepted: GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the image data in memory.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glTexImage3DOES")]
+            public static 
+            void TexImage3D<T9>(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] T9[] pixels)
                 where T9 : struct
             {
                 #if DEBUG
@@ -18370,7 +18360,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glTexImage3DOES")]
             public static 
-            void TexImage3D<T9>(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] T9[] pixels)
+            void TexImage3D<T9>(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] T9[,,] pixels)
                 where T9 : struct
             {
                 #if DEBUG
@@ -18447,81 +18437,8 @@ namespace OpenTK.Graphics.ES20
         /// </param>
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glTexImage3DOES")]
             public static 
-            void TexImage3D(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, IntPtr pixels)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glTexImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (OpenTK.Graphics.ES20.All)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES20.All)format, (OpenTK.Graphics.ES20.All)type, (IntPtr)pixels);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Specify a three-dimensional texture subimage
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target texture. Must be GL_TEXTURE_3D.
-        /// </para>
-        /// </param>
-        /// <param name="level">
-        /// <para>
-        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
-        /// </para>
-        /// </param>
-        /// <param name="xoffset">
-        /// <para>
-        /// Specifies a texel offset in the x direction within the texture array.
-        /// </para>
-        /// </param>
-        /// <param name="yoffset">
-        /// <para>
-        /// Specifies a texel offset in the y direction within the texture array.
-        /// </para>
-        /// </param>
-        /// <param name="zoffset">
-        /// <para>
-        /// Specifies a texel offset in the z direction within the texture array.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// Specifies the width of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="height">
-        /// <para>
-        /// Specifies the height of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="depth">
-        /// <para>
-        /// Specifies the depth of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Specifies the format of the pixel data. The following symbolic values are accepted: GL_COLOR_INDEX, GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the data type of the pixel data. The following symbolic values are accepted: GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the image data in memory.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glTexSubImage3DOES")]
-            public static 
-            void TexSubImage3D<T10>(OpenTK.Graphics.ES20.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] ref T10 pixels)
-                where T10 : struct
+            void TexImage3D<T9>(OpenTK.Graphics.ES20.All target, Int32 level, OpenTK.Graphics.ES20.All internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] ref T9 pixels)
+                where T9 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -18530,8 +18447,8 @@ namespace OpenTK.Graphics.ES20
                 GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glTexSubImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.ES20.All)format, (OpenTK.Graphics.ES20.All)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                    pixels = (T10)pixels_ptr.Target;
+                    Delegates.glTexImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (OpenTK.Graphics.ES20.All)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.ES20.All)format, (OpenTK.Graphics.ES20.All)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    pixels = (T9)pixels_ptr.Target;
                 }
                 finally
                 {
@@ -18603,7 +18520,80 @@ namespace OpenTK.Graphics.ES20
         /// </param>
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glTexSubImage3DOES")]
             public static 
-            void TexSubImage3D<T10>(OpenTK.Graphics.ES20.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] T10[,,] pixels)
+            void TexSubImage3D(OpenTK.Graphics.ES20.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, IntPtr pixels)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTexSubImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.ES20.All)format, (OpenTK.Graphics.ES20.All)type, (IntPtr)pixels);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Specify a three-dimensional texture subimage
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target texture. Must be GL_TEXTURE_3D.
+        /// </para>
+        /// </param>
+        /// <param name="level">
+        /// <para>
+        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
+        /// </para>
+        /// </param>
+        /// <param name="xoffset">
+        /// <para>
+        /// Specifies a texel offset in the x direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="yoffset">
+        /// <para>
+        /// Specifies a texel offset in the y direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="zoffset">
+        /// <para>
+        /// Specifies a texel offset in the z direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// Specifies the width of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="height">
+        /// <para>
+        /// Specifies the height of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="depth">
+        /// <para>
+        /// Specifies the depth of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Specifies the format of the pixel data. The following symbolic values are accepted: GL_COLOR_INDEX, GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the data type of the pixel data. The following symbolic values are accepted: GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the image data in memory.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glTexSubImage3DOES")]
+            public static 
+            void TexSubImage3D<T10>(OpenTK.Graphics.ES20.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] T10[] pixels)
                 where T10 : struct
             {
                 #if DEBUG
@@ -18767,7 +18757,7 @@ namespace OpenTK.Graphics.ES20
         /// </param>
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glTexSubImage3DOES")]
             public static 
-            void TexSubImage3D<T10>(OpenTK.Graphics.ES20.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] T10[] pixels)
+            void TexSubImage3D<T10>(OpenTK.Graphics.ES20.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] T10[,,] pixels)
                 where T10 : struct
             {
                 #if DEBUG
@@ -18849,13 +18839,23 @@ namespace OpenTK.Graphics.ES20
         /// </param>
             [AutoGenerated(Category = "2.0", Version = "2.0", EntryPoint = "glTexSubImage3DOES")]
             public static 
-            void TexSubImage3D(OpenTK.Graphics.ES20.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, IntPtr pixels)
+            void TexSubImage3D<T10>(OpenTK.Graphics.ES20.All target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.ES20.All format, OpenTK.Graphics.ES20.All type, [InAttribute, OutAttribute] ref T10 pixels)
+                where T10 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glTexSubImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.ES20.All)format, (OpenTK.Graphics.ES20.All)type, (IntPtr)pixels);
+                GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glTexSubImage3DOES((OpenTK.Graphics.ES20.All)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.ES20.All)format, (OpenTK.Graphics.ES20.All)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    pixels = (T10)pixels_ptr.Target;
+                }
+                finally
+                {
+                    pixels_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
diff --git a/Source/OpenTK/Graphics/OpenGL/GL.cs b/Source/OpenTK/Graphics/OpenGL/GL.cs
index 8dfe3f8d..1559d707 100644
--- a/Source/OpenTK/Graphics/OpenGL/GL.cs
+++ b/Source/OpenTK/Graphics/OpenGL/GL.cs
@@ -218,21 +218,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glDeletePerfMonitorsAMD")]
-            public static 
-            unsafe void DeletePerfMonitors(Int32 n, [OutAttribute] Int32* monitors)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glDeletePerfMonitorsAMD((Int32)n, (UInt32*)monitors);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glDeletePerfMonitorsAMD")]
             public static 
             void DeletePerfMonitors(Int32 n, [OutAttribute] Int32[] monitors)
@@ -274,6 +259,42 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glDeletePerfMonitorsAMD")]
+            public static 
+            unsafe void DeletePerfMonitors(Int32 n, [OutAttribute] Int32* monitors)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glDeletePerfMonitorsAMD((Int32)n, (UInt32*)monitors);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glDeletePerfMonitorsAMD")]
+            public static 
+            void DeletePerfMonitors(Int32 n, [OutAttribute] UInt32[] monitors)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* monitors_ptr = monitors)
+                    {
+                        Delegates.glDeletePerfMonitorsAMD((Int32)n, (UInt32*)monitors_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glDeletePerfMonitorsAMD")]
             public static 
@@ -311,27 +332,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glDeletePerfMonitorsAMD")]
-            public static 
-            void DeletePerfMonitors(Int32 n, [OutAttribute] UInt32[] monitors)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* monitors_ptr = monitors)
-                    {
-                        Delegates.glDeletePerfMonitorsAMD((Int32)n, (UInt32*)monitors_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glEndPerfMonitorAMD")]
             public static 
             void EndPerfMonitor(Int32 monitor)
@@ -361,21 +361,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGenPerfMonitorsAMD")]
-            public static 
-            unsafe void GenPerfMonitors(Int32 n, [OutAttribute] Int32* monitors)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGenPerfMonitorsAMD((Int32)n, (UInt32*)monitors);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGenPerfMonitorsAMD")]
             public static 
             void GenPerfMonitors(Int32 n, [OutAttribute] Int32[] monitors)
@@ -420,29 +405,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGenPerfMonitorsAMD")]
             public static 
-            void GenPerfMonitors(Int32 n, [OutAttribute] out UInt32 monitors)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* monitors_ptr = &monitors)
-                    {
-                        Delegates.glGenPerfMonitorsAMD((Int32)n, (UInt32*)monitors_ptr);
-                        monitors = *monitors_ptr;
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGenPerfMonitorsAMD")]
-            public static 
-            unsafe void GenPerfMonitors(Int32 n, [OutAttribute] UInt32* monitors)
+            unsafe void GenPerfMonitors(Int32 n, [OutAttribute] Int32* monitors)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -476,15 +439,37 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorCounterDataAMD")]
+            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGenPerfMonitorsAMD")]
             public static 
-            unsafe void GetPerfMonitorCounterData(Int32 monitor, OpenTK.Graphics.OpenGL.AmdPerformanceMonitor pname, Int32 dataSize, [OutAttribute] Int32* data, [OutAttribute] Int32* bytesWritten)
+            void GenPerfMonitors(Int32 n, [OutAttribute] out UInt32 monitors)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetPerfMonitorCounterDataAMD((UInt32)monitor, (OpenTK.Graphics.OpenGL.AmdPerformanceMonitor)pname, (Int32)dataSize, (UInt32*)data, (Int32*)bytesWritten);
+                unsafe
+                {
+                    fixed (UInt32* monitors_ptr = &monitors)
+                    {
+                        Delegates.glGenPerfMonitorsAMD((Int32)n, (UInt32*)monitors_ptr);
+                        monitors = *monitors_ptr;
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGenPerfMonitorsAMD")]
+            public static 
+            unsafe void GenPerfMonitors(Int32 n, [OutAttribute] UInt32* monitors)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGenPerfMonitorsAMD((Int32)n, (UInt32*)monitors);
                 #if DEBUG
                 }
                 #endif
@@ -531,6 +516,39 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorCounterDataAMD")]
+            public static 
+            unsafe void GetPerfMonitorCounterData(Int32 monitor, OpenTK.Graphics.OpenGL.AmdPerformanceMonitor pname, Int32 dataSize, [OutAttribute] Int32* data, [OutAttribute] Int32* bytesWritten)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetPerfMonitorCounterDataAMD((UInt32)monitor, (OpenTK.Graphics.OpenGL.AmdPerformanceMonitor)pname, (Int32)dataSize, (UInt32*)data, (Int32*)bytesWritten);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorCounterDataAMD")]
+            public static 
+            unsafe void GetPerfMonitorCounterData(UInt32 monitor, OpenTK.Graphics.OpenGL.AmdPerformanceMonitor pname, Int32 dataSize, [OutAttribute] UInt32[] data, [OutAttribute] Int32* bytesWritten)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                fixed (UInt32* data_ptr = data)
+                {
+                    Delegates.glGetPerfMonitorCounterDataAMD((UInt32)monitor, (OpenTK.Graphics.OpenGL.AmdPerformanceMonitor)pname, (Int32)dataSize, (UInt32*)data_ptr, (Int32*)bytesWritten);
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorCounterDataAMD")]
             public static 
@@ -570,19 +588,15 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorCounterDataAMD")]
+            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorCounterInfoAMD")]
             public static 
-            unsafe void GetPerfMonitorCounterData(UInt32 monitor, OpenTK.Graphics.OpenGL.AmdPerformanceMonitor pname, Int32 dataSize, [OutAttribute] UInt32[] data, [OutAttribute] Int32* bytesWritten)
+            void GetPerfMonitorCounterInfo(Int32 group, Int32 counter, OpenTK.Graphics.OpenGL.AmdPerformanceMonitor pname, [OutAttribute] IntPtr data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                fixed (UInt32* data_ptr = data)
-                {
-                    Delegates.glGetPerfMonitorCounterDataAMD((UInt32)monitor, (OpenTK.Graphics.OpenGL.AmdPerformanceMonitor)pname, (Int32)dataSize, (UInt32*)data_ptr, (Int32*)bytesWritten);
-                }
+                Delegates.glGetPerfMonitorCounterInfoAMD((UInt32)group, (UInt32)counter, (OpenTK.Graphics.OpenGL.AmdPerformanceMonitor)pname, (IntPtr)data);
                 #if DEBUG
                 }
                 #endif
@@ -590,31 +604,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorCounterInfoAMD")]
             public static 
-            void GetPerfMonitorCounterInfo<T3>(Int32 group, Int32 counter, OpenTK.Graphics.OpenGL.AmdPerformanceMonitor pname, [InAttribute, OutAttribute] ref T3 data)
-                where T3 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetPerfMonitorCounterInfoAMD((UInt32)group, (UInt32)counter, (OpenTK.Graphics.OpenGL.AmdPerformanceMonitor)pname, (IntPtr)data_ptr.AddrOfPinnedObject());
-                    data = (T3)data_ptr.Target;
-                }
-                finally
-                {
-                    data_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorCounterInfoAMD")]
-            public static 
-            void GetPerfMonitorCounterInfo<T3>(Int32 group, Int32 counter, OpenTK.Graphics.OpenGL.AmdPerformanceMonitor pname, [InAttribute, OutAttribute] T3[,,] data)
+            void GetPerfMonitorCounterInfo<T3>(Int32 group, Int32 counter, OpenTK.Graphics.OpenGL.AmdPerformanceMonitor pname, [InAttribute, OutAttribute] T3[] data)
                 where T3 : struct
             {
                 #if DEBUG
@@ -660,7 +650,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorCounterInfoAMD")]
             public static 
-            void GetPerfMonitorCounterInfo<T3>(Int32 group, Int32 counter, OpenTK.Graphics.OpenGL.AmdPerformanceMonitor pname, [InAttribute, OutAttribute] T3[] data)
+            void GetPerfMonitorCounterInfo<T3>(Int32 group, Int32 counter, OpenTK.Graphics.OpenGL.AmdPerformanceMonitor pname, [InAttribute, OutAttribute] T3[,,] data)
                 where T3 : struct
             {
                 #if DEBUG
@@ -683,22 +673,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorCounterInfoAMD")]
             public static 
-            void GetPerfMonitorCounterInfo(Int32 group, Int32 counter, OpenTK.Graphics.OpenGL.AmdPerformanceMonitor pname, [OutAttribute] IntPtr data)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetPerfMonitorCounterInfoAMD((UInt32)group, (UInt32)counter, (OpenTK.Graphics.OpenGL.AmdPerformanceMonitor)pname, (IntPtr)data);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorCounterInfoAMD")]
-            public static 
-            void GetPerfMonitorCounterInfo<T3>(UInt32 group, UInt32 counter, OpenTK.Graphics.OpenGL.AmdPerformanceMonitor pname, [InAttribute, OutAttribute] ref T3 data)
+            void GetPerfMonitorCounterInfo<T3>(Int32 group, Int32 counter, OpenTK.Graphics.OpenGL.AmdPerformanceMonitor pname, [InAttribute, OutAttribute] ref T3 data)
                 where T3 : struct
             {
                 #if DEBUG
@@ -723,7 +698,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorCounterInfoAMD")]
             public static 
-            void GetPerfMonitorCounterInfo<T3>(UInt32 group, UInt32 counter, OpenTK.Graphics.OpenGL.AmdPerformanceMonitor pname, [InAttribute, OutAttribute] T3[,,] data)
+            void GetPerfMonitorCounterInfo(UInt32 group, UInt32 counter, OpenTK.Graphics.OpenGL.AmdPerformanceMonitor pname, [OutAttribute] IntPtr data)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetPerfMonitorCounterInfoAMD((UInt32)group, (UInt32)counter, (OpenTK.Graphics.OpenGL.AmdPerformanceMonitor)pname, (IntPtr)data);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorCounterInfoAMD")]
+            public static 
+            void GetPerfMonitorCounterInfo<T3>(UInt32 group, UInt32 counter, OpenTK.Graphics.OpenGL.AmdPerformanceMonitor pname, [InAttribute, OutAttribute] T3[] data)
                 where T3 : struct
             {
                 #if DEBUG
@@ -771,7 +761,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorCounterInfoAMD")]
             public static 
-            void GetPerfMonitorCounterInfo<T3>(UInt32 group, UInt32 counter, OpenTK.Graphics.OpenGL.AmdPerformanceMonitor pname, [InAttribute, OutAttribute] T3[] data)
+            void GetPerfMonitorCounterInfo<T3>(UInt32 group, UInt32 counter, OpenTK.Graphics.OpenGL.AmdPerformanceMonitor pname, [InAttribute, OutAttribute] T3[,,] data)
                 where T3 : struct
             {
                 #if DEBUG
@@ -795,45 +785,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorCounterInfoAMD")]
             public static 
-            void GetPerfMonitorCounterInfo(UInt32 group, UInt32 counter, OpenTK.Graphics.OpenGL.AmdPerformanceMonitor pname, [OutAttribute] IntPtr data)
+            void GetPerfMonitorCounterInfo<T3>(UInt32 group, UInt32 counter, OpenTK.Graphics.OpenGL.AmdPerformanceMonitor pname, [InAttribute, OutAttribute] ref T3 data)
+                where T3 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetPerfMonitorCounterInfoAMD((UInt32)group, (UInt32)counter, (OpenTK.Graphics.OpenGL.AmdPerformanceMonitor)pname, (IntPtr)data);
-                #if DEBUG
+                GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetPerfMonitorCounterInfoAMD((UInt32)group, (UInt32)counter, (OpenTK.Graphics.OpenGL.AmdPerformanceMonitor)pname, (IntPtr)data_ptr.AddrOfPinnedObject());
+                    data = (T3)data_ptr.Target;
                 }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorCountersAMD")]
-            public static 
-            unsafe void GetPerfMonitorCounters(Int32 group, [OutAttribute] Int32* numCounters, [OutAttribute] Int32* maxActiveCounters, Int32 counterSize, [OutAttribute] Int32* counters)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                finally
                 {
-                #endif
-                Delegates.glGetPerfMonitorCountersAMD((UInt32)group, (Int32*)numCounters, (Int32*)maxActiveCounters, (Int32)counterSize, (UInt32*)counters);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorCountersAMD")]
-            public static 
-            unsafe void GetPerfMonitorCounters(Int32 group, [OutAttribute] Int32* numCounters, [OutAttribute] Int32* maxActiveCounters, Int32 counterSize, [OutAttribute] Int32[] counters)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                fixed (Int32* counters_ptr = counters)
-                {
-                    Delegates.glGetPerfMonitorCountersAMD((UInt32)group, (Int32*)numCounters, (Int32*)maxActiveCounters, (Int32)counterSize, (UInt32*)counters_ptr);
+                    data_ptr.Free();
                 }
                 #if DEBUG
                 }
@@ -868,13 +835,16 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorCountersAMD")]
             public static 
-            unsafe void GetPerfMonitorCounters(UInt32 group, [OutAttribute] Int32* numCounters, [OutAttribute] Int32* maxActiveCounters, Int32 counterSize, [OutAttribute] UInt32* counters)
+            unsafe void GetPerfMonitorCounters(Int32 group, [OutAttribute] Int32* numCounters, [OutAttribute] Int32* maxActiveCounters, Int32 counterSize, [OutAttribute] Int32[] counters)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetPerfMonitorCountersAMD((UInt32)group, (Int32*)numCounters, (Int32*)maxActiveCounters, (Int32)counterSize, (UInt32*)counters);
+                fixed (Int32* counters_ptr = counters)
+                {
+                    Delegates.glGetPerfMonitorCountersAMD((UInt32)group, (Int32*)numCounters, (Int32*)maxActiveCounters, (Int32)counterSize, (UInt32*)counters_ptr);
+                }
                 #if DEBUG
                 }
                 #endif
@@ -883,16 +853,13 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorCountersAMD")]
             public static 
-            unsafe void GetPerfMonitorCounters(UInt32 group, [OutAttribute] Int32* numCounters, [OutAttribute] Int32* maxActiveCounters, Int32 counterSize, [OutAttribute] UInt32[] counters)
+            unsafe void GetPerfMonitorCounters(Int32 group, [OutAttribute] Int32* numCounters, [OutAttribute] Int32* maxActiveCounters, Int32 counterSize, [OutAttribute] Int32* counters)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                fixed (UInt32* counters_ptr = counters)
-                {
-                    Delegates.glGetPerfMonitorCountersAMD((UInt32)group, (Int32*)numCounters, (Int32*)maxActiveCounters, (Int32)counterSize, (UInt32*)counters_ptr);
-                }
+                Delegates.glGetPerfMonitorCountersAMD((UInt32)group, (Int32*)numCounters, (Int32*)maxActiveCounters, (Int32)counterSize, (UInt32*)counters);
                 #if DEBUG
                 }
                 #endif
@@ -925,15 +892,33 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorCounterStringAMD")]
+            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorCountersAMD")]
             public static 
-            unsafe void GetPerfMonitorCounterString(Int32 group, Int32 counter, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder counterString)
+            unsafe void GetPerfMonitorCounters(UInt32 group, [OutAttribute] Int32* numCounters, [OutAttribute] Int32* maxActiveCounters, Int32 counterSize, [OutAttribute] UInt32[] counters)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetPerfMonitorCounterStringAMD((UInt32)group, (UInt32)counter, (Int32)bufSize, (Int32*)length, (StringBuilder)counterString);
+                fixed (UInt32* counters_ptr = counters)
+                {
+                    Delegates.glGetPerfMonitorCountersAMD((UInt32)group, (Int32*)numCounters, (Int32*)maxActiveCounters, (Int32)counterSize, (UInt32*)counters_ptr);
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorCountersAMD")]
+            public static 
+            unsafe void GetPerfMonitorCounters(UInt32 group, [OutAttribute] Int32* numCounters, [OutAttribute] Int32* maxActiveCounters, Int32 counterSize, [OutAttribute] UInt32* counters)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetPerfMonitorCountersAMD((UInt32)group, (Int32*)numCounters, (Int32*)maxActiveCounters, (Int32)counterSize, (UInt32*)counters);
                 #if DEBUG
                 }
                 #endif
@@ -963,7 +948,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorCounterStringAMD")]
             public static 
-            unsafe void GetPerfMonitorCounterString(UInt32 group, UInt32 counter, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder counterString)
+            unsafe void GetPerfMonitorCounterString(Int32 group, Int32 counter, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder counterString)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -998,66 +983,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorGroupsAMD")]
+            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorCounterStringAMD")]
             public static 
-            unsafe void GetPerfMonitorGroup([OutAttribute] Int32* numGroups, Int32 groupsSize, [OutAttribute] Int32* groups)
+            unsafe void GetPerfMonitorCounterString(UInt32 group, UInt32 counter, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder counterString)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetPerfMonitorGroupsAMD((Int32*)numGroups, (Int32)groupsSize, (UInt32*)groups);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorGroupsAMD")]
-            public static 
-            unsafe void GetPerfMonitorGroup([OutAttribute] Int32* numGroups, Int32 groupsSize, [OutAttribute] Int32[] groups)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                fixed (Int32* groups_ptr = groups)
-                {
-                    Delegates.glGetPerfMonitorGroupsAMD((Int32*)numGroups, (Int32)groupsSize, (UInt32*)groups_ptr);
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorGroupsAMD")]
-            public static 
-            unsafe void GetPerfMonitorGroup([OutAttribute] Int32* numGroups, Int32 groupsSize, [OutAttribute] UInt32* groups)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetPerfMonitorGroupsAMD((Int32*)numGroups, (Int32)groupsSize, (UInt32*)groups);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorGroupsAMD")]
-            public static 
-            unsafe void GetPerfMonitorGroup([OutAttribute] Int32* numGroups, Int32 groupsSize, [OutAttribute] UInt32[] groups)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                fixed (UInt32* groups_ptr = groups)
-                {
-                    Delegates.glGetPerfMonitorGroupsAMD((Int32*)numGroups, (Int32)groupsSize, (UInt32*)groups_ptr);
-                }
+                Delegates.glGetPerfMonitorCounterStringAMD((UInt32)group, (UInt32)counter, (Int32)bufSize, (Int32*)length, (StringBuilder)counterString);
                 #if DEBUG
                 }
                 #endif
@@ -1111,15 +1045,66 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorGroupStringAMD")]
+            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorGroupsAMD")]
             public static 
-            unsafe void GetPerfMonitorGroupString(Int32 group, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder groupString)
+            unsafe void GetPerfMonitorGroup([OutAttribute] Int32* numGroups, Int32 groupsSize, [OutAttribute] Int32[] groups)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetPerfMonitorGroupStringAMD((UInt32)group, (Int32)bufSize, (Int32*)length, (StringBuilder)groupString);
+                fixed (Int32* groups_ptr = groups)
+                {
+                    Delegates.glGetPerfMonitorGroupsAMD((Int32*)numGroups, (Int32)groupsSize, (UInt32*)groups_ptr);
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorGroupsAMD")]
+            public static 
+            unsafe void GetPerfMonitorGroup([OutAttribute] Int32* numGroups, Int32 groupsSize, [OutAttribute] Int32* groups)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetPerfMonitorGroupsAMD((Int32*)numGroups, (Int32)groupsSize, (UInt32*)groups);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorGroupsAMD")]
+            public static 
+            unsafe void GetPerfMonitorGroup([OutAttribute] Int32* numGroups, Int32 groupsSize, [OutAttribute] UInt32[] groups)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                fixed (UInt32* groups_ptr = groups)
+                {
+                    Delegates.glGetPerfMonitorGroupsAMD((Int32*)numGroups, (Int32)groupsSize, (UInt32*)groups_ptr);
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorGroupsAMD")]
+            public static 
+            unsafe void GetPerfMonitorGroup([OutAttribute] Int32* numGroups, Int32 groupsSize, [OutAttribute] UInt32* groups)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetPerfMonitorGroupsAMD((Int32*)numGroups, (Int32)groupsSize, (UInt32*)groups);
                 #if DEBUG
                 }
                 #endif
@@ -1149,7 +1134,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorGroupStringAMD")]
             public static 
-            unsafe void GetPerfMonitorGroupString(UInt32 group, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder groupString)
+            unsafe void GetPerfMonitorGroupString(Int32 group, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder groupString)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -1184,15 +1169,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glSelectPerfMonitorCountersAMD")]
+            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glGetPerfMonitorGroupStringAMD")]
             public static 
-            unsafe void SelectPerfMonitorCounters(Int32 monitor, bool enable, Int32 group, Int32 numCounters, [OutAttribute] Int32* counterList)
+            unsafe void GetPerfMonitorGroupString(UInt32 group, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder groupString)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glSelectPerfMonitorCountersAMD((UInt32)monitor, (bool)enable, (UInt32)group, (Int32)numCounters, (UInt32*)counterList);
+                Delegates.glGetPerfMonitorGroupStringAMD((UInt32)group, (Int32)bufSize, (Int32*)length, (StringBuilder)groupString);
                 #if DEBUG
                 }
                 #endif
@@ -1239,6 +1224,42 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glSelectPerfMonitorCountersAMD")]
+            public static 
+            unsafe void SelectPerfMonitorCounters(Int32 monitor, bool enable, Int32 group, Int32 numCounters, [OutAttribute] Int32* counterList)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glSelectPerfMonitorCountersAMD((UInt32)monitor, (bool)enable, (UInt32)group, (Int32)numCounters, (UInt32*)counterList);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glSelectPerfMonitorCountersAMD")]
+            public static 
+            void SelectPerfMonitorCounters(UInt32 monitor, bool enable, UInt32 group, Int32 numCounters, [OutAttribute] UInt32[] counterList)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* counterList_ptr = counterList)
+                    {
+                        Delegates.glSelectPerfMonitorCountersAMD((UInt32)monitor, (bool)enable, (UInt32)group, (Int32)numCounters, (UInt32*)counterList_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glSelectPerfMonitorCountersAMD")]
             public static 
@@ -1276,27 +1297,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AmdPerformanceMonitor", Version = "1.2", EntryPoint = "glSelectPerfMonitorCountersAMD")]
-            public static 
-            void SelectPerfMonitorCounters(UInt32 monitor, bool enable, UInt32 group, Int32 numCounters, [OutAttribute] UInt32[] counterList)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* counterList_ptr = counterList)
-                    {
-                        Delegates.glSelectPerfMonitorCountersAMD((UInt32)monitor, (bool)enable, (UInt32)group, (Int32)numCounters, (UInt32*)counterList_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AmdVertexShaderTesselator", Version = "2.0", EntryPoint = "glTessellationFactorAMD")]
             public static 
             void TessellationFactor(Single factor)
@@ -1372,21 +1372,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AppleFence", Version = "1.2", EntryPoint = "glDeleteFencesAPPLE")]
-            public static 
-            unsafe void DeleteFences(Int32 n, Int32* fences)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glDeleteFencesAPPLE((Int32)n, (UInt32*)fences);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AppleFence", Version = "1.2", EntryPoint = "glDeleteFencesAPPLE")]
             public static 
             void DeleteFences(Int32 n, Int32[] fences)
@@ -1430,28 +1415,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AppleFence", Version = "1.2", EntryPoint = "glDeleteFencesAPPLE")]
             public static 
-            void DeleteFences(Int32 n, ref UInt32 fences)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* fences_ptr = &fences)
-                    {
-                        Delegates.glDeleteFencesAPPLE((Int32)n, (UInt32*)fences_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AppleFence", Version = "1.2", EntryPoint = "glDeleteFencesAPPLE")]
-            public static 
-            unsafe void DeleteFences(Int32 n, UInt32* fences)
+            unsafe void DeleteFences(Int32 n, Int32* fences)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -1485,15 +1449,36 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AppleVertexArrayObject", Version = "1.2", EntryPoint = "glDeleteVertexArraysAPPLE")]
+            [AutoGenerated(Category = "AppleFence", Version = "1.2", EntryPoint = "glDeleteFencesAPPLE")]
             public static 
-            unsafe void DeleteVertexArrays(Int32 n, Int32* arrays)
+            void DeleteFences(Int32 n, ref UInt32 fences)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glDeleteVertexArraysAPPLE((Int32)n, (UInt32*)arrays);
+                unsafe
+                {
+                    fixed (UInt32* fences_ptr = &fences)
+                    {
+                        Delegates.glDeleteFencesAPPLE((Int32)n, (UInt32*)fences_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AppleFence", Version = "1.2", EntryPoint = "glDeleteFencesAPPLE")]
+            public static 
+            unsafe void DeleteFences(Int32 n, UInt32* fences)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glDeleteFencesAPPLE((Int32)n, (UInt32*)fences);
                 #if DEBUG
                 }
                 #endif
@@ -1539,6 +1524,42 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AppleVertexArrayObject", Version = "1.2", EntryPoint = "glDeleteVertexArraysAPPLE")]
+            public static 
+            unsafe void DeleteVertexArrays(Int32 n, Int32* arrays)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glDeleteVertexArraysAPPLE((Int32)n, (UInt32*)arrays);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AppleVertexArrayObject", Version = "1.2", EntryPoint = "glDeleteVertexArraysAPPLE")]
+            public static 
+            void DeleteVertexArrays(Int32 n, UInt32[] arrays)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* arrays_ptr = arrays)
+                    {
+                        Delegates.glDeleteVertexArraysAPPLE((Int32)n, (UInt32*)arrays_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AppleVertexArrayObject", Version = "1.2", EntryPoint = "glDeleteVertexArraysAPPLE")]
             public static 
@@ -1575,27 +1596,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AppleVertexArrayObject", Version = "1.2", EntryPoint = "glDeleteVertexArraysAPPLE")]
-            public static 
-            void DeleteVertexArrays(Int32 n, UInt32[] arrays)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* arrays_ptr = arrays)
-                    {
-                        Delegates.glDeleteVertexArraysAPPLE((Int32)n, (UInt32*)arrays_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AppleVertexProgramEvaluators", Version = "1.5", EntryPoint = "glDisableVertexAttribAPPLE")]
             public static 
             void DisableVertexAttrib(Int32 index, OpenTK.Graphics.OpenGL.AppleVertexProgramEvaluators pname)
@@ -1670,23 +1670,13 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AppleElementArray", Version = "1.2", EntryPoint = "glElementPointerAPPLE")]
             public static 
-            void ElementPointer<T1>(OpenTK.Graphics.OpenGL.AppleElementArray type, [InAttribute, OutAttribute] ref T1 pointer)
-                where T1 : struct
+            void ElementPointer(OpenTK.Graphics.OpenGL.AppleElementArray type, IntPtr pointer)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glElementPointerAPPLE((OpenTK.Graphics.OpenGL.AppleElementArray)type, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                    pointer = (T1)pointer_ptr.Target;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
+                Delegates.glElementPointerAPPLE((OpenTK.Graphics.OpenGL.AppleElementArray)type, (IntPtr)pointer);
                 #if DEBUG
                 }
                 #endif
@@ -1694,7 +1684,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AppleElementArray", Version = "1.2", EntryPoint = "glElementPointerAPPLE")]
             public static 
-            void ElementPointer<T1>(OpenTK.Graphics.OpenGL.AppleElementArray type, [InAttribute, OutAttribute] T1[,,] pointer)
+            void ElementPointer<T1>(OpenTK.Graphics.OpenGL.AppleElementArray type, [InAttribute, OutAttribute] T1[] pointer)
                 where T1 : struct
             {
                 #if DEBUG
@@ -1740,7 +1730,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AppleElementArray", Version = "1.2", EntryPoint = "glElementPointerAPPLE")]
             public static 
-            void ElementPointer<T1>(OpenTK.Graphics.OpenGL.AppleElementArray type, [InAttribute, OutAttribute] T1[] pointer)
+            void ElementPointer<T1>(OpenTK.Graphics.OpenGL.AppleElementArray type, [InAttribute, OutAttribute] T1[,,] pointer)
                 where T1 : struct
             {
                 #if DEBUG
@@ -1763,13 +1753,23 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AppleElementArray", Version = "1.2", EntryPoint = "glElementPointerAPPLE")]
             public static 
-            void ElementPointer(OpenTK.Graphics.OpenGL.AppleElementArray type, IntPtr pointer)
+            void ElementPointer<T1>(OpenTK.Graphics.OpenGL.AppleElementArray type, [InAttribute, OutAttribute] ref T1 pointer)
+                where T1 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glElementPointerAPPLE((OpenTK.Graphics.OpenGL.AppleElementArray)type, (IntPtr)pointer);
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glElementPointerAPPLE((OpenTK.Graphics.OpenGL.AppleElementArray)type, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    pointer = (T1)pointer_ptr.Target;
+                }
+                finally
+                {
+                    pointer_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -1863,23 +1863,13 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AppleVertexArrayRange", Version = "1.2", EntryPoint = "glFlushVertexArrayRangeAPPLE")]
             public static 
-            void FlushVertexArrayRange<T1>(Int32 length, [InAttribute, OutAttribute] ref T1 pointer)
-                where T1 : struct
+            void FlushVertexArrayRange(Int32 length, [OutAttribute] IntPtr pointer)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glFlushVertexArrayRangeAPPLE((Int32)length, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                    pointer = (T1)pointer_ptr.Target;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
+                Delegates.glFlushVertexArrayRangeAPPLE((Int32)length, (IntPtr)pointer);
                 #if DEBUG
                 }
                 #endif
@@ -1887,7 +1877,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AppleVertexArrayRange", Version = "1.2", EntryPoint = "glFlushVertexArrayRangeAPPLE")]
             public static 
-            void FlushVertexArrayRange<T1>(Int32 length, [InAttribute, OutAttribute] T1[,,] pointer)
+            void FlushVertexArrayRange<T1>(Int32 length, [InAttribute, OutAttribute] T1[] pointer)
                 where T1 : struct
             {
                 #if DEBUG
@@ -1933,7 +1923,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AppleVertexArrayRange", Version = "1.2", EntryPoint = "glFlushVertexArrayRangeAPPLE")]
             public static 
-            void FlushVertexArrayRange<T1>(Int32 length, [InAttribute, OutAttribute] T1[] pointer)
+            void FlushVertexArrayRange<T1>(Int32 length, [InAttribute, OutAttribute] T1[,,] pointer)
                 where T1 : struct
             {
                 #if DEBUG
@@ -1956,28 +1946,23 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AppleVertexArrayRange", Version = "1.2", EntryPoint = "glFlushVertexArrayRangeAPPLE")]
             public static 
-            void FlushVertexArrayRange(Int32 length, [OutAttribute] IntPtr pointer)
+            void FlushVertexArrayRange<T1>(Int32 length, [InAttribute, OutAttribute] ref T1 pointer)
+                where T1 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glFlushVertexArrayRangeAPPLE((Int32)length, (IntPtr)pointer);
-                #if DEBUG
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glFlushVertexArrayRangeAPPLE((Int32)length, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    pointer = (T1)pointer_ptr.Target;
                 }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AppleFence", Version = "1.2", EntryPoint = "glGenFencesAPPLE")]
-            public static 
-            unsafe void GenFences(Int32 n, [OutAttribute] Int32* fences)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                finally
                 {
-                #endif
-                Delegates.glGenFencesAPPLE((Int32)n, (UInt32*)fences);
+                    pointer_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -2027,29 +2012,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AppleFence", Version = "1.2", EntryPoint = "glGenFencesAPPLE")]
             public static 
-            void GenFences(Int32 n, [OutAttribute] out UInt32 fences)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* fences_ptr = &fences)
-                    {
-                        Delegates.glGenFencesAPPLE((Int32)n, (UInt32*)fences_ptr);
-                        fences = *fences_ptr;
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AppleFence", Version = "1.2", EntryPoint = "glGenFencesAPPLE")]
-            public static 
-            unsafe void GenFences(Int32 n, [OutAttribute] UInt32* fences)
+            unsafe void GenFences(Int32 n, [OutAttribute] Int32* fences)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -2083,15 +2046,37 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AppleVertexArrayObject", Version = "1.2", EntryPoint = "glGenVertexArraysAPPLE")]
+            [AutoGenerated(Category = "AppleFence", Version = "1.2", EntryPoint = "glGenFencesAPPLE")]
             public static 
-            unsafe void GenVertexArrays(Int32 n, [OutAttribute] Int32* arrays)
+            void GenFences(Int32 n, [OutAttribute] out UInt32 fences)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGenVertexArraysAPPLE((Int32)n, (UInt32*)arrays);
+                unsafe
+                {
+                    fixed (UInt32* fences_ptr = &fences)
+                    {
+                        Delegates.glGenFencesAPPLE((Int32)n, (UInt32*)fences_ptr);
+                        fences = *fences_ptr;
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AppleFence", Version = "1.2", EntryPoint = "glGenFencesAPPLE")]
+            public static 
+            unsafe void GenFences(Int32 n, [OutAttribute] UInt32* fences)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGenFencesAPPLE((Int32)n, (UInt32*)fences);
                 #if DEBUG
                 }
                 #endif
@@ -2141,29 +2126,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AppleVertexArrayObject", Version = "1.2", EntryPoint = "glGenVertexArraysAPPLE")]
             public static 
-            void GenVertexArrays(Int32 n, [OutAttribute] out UInt32 arrays)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* arrays_ptr = &arrays)
-                    {
-                        Delegates.glGenVertexArraysAPPLE((Int32)n, (UInt32*)arrays_ptr);
-                        arrays = *arrays_ptr;
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AppleVertexArrayObject", Version = "1.2", EntryPoint = "glGenVertexArraysAPPLE")]
-            public static 
-            unsafe void GenVertexArrays(Int32 n, [OutAttribute] UInt32* arrays)
+            unsafe void GenVertexArrays(Int32 n, [OutAttribute] Int32* arrays)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -2197,15 +2160,37 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AppleObjectPurgeable", Version = "1.5", EntryPoint = "glGetObjectParameterivAPPLE")]
+            [AutoGenerated(Category = "AppleVertexArrayObject", Version = "1.2", EntryPoint = "glGenVertexArraysAPPLE")]
             public static 
-            unsafe void GetObjectParameter(OpenTK.Graphics.OpenGL.AppleObjectPurgeable objectType, Int32 name, OpenTK.Graphics.OpenGL.AppleObjectPurgeable pname, [OutAttribute] Int32* @params)
+            void GenVertexArrays(Int32 n, [OutAttribute] out UInt32 arrays)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetObjectParameterivAPPLE((OpenTK.Graphics.OpenGL.AppleObjectPurgeable)objectType, (UInt32)name, (OpenTK.Graphics.OpenGL.AppleObjectPurgeable)pname, (Int32*)@params);
+                unsafe
+                {
+                    fixed (UInt32* arrays_ptr = &arrays)
+                    {
+                        Delegates.glGenVertexArraysAPPLE((Int32)n, (UInt32*)arrays_ptr);
+                        arrays = *arrays_ptr;
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AppleVertexArrayObject", Version = "1.2", EntryPoint = "glGenVertexArraysAPPLE")]
+            public static 
+            unsafe void GenVertexArrays(Int32 n, [OutAttribute] UInt32* arrays)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGenVertexArraysAPPLE((Int32)n, (UInt32*)arrays);
                 #if DEBUG
                 }
                 #endif
@@ -2255,7 +2240,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AppleObjectPurgeable", Version = "1.5", EntryPoint = "glGetObjectParameterivAPPLE")]
             public static 
-            unsafe void GetObjectParameter(OpenTK.Graphics.OpenGL.AppleObjectPurgeable objectType, UInt32 name, OpenTK.Graphics.OpenGL.AppleObjectPurgeable pname, [OutAttribute] Int32* @params)
+            unsafe void GetObjectParameter(OpenTK.Graphics.OpenGL.AppleObjectPurgeable objectType, Int32 name, OpenTK.Graphics.OpenGL.AppleObjectPurgeable pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -2310,25 +2295,16 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "AppleTextureRange", Version = "1.2", EntryPoint = "glGetTexParameterPointervAPPLE")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AppleObjectPurgeable", Version = "1.5", EntryPoint = "glGetObjectParameterivAPPLE")]
             public static 
-            void GetTexParameterPointer<T2>(OpenTK.Graphics.OpenGL.AppleTextureRange target, OpenTK.Graphics.OpenGL.AppleTextureRange pname, [InAttribute, OutAttribute] ref T2 @params)
-                where T2 : struct
+            unsafe void GetObjectParameter(OpenTK.Graphics.OpenGL.AppleObjectPurgeable objectType, UInt32 name, OpenTK.Graphics.OpenGL.AppleObjectPurgeable pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle @params_ptr = GCHandle.Alloc(@params, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetTexParameterPointervAPPLE((OpenTK.Graphics.OpenGL.AppleTextureRange)target, (OpenTK.Graphics.OpenGL.AppleTextureRange)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
-                    @params = (T2)@params_ptr.Target;
-                }
-                finally
-                {
-                    @params_ptr.Free();
-                }
+                Delegates.glGetObjectParameterivAPPLE((OpenTK.Graphics.OpenGL.AppleObjectPurgeable)objectType, (UInt32)name, (OpenTK.Graphics.OpenGL.AppleObjectPurgeable)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -2336,7 +2312,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AppleTextureRange", Version = "1.2", EntryPoint = "glGetTexParameterPointervAPPLE")]
             public static 
-            void GetTexParameterPointer<T2>(OpenTK.Graphics.OpenGL.AppleTextureRange target, OpenTK.Graphics.OpenGL.AppleTextureRange pname, [InAttribute, OutAttribute] T2[,,] @params)
+            void GetTexParameterPointer(OpenTK.Graphics.OpenGL.AppleTextureRange target, OpenTK.Graphics.OpenGL.AppleTextureRange pname, [OutAttribute] IntPtr @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetTexParameterPointervAPPLE((OpenTK.Graphics.OpenGL.AppleTextureRange)target, (OpenTK.Graphics.OpenGL.AppleTextureRange)pname, (IntPtr)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "AppleTextureRange", Version = "1.2", EntryPoint = "glGetTexParameterPointervAPPLE")]
+            public static 
+            void GetTexParameterPointer<T2>(OpenTK.Graphics.OpenGL.AppleTextureRange target, OpenTK.Graphics.OpenGL.AppleTextureRange pname, [InAttribute, OutAttribute] T2[] @params)
                 where T2 : struct
             {
                 #if DEBUG
@@ -2382,7 +2372,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AppleTextureRange", Version = "1.2", EntryPoint = "glGetTexParameterPointervAPPLE")]
             public static 
-            void GetTexParameterPointer<T2>(OpenTK.Graphics.OpenGL.AppleTextureRange target, OpenTK.Graphics.OpenGL.AppleTextureRange pname, [InAttribute, OutAttribute] T2[] @params)
+            void GetTexParameterPointer<T2>(OpenTK.Graphics.OpenGL.AppleTextureRange target, OpenTK.Graphics.OpenGL.AppleTextureRange pname, [InAttribute, OutAttribute] T2[,,] @params)
                 where T2 : struct
             {
                 #if DEBUG
@@ -2405,13 +2395,23 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AppleTextureRange", Version = "1.2", EntryPoint = "glGetTexParameterPointervAPPLE")]
             public static 
-            void GetTexParameterPointer(OpenTK.Graphics.OpenGL.AppleTextureRange target, OpenTK.Graphics.OpenGL.AppleTextureRange pname, [OutAttribute] IntPtr @params)
+            void GetTexParameterPointer<T2>(OpenTK.Graphics.OpenGL.AppleTextureRange target, OpenTK.Graphics.OpenGL.AppleTextureRange pname, [InAttribute, OutAttribute] ref T2 @params)
+                where T2 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetTexParameterPointervAPPLE((OpenTK.Graphics.OpenGL.AppleTextureRange)target, (OpenTK.Graphics.OpenGL.AppleTextureRange)pname, (IntPtr)@params);
+                GCHandle @params_ptr = GCHandle.Alloc(@params, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetTexParameterPointervAPPLE((OpenTK.Graphics.OpenGL.AppleTextureRange)target, (OpenTK.Graphics.OpenGL.AppleTextureRange)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
+                    @params = (T2)@params_ptr.Target;
+                }
+                finally
+                {
+                    @params_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -2504,21 +2504,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AppleVertexProgramEvaluators", Version = "1.5", EntryPoint = "glMapVertexAttrib1dAPPLE")]
-            public static 
-            unsafe void MapVertexAttrib1(Int32 index, Int32 size, Double u1, Double u2, Int32 stride, Int32 order, Double* points)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMapVertexAttrib1dAPPLE((UInt32)index, (UInt32)size, (Double)u1, (Double)u2, (Int32)stride, (Int32)order, (Double*)points);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AppleVertexProgramEvaluators", Version = "1.5", EntryPoint = "glMapVertexAttrib1dAPPLE")]
             public static 
             void MapVertexAttrib1(Int32 index, Int32 size, Double u1, Double u2, Int32 stride, Int32 order, Double[] points)
@@ -2562,7 +2547,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AppleVertexProgramEvaluators", Version = "1.5", EntryPoint = "glMapVertexAttrib1dAPPLE")]
             public static 
-            unsafe void MapVertexAttrib1(UInt32 index, UInt32 size, Double u1, Double u2, Int32 stride, Int32 order, Double* points)
+            unsafe void MapVertexAttrib1(Int32 index, Int32 size, Double u1, Double u2, Int32 stride, Int32 order, Double* points)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -2616,6 +2601,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AppleVertexProgramEvaluators", Version = "1.5", EntryPoint = "glMapVertexAttrib1dAPPLE")]
+            public static 
+            unsafe void MapVertexAttrib1(UInt32 index, UInt32 size, Double u1, Double u2, Int32 stride, Int32 order, Double* points)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMapVertexAttrib1dAPPLE((UInt32)index, (UInt32)size, (Double)u1, (Double)u2, (Int32)stride, (Int32)order, (Double*)points);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "AppleVertexProgramEvaluators", Version = "1.5", EntryPoint = "glMapVertexAttrib1fAPPLE")]
+            public static 
+            void MapVertexAttrib1(Int32 index, Int32 size, Single u1, Single u2, Int32 stride, Int32 order, Single[] points)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* points_ptr = points)
+                    {
+                        Delegates.glMapVertexAttrib1fAPPLE((UInt32)index, (UInt32)size, (Single)u1, (Single)u2, (Int32)stride, (Int32)order, (Single*)points_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "AppleVertexProgramEvaluators", Version = "1.5", EntryPoint = "glMapVertexAttrib1fAPPLE")]
             public static 
             void MapVertexAttrib1(Int32 index, Int32 size, Single u1, Single u2, Int32 stride, Int32 order, ref Single points)
@@ -2651,9 +2671,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AppleVertexProgramEvaluators", Version = "1.5", EntryPoint = "glMapVertexAttrib1fAPPLE")]
             public static 
-            void MapVertexAttrib1(Int32 index, Int32 size, Single u1, Single u2, Int32 stride, Int32 order, Single[] points)
+            void MapVertexAttrib1(UInt32 index, UInt32 size, Single u1, Single u2, Int32 stride, Int32 order, Single[] points)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -2707,42 +2728,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AppleVertexProgramEvaluators", Version = "1.5", EntryPoint = "glMapVertexAttrib1fAPPLE")]
-            public static 
-            void MapVertexAttrib1(UInt32 index, UInt32 size, Single u1, Single u2, Int32 stride, Int32 order, Single[] points)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* points_ptr = points)
-                    {
-                        Delegates.glMapVertexAttrib1fAPPLE((UInt32)index, (UInt32)size, (Single)u1, (Single)u2, (Int32)stride, (Int32)order, (Single*)points_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AppleVertexProgramEvaluators", Version = "1.5", EntryPoint = "glMapVertexAttrib2dAPPLE")]
-            public static 
-            unsafe void MapVertexAttrib2(Int32 index, Int32 size, Double u1, Double u2, Int32 ustride, Int32 uorder, Double v1, Double v2, Int32 vstride, Int32 vorder, Double* points)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMapVertexAttrib2dAPPLE((UInt32)index, (UInt32)size, (Double)u1, (Double)u2, (Int32)ustride, (Int32)uorder, (Double)v1, (Double)v2, (Int32)vstride, (Int32)vorder, (Double*)points);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AppleVertexProgramEvaluators", Version = "1.5", EntryPoint = "glMapVertexAttrib2dAPPLE")]
             public static 
             void MapVertexAttrib2(Int32 index, Int32 size, Double u1, Double u2, Int32 ustride, Int32 uorder, Double v1, Double v2, Int32 vstride, Int32 vorder, Double[] points)
@@ -2786,7 +2771,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AppleVertexProgramEvaluators", Version = "1.5", EntryPoint = "glMapVertexAttrib2dAPPLE")]
             public static 
-            unsafe void MapVertexAttrib2(UInt32 index, UInt32 size, Double u1, Double u2, Int32 ustride, Int32 uorder, Double v1, Double v2, Int32 vstride, Int32 vorder, Double* points)
+            unsafe void MapVertexAttrib2(Int32 index, Int32 size, Double u1, Double u2, Int32 ustride, Int32 uorder, Double v1, Double v2, Int32 vstride, Int32 vorder, Double* points)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -2840,6 +2825,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AppleVertexProgramEvaluators", Version = "1.5", EntryPoint = "glMapVertexAttrib2dAPPLE")]
+            public static 
+            unsafe void MapVertexAttrib2(UInt32 index, UInt32 size, Double u1, Double u2, Int32 ustride, Int32 uorder, Double v1, Double v2, Int32 vstride, Int32 vorder, Double* points)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMapVertexAttrib2dAPPLE((UInt32)index, (UInt32)size, (Double)u1, (Double)u2, (Int32)ustride, (Int32)uorder, (Double)v1, (Double)v2, (Int32)vstride, (Int32)vorder, (Double*)points);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "AppleVertexProgramEvaluators", Version = "1.5", EntryPoint = "glMapVertexAttrib2fAPPLE")]
+            public static 
+            void MapVertexAttrib2(Int32 index, Int32 size, Single u1, Single u2, Int32 ustride, Int32 uorder, Single v1, Single v2, Int32 vstride, Int32 vorder, Single[] points)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* points_ptr = points)
+                    {
+                        Delegates.glMapVertexAttrib2fAPPLE((UInt32)index, (UInt32)size, (Single)u1, (Single)u2, (Int32)ustride, (Int32)uorder, (Single)v1, (Single)v2, (Int32)vstride, (Int32)vorder, (Single*)points_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "AppleVertexProgramEvaluators", Version = "1.5", EntryPoint = "glMapVertexAttrib2fAPPLE")]
             public static 
             void MapVertexAttrib2(Int32 index, Int32 size, Single u1, Single u2, Int32 ustride, Int32 uorder, Single v1, Single v2, Int32 vstride, Int32 vorder, ref Single points)
@@ -2875,9 +2895,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AppleVertexProgramEvaluators", Version = "1.5", EntryPoint = "glMapVertexAttrib2fAPPLE")]
             public static 
-            void MapVertexAttrib2(Int32 index, Int32 size, Single u1, Single u2, Int32 ustride, Int32 uorder, Single v1, Single v2, Int32 vstride, Int32 vorder, Single[] points)
+            void MapVertexAttrib2(UInt32 index, UInt32 size, Single u1, Single u2, Int32 ustride, Int32 uorder, Single v1, Single v2, Int32 vstride, Int32 vorder, Single[] points)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -2931,42 +2952,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AppleVertexProgramEvaluators", Version = "1.5", EntryPoint = "glMapVertexAttrib2fAPPLE")]
-            public static 
-            void MapVertexAttrib2(UInt32 index, UInt32 size, Single u1, Single u2, Int32 ustride, Int32 uorder, Single v1, Single v2, Int32 vstride, Int32 vorder, Single[] points)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* points_ptr = points)
-                    {
-                        Delegates.glMapVertexAttrib2fAPPLE((UInt32)index, (UInt32)size, (Single)u1, (Single)u2, (Int32)ustride, (Int32)uorder, (Single)v1, (Single)v2, (Int32)vstride, (Int32)vorder, (Single*)points_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AppleElementArray", Version = "1.2", EntryPoint = "glMultiDrawElementArrayAPPLE")]
-            public static 
-            unsafe void MultiDrawElementArray(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* first, Int32* count, Int32 primcount)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMultiDrawElementArrayAPPLE((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)first, (Int32*)count, (Int32)primcount);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AppleElementArray", Version = "1.2", EntryPoint = "glMultiDrawElementArrayAPPLE")]
             public static 
             void MultiDrawElementArray(OpenTK.Graphics.OpenGL.BeginMode mode, Int32[] first, Int32[] count, Int32 primcount)
@@ -3010,15 +2995,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AppleElementArray", Version = "1.2", EntryPoint = "glMultiDrawRangeElementArrayAPPLE")]
+            [AutoGenerated(Category = "AppleElementArray", Version = "1.2", EntryPoint = "glMultiDrawElementArrayAPPLE")]
             public static 
-            unsafe void MultiDrawRangeElementArray(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 start, Int32 end, Int32* first, Int32* count, Int32 primcount)
+            unsafe void MultiDrawElementArray(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* first, Int32* count, Int32 primcount)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glMultiDrawRangeElementArrayAPPLE((OpenTK.Graphics.OpenGL.BeginMode)mode, (UInt32)start, (UInt32)end, (Int32*)first, (Int32*)count, (Int32)primcount);
+                Delegates.glMultiDrawElementArrayAPPLE((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)first, (Int32*)count, (Int32)primcount);
                 #if DEBUG
                 }
                 #endif
@@ -3069,7 +3054,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AppleElementArray", Version = "1.2", EntryPoint = "glMultiDrawRangeElementArrayAPPLE")]
             public static 
-            unsafe void MultiDrawRangeElementArray(OpenTK.Graphics.OpenGL.BeginMode mode, UInt32 start, UInt32 end, Int32* first, Int32* count, Int32 primcount)
+            unsafe void MultiDrawRangeElementArray(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 start, Int32 end, Int32* first, Int32* count, Int32 primcount)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -3125,6 +3110,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AppleElementArray", Version = "1.2", EntryPoint = "glMultiDrawRangeElementArrayAPPLE")]
+            public static 
+            unsafe void MultiDrawRangeElementArray(OpenTK.Graphics.OpenGL.BeginMode mode, UInt32 start, UInt32 end, Int32* first, Int32* count, Int32 primcount)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMultiDrawRangeElementArrayAPPLE((OpenTK.Graphics.OpenGL.BeginMode)mode, (UInt32)start, (UInt32)end, (Int32*)first, (Int32*)count, (Int32)primcount);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "AppleObjectPurgeable", Version = "1.5", EntryPoint = "glObjectPurgeableAPPLE")]
             public static 
             System.IntPtr ObjectPurgeable(OpenTK.Graphics.OpenGL.AppleObjectPurgeable objectType, Int32 name, OpenTK.Graphics.OpenGL.AppleObjectPurgeable option)
@@ -3272,23 +3272,13 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AppleTextureRange", Version = "1.2", EntryPoint = "glTextureRangeAPPLE")]
             public static 
-            void TextureRange<T2>(OpenTK.Graphics.OpenGL.AppleTextureRange target, Int32 length, [InAttribute, OutAttribute] ref T2 pointer)
-                where T2 : struct
+            void TextureRange(OpenTK.Graphics.OpenGL.AppleTextureRange target, Int32 length, IntPtr pointer)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glTextureRangeAPPLE((OpenTK.Graphics.OpenGL.AppleTextureRange)target, (Int32)length, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                    pointer = (T2)pointer_ptr.Target;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
+                Delegates.glTextureRangeAPPLE((OpenTK.Graphics.OpenGL.AppleTextureRange)target, (Int32)length, (IntPtr)pointer);
                 #if DEBUG
                 }
                 #endif
@@ -3296,7 +3286,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AppleTextureRange", Version = "1.2", EntryPoint = "glTextureRangeAPPLE")]
             public static 
-            void TextureRange<T2>(OpenTK.Graphics.OpenGL.AppleTextureRange target, Int32 length, [InAttribute, OutAttribute] T2[,,] pointer)
+            void TextureRange<T2>(OpenTK.Graphics.OpenGL.AppleTextureRange target, Int32 length, [InAttribute, OutAttribute] T2[] pointer)
                 where T2 : struct
             {
                 #if DEBUG
@@ -3342,7 +3332,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AppleTextureRange", Version = "1.2", EntryPoint = "glTextureRangeAPPLE")]
             public static 
-            void TextureRange<T2>(OpenTK.Graphics.OpenGL.AppleTextureRange target, Int32 length, [InAttribute, OutAttribute] T2[] pointer)
+            void TextureRange<T2>(OpenTK.Graphics.OpenGL.AppleTextureRange target, Int32 length, [InAttribute, OutAttribute] T2[,,] pointer)
                 where T2 : struct
             {
                 #if DEBUG
@@ -3365,13 +3355,23 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AppleTextureRange", Version = "1.2", EntryPoint = "glTextureRangeAPPLE")]
             public static 
-            void TextureRange(OpenTK.Graphics.OpenGL.AppleTextureRange target, Int32 length, IntPtr pointer)
+            void TextureRange<T2>(OpenTK.Graphics.OpenGL.AppleTextureRange target, Int32 length, [InAttribute, OutAttribute] ref T2 pointer)
+                where T2 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glTextureRangeAPPLE((OpenTK.Graphics.OpenGL.AppleTextureRange)target, (Int32)length, (IntPtr)pointer);
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glTextureRangeAPPLE((OpenTK.Graphics.OpenGL.AppleTextureRange)target, (Int32)length, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    pointer = (T2)pointer_ptr.Target;
+                }
+                finally
+                {
+                    pointer_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -3393,23 +3393,13 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AppleVertexArrayRange", Version = "1.2", EntryPoint = "glVertexArrayRangeAPPLE")]
             public static 
-            void VertexArrayRange<T1>(Int32 length, [InAttribute, OutAttribute] ref T1 pointer)
-                where T1 : struct
+            void VertexArrayRange(Int32 length, [OutAttribute] IntPtr pointer)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glVertexArrayRangeAPPLE((Int32)length, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                    pointer = (T1)pointer_ptr.Target;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
+                Delegates.glVertexArrayRangeAPPLE((Int32)length, (IntPtr)pointer);
                 #if DEBUG
                 }
                 #endif
@@ -3417,7 +3407,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AppleVertexArrayRange", Version = "1.2", EntryPoint = "glVertexArrayRangeAPPLE")]
             public static 
-            void VertexArrayRange<T1>(Int32 length, [InAttribute, OutAttribute] T1[,,] pointer)
+            void VertexArrayRange<T1>(Int32 length, [InAttribute, OutAttribute] T1[] pointer)
                 where T1 : struct
             {
                 #if DEBUG
@@ -3463,7 +3453,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AppleVertexArrayRange", Version = "1.2", EntryPoint = "glVertexArrayRangeAPPLE")]
             public static 
-            void VertexArrayRange<T1>(Int32 length, [InAttribute, OutAttribute] T1[] pointer)
+            void VertexArrayRange<T1>(Int32 length, [InAttribute, OutAttribute] T1[,,] pointer)
                 where T1 : struct
             {
                 #if DEBUG
@@ -3486,13 +3476,23 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AppleVertexArrayRange", Version = "1.2", EntryPoint = "glVertexArrayRangeAPPLE")]
             public static 
-            void VertexArrayRange(Int32 length, [OutAttribute] IntPtr pointer)
+            void VertexArrayRange<T1>(Int32 length, [InAttribute, OutAttribute] ref T1 pointer)
+                where T1 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glVertexArrayRangeAPPLE((Int32)length, (IntPtr)pointer);
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glVertexArrayRangeAPPLE((Int32)length, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    pointer = (T1)pointer_ptr.Target;
+                }
+                finally
+                {
+                    pointer_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -3790,23 +3790,13 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glBufferDataARB")]
             public static 
-            void BufferData<T2>(OpenTK.Graphics.OpenGL.BufferTargetArb target, IntPtr size, [InAttribute, OutAttribute] ref T2 data, OpenTK.Graphics.OpenGL.BufferUsageArb usage)
-                where T2 : struct
+            void BufferData(OpenTK.Graphics.OpenGL.BufferTargetArb target, IntPtr size, IntPtr data, OpenTK.Graphics.OpenGL.BufferUsageArb usage)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glBufferDataARB((OpenTK.Graphics.OpenGL.BufferTargetArb)target, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject(), (OpenTK.Graphics.OpenGL.BufferUsageArb)usage);
-                    data = (T2)data_ptr.Target;
-                }
-                finally
-                {
-                    data_ptr.Free();
-                }
+                Delegates.glBufferDataARB((OpenTK.Graphics.OpenGL.BufferTargetArb)target, (IntPtr)size, (IntPtr)data, (OpenTK.Graphics.OpenGL.BufferUsageArb)usage);
                 #if DEBUG
                 }
                 #endif
@@ -3838,7 +3828,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glBufferDataARB")]
             public static 
-            void BufferData<T2>(OpenTK.Graphics.OpenGL.BufferTargetArb target, IntPtr size, [InAttribute, OutAttribute] T2[,,] data, OpenTK.Graphics.OpenGL.BufferUsageArb usage)
+            void BufferData<T2>(OpenTK.Graphics.OpenGL.BufferTargetArb target, IntPtr size, [InAttribute, OutAttribute] T2[] data, OpenTK.Graphics.OpenGL.BufferUsageArb usage)
                 where T2 : struct
             {
                 #if DEBUG
@@ -3932,7 +3922,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glBufferDataARB")]
             public static 
-            void BufferData<T2>(OpenTK.Graphics.OpenGL.BufferTargetArb target, IntPtr size, [InAttribute, OutAttribute] T2[] data, OpenTK.Graphics.OpenGL.BufferUsageArb usage)
+            void BufferData<T2>(OpenTK.Graphics.OpenGL.BufferTargetArb target, IntPtr size, [InAttribute, OutAttribute] T2[,,] data, OpenTK.Graphics.OpenGL.BufferUsageArb usage)
                 where T2 : struct
             {
                 #if DEBUG
@@ -3979,46 +3969,8 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glBufferDataARB")]
             public static 
-            void BufferData(OpenTK.Graphics.OpenGL.BufferTargetArb target, IntPtr size, IntPtr data, OpenTK.Graphics.OpenGL.BufferUsageArb usage)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glBufferDataARB((OpenTK.Graphics.OpenGL.BufferTargetArb)target, (IntPtr)size, (IntPtr)data, (OpenTK.Graphics.OpenGL.BufferUsageArb)usage);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Updates a subset of a buffer object's data store
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target buffer object. The symbolic constant must be GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, or GL_PIXEL_UNPACK_BUFFER.
-        /// </para>
-        /// </param>
-        /// <param name="offset">
-        /// <para>
-        /// Specifies the offset into the buffer object's data store where data replacement will begin, measured in bytes.
-        /// </para>
-        /// </param>
-        /// <param name="size">
-        /// <para>
-        /// Specifies the size in bytes of the data store region being replaced.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the new data that will be copied into the data store.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glBufferSubDataARB")]
-            public static 
-            void BufferSubData<T3>(OpenTK.Graphics.OpenGL.BufferTargetArb target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] ref T3 data)
-                where T3 : struct
+            void BufferData<T2>(OpenTK.Graphics.OpenGL.BufferTargetArb target, IntPtr size, [InAttribute, OutAttribute] ref T2 data, OpenTK.Graphics.OpenGL.BufferUsageArb usage)
+                where T2 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -4027,8 +3979,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glBufferSubDataARB((OpenTK.Graphics.OpenGL.BufferTargetArb)target, (IntPtr)offset, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject());
-                    data = (T3)data_ptr.Target;
+                    Delegates.glBufferDataARB((OpenTK.Graphics.OpenGL.BufferTargetArb)target, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject(), (OpenTK.Graphics.OpenGL.BufferUsageArb)usage);
+                    data = (T2)data_ptr.Target;
                 }
                 finally
                 {
@@ -4065,7 +4017,45 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glBufferSubDataARB")]
             public static 
-            void BufferSubData<T3>(OpenTK.Graphics.OpenGL.BufferTargetArb target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[,,] data)
+            void BufferSubData(OpenTK.Graphics.OpenGL.BufferTargetArb target, IntPtr offset, IntPtr size, IntPtr data)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glBufferSubDataARB((OpenTK.Graphics.OpenGL.BufferTargetArb)target, (IntPtr)offset, (IntPtr)size, (IntPtr)data);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Updates a subset of a buffer object's data store
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target buffer object. The symbolic constant must be GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, or GL_PIXEL_UNPACK_BUFFER.
+        /// </para>
+        /// </param>
+        /// <param name="offset">
+        /// <para>
+        /// Specifies the offset into the buffer object's data store where data replacement will begin, measured in bytes.
+        /// </para>
+        /// </param>
+        /// <param name="size">
+        /// <para>
+        /// Specifies the size in bytes of the data store region being replaced.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the new data that will be copied into the data store.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glBufferSubDataARB")]
+            public static 
+            void BufferSubData<T3>(OpenTK.Graphics.OpenGL.BufferTargetArb target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[] data)
                 where T3 : struct
             {
                 #if DEBUG
@@ -4159,7 +4149,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glBufferSubDataARB")]
             public static 
-            void BufferSubData<T3>(OpenTK.Graphics.OpenGL.BufferTargetArb target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[] data)
+            void BufferSubData<T3>(OpenTK.Graphics.OpenGL.BufferTargetArb target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[,,] data)
                 where T3 : struct
             {
                 #if DEBUG
@@ -4206,13 +4196,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glBufferSubDataARB")]
             public static 
-            void BufferSubData(OpenTK.Graphics.OpenGL.BufferTargetArb target, IntPtr offset, IntPtr size, IntPtr data)
+            void BufferSubData<T3>(OpenTK.Graphics.OpenGL.BufferTargetArb target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] ref T3 data)
+                where T3 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glBufferSubDataARB((OpenTK.Graphics.OpenGL.BufferTargetArb)target, (IntPtr)offset, (IntPtr)size, (IntPtr)data);
+                GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glBufferSubDataARB((OpenTK.Graphics.OpenGL.BufferTargetArb)target, (IntPtr)offset, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject());
+                    data = (T3)data_ptr.Target;
+                }
+                finally
+                {
+                    data_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -4343,23 +4343,13 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glCompressedTexImage1DARB")]
             public static 
-            void CompressedTexImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T6 data)
-                where T6 : struct
+            void CompressedTexImage1D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 border, Int32 imageSize, IntPtr data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glCompressedTexImage1DARB((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
-                    data = (T6)data_ptr.Target;
-                }
-                finally
-                {
-                    data_ptr.Free();
-                }
+                Delegates.glCompressedTexImage1DARB((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)border, (Int32)imageSize, (IntPtr)data);
                 #if DEBUG
                 }
                 #endif
@@ -4406,7 +4396,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glCompressedTexImage1DARB")]
             public static 
-            void CompressedTexImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T6[,,] data)
+            void CompressedTexImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T6[] data)
                 where T6 : struct
             {
                 #if DEBUG
@@ -4530,7 +4520,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glCompressedTexImage1DARB")]
             public static 
-            void CompressedTexImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T6[] data)
+            void CompressedTexImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T6[,,] data)
                 where T6 : struct
             {
                 #if DEBUG
@@ -4592,66 +4582,8 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glCompressedTexImage1DARB")]
             public static 
-            void CompressedTexImage1D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 border, Int32 imageSize, IntPtr data)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glCompressedTexImage1DARB((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)border, (Int32)imageSize, (IntPtr)data);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Specify a two-dimensional texture image in a compressed format
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target texture. Must be GL_TEXTURE_2D, GL_PROXY_TEXTURE_2D, GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, or GL_PROXY_TEXTURE_CUBE_MAP.
-        /// </para>
-        /// </param>
-        /// <param name="level">
-        /// <para>
-        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
-        /// </para>
-        /// </param>
-        /// <param name="internalformat">
-        /// <para>
-        /// Specifies the format of the compressed image data stored at address data.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// Specifies the width of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup n + 2 ( border ) for some integer . All implementations support 2D texture images that are at least 64 texels wide and cube-mapped texture images that are at least 16 texels wide.
-        /// </para>
-        /// </param>
-        /// <param name="height">
-        /// <para>
-        /// Specifies the height of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be Must be 2 sup n + 2 ( border ) for some integer . All implementations support 2D texture images that are at least 64 texels high and cube-mapped texture images that are at least 16 texels high.
-        /// </para>
-        /// </param>
-        /// <param name="border">
-        /// <para>
-        /// Specifies the width of the border. Must be either 0 or 1.
-        /// </para>
-        /// </param>
-        /// <param name="imageSize">
-        /// <para>
-        /// Specifies the number of unsigned bytes of image data starting at the address specified by data.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the compressed image data in memory.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glCompressedTexImage2DARB")]
-            public static 
-            void CompressedTexImage2D<T7>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T7 data)
-                where T7 : struct
+            void CompressedTexImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T6 data)
+                where T6 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -4660,8 +4592,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glCompressedTexImage2DARB((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
-                    data = (T7)data_ptr.Target;
+                    Delegates.glCompressedTexImage1DARB((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                    data = (T6)data_ptr.Target;
                 }
                 finally
                 {
@@ -4718,7 +4650,65 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glCompressedTexImage2DARB")]
             public static 
-            void CompressedTexImage2D<T7>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[,,] data)
+            void CompressedTexImage2D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, IntPtr data)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glCompressedTexImage2DARB((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)data);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Specify a two-dimensional texture image in a compressed format
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target texture. Must be GL_TEXTURE_2D, GL_PROXY_TEXTURE_2D, GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, or GL_PROXY_TEXTURE_CUBE_MAP.
+        /// </para>
+        /// </param>
+        /// <param name="level">
+        /// <para>
+        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
+        /// </para>
+        /// </param>
+        /// <param name="internalformat">
+        /// <para>
+        /// Specifies the format of the compressed image data stored at address data.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// Specifies the width of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup n + 2 ( border ) for some integer . All implementations support 2D texture images that are at least 64 texels wide and cube-mapped texture images that are at least 16 texels wide.
+        /// </para>
+        /// </param>
+        /// <param name="height">
+        /// <para>
+        /// Specifies the height of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be Must be 2 sup n + 2 ( border ) for some integer . All implementations support 2D texture images that are at least 64 texels high and cube-mapped texture images that are at least 16 texels high.
+        /// </para>
+        /// </param>
+        /// <param name="border">
+        /// <para>
+        /// Specifies the width of the border. Must be either 0 or 1.
+        /// </para>
+        /// </param>
+        /// <param name="imageSize">
+        /// <para>
+        /// Specifies the number of unsigned bytes of image data starting at the address specified by data.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the compressed image data in memory.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glCompressedTexImage2DARB")]
+            public static 
+            void CompressedTexImage2D<T7>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[] data)
                 where T7 : struct
             {
                 #if DEBUG
@@ -4852,7 +4842,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glCompressedTexImage2DARB")]
             public static 
-            void CompressedTexImage2D<T7>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[] data)
+            void CompressedTexImage2D<T7>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[,,] data)
                 where T7 : struct
             {
                 #if DEBUG
@@ -4919,71 +4909,8 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glCompressedTexImage2DARB")]
             public static 
-            void CompressedTexImage2D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, IntPtr data)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glCompressedTexImage2DARB((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)data);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Specify a three-dimensional texture image in a compressed format
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target texture. Must be GL_TEXTURE_3D or GL_PROXY_TEXTURE_3D.
-        /// </para>
-        /// </param>
-        /// <param name="level">
-        /// <para>
-        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
-        /// </para>
-        /// </param>
-        /// <param name="internalformat">
-        /// <para>
-        /// Specifies the format of the compressed image data stored at address data.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// Specifies the width of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup n + 2 ( border ) for some integer . All implementations support 3D texture images that are at least 16 texels wide.
-        /// </para>
-        /// </param>
-        /// <param name="height">
-        /// <para>
-        /// Specifies the height of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup n + 2 ( border ) for some integer . All implementations support 3D texture images that are at least 16 texels high.
-        /// </para>
-        /// </param>
-        /// <param name="depth">
-        /// <para>
-        /// Specifies the depth of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup n + 2 ( border ) for some integer . All implementations support 3D texture images that are at least 16 texels deep.
-        /// </para>
-        /// </param>
-        /// <param name="border">
-        /// <para>
-        /// Specifies the width of the border. Must be either 0 or 1.
-        /// </para>
-        /// </param>
-        /// <param name="imageSize">
-        /// <para>
-        /// Specifies the number of unsigned bytes of image data starting at the address specified by data.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the compressed image data in memory.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glCompressedTexImage3DARB")]
-            public static 
-            void CompressedTexImage3D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T8 data)
-                where T8 : struct
+            void CompressedTexImage2D<T7>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T7 data)
+                where T7 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -4992,8 +4919,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glCompressedTexImage3DARB((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
-                    data = (T8)data_ptr.Target;
+                    Delegates.glCompressedTexImage2DARB((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                    data = (T7)data_ptr.Target;
                 }
                 finally
                 {
@@ -5055,7 +4982,70 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glCompressedTexImage3DARB")]
             public static 
-            void CompressedTexImage3D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[,,] data)
+            void CompressedTexImage3D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, IntPtr data)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glCompressedTexImage3DARB((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)data);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Specify a three-dimensional texture image in a compressed format
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target texture. Must be GL_TEXTURE_3D or GL_PROXY_TEXTURE_3D.
+        /// </para>
+        /// </param>
+        /// <param name="level">
+        /// <para>
+        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
+        /// </para>
+        /// </param>
+        /// <param name="internalformat">
+        /// <para>
+        /// Specifies the format of the compressed image data stored at address data.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// Specifies the width of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup n + 2 ( border ) for some integer . All implementations support 3D texture images that are at least 16 texels wide.
+        /// </para>
+        /// </param>
+        /// <param name="height">
+        /// <para>
+        /// Specifies the height of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup n + 2 ( border ) for some integer . All implementations support 3D texture images that are at least 16 texels high.
+        /// </para>
+        /// </param>
+        /// <param name="depth">
+        /// <para>
+        /// Specifies the depth of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup n + 2 ( border ) for some integer . All implementations support 3D texture images that are at least 16 texels deep.
+        /// </para>
+        /// </param>
+        /// <param name="border">
+        /// <para>
+        /// Specifies the width of the border. Must be either 0 or 1.
+        /// </para>
+        /// </param>
+        /// <param name="imageSize">
+        /// <para>
+        /// Specifies the number of unsigned bytes of image data starting at the address specified by data.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the compressed image data in memory.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glCompressedTexImage3DARB")]
+            public static 
+            void CompressedTexImage3D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[] data)
                 where T8 : struct
             {
                 #if DEBUG
@@ -5199,7 +5189,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glCompressedTexImage3DARB")]
             public static 
-            void CompressedTexImage3D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[] data)
+            void CompressedTexImage3D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[,,] data)
                 where T8 : struct
             {
                 #if DEBUG
@@ -5271,61 +5261,8 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glCompressedTexImage3DARB")]
             public static 
-            void CompressedTexImage3D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, IntPtr data)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glCompressedTexImage3DARB((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)data);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Specify a one-dimensional texture subimage in a compressed format
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target texture. Must be GL_TEXTURE_1D.
-        /// </para>
-        /// </param>
-        /// <param name="level">
-        /// <para>
-        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
-        /// </para>
-        /// </param>
-        /// <param name="xoffset">
-        /// <para>
-        /// Specifies a texel offset in the x direction within the texture array.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// Specifies the width of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Specifies the format of the compressed image data stored at address data.
-        /// </para>
-        /// </param>
-        /// <param name="imageSize">
-        /// <para>
-        /// Specifies the number of unsigned bytes of image data starting at the address specified by data.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the compressed image data in memory.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glCompressedTexSubImage1DARB")]
-            public static 
-            void CompressedTexSubImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T6 data)
-                where T6 : struct
+            void CompressedTexImage3D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T8 data)
+                where T8 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -5334,8 +5271,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glCompressedTexSubImage1DARB((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
-                    data = (T6)data_ptr.Target;
+                    Delegates.glCompressedTexImage3DARB((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                    data = (T8)data_ptr.Target;
                 }
                 finally
                 {
@@ -5387,7 +5324,60 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glCompressedTexSubImage1DARB")]
             public static 
-            void CompressedTexSubImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T6[,,] data)
+            void CompressedTexSubImage1D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr data)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glCompressedTexSubImage1DARB((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)data);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Specify a one-dimensional texture subimage in a compressed format
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target texture. Must be GL_TEXTURE_1D.
+        /// </para>
+        /// </param>
+        /// <param name="level">
+        /// <para>
+        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
+        /// </para>
+        /// </param>
+        /// <param name="xoffset">
+        /// <para>
+        /// Specifies a texel offset in the x direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// Specifies the width of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Specifies the format of the compressed image data stored at address data.
+        /// </para>
+        /// </param>
+        /// <param name="imageSize">
+        /// <para>
+        /// Specifies the number of unsigned bytes of image data starting at the address specified by data.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the compressed image data in memory.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glCompressedTexSubImage1DARB")]
+            public static 
+            void CompressedTexSubImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T6[] data)
                 where T6 : struct
             {
                 #if DEBUG
@@ -5511,7 +5501,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glCompressedTexSubImage1DARB")]
             public static 
-            void CompressedTexSubImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T6[] data)
+            void CompressedTexSubImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T6[,,] data)
                 where T6 : struct
             {
                 #if DEBUG
@@ -5573,71 +5563,8 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glCompressedTexSubImage1DARB")]
             public static 
-            void CompressedTexSubImage1D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr data)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glCompressedTexSubImage1DARB((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)data);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Specify a two-dimensional texture subimage in a compressed format
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target texture. Must be GL_TEXTURE_2D, GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, or GL_TEXTURE_CUBE_MAP_NEGATIVE_Z.
-        /// </para>
-        /// </param>
-        /// <param name="level">
-        /// <para>
-        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
-        /// </para>
-        /// </param>
-        /// <param name="xoffset">
-        /// <para>
-        /// Specifies a texel offset in the x direction within the texture array.
-        /// </para>
-        /// </param>
-        /// <param name="yoffset">
-        /// <para>
-        /// Specifies a texel offset in the y direction within the texture array.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// Specifies the width of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="height">
-        /// <para>
-        /// Specifies the height of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Specifies the format of the compressed image data stored at address data.
-        /// </para>
-        /// </param>
-        /// <param name="imageSize">
-        /// <para>
-        /// Specifies the number of unsigned bytes of image data starting at the address specified by data.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the compressed image data in memory.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glCompressedTexSubImage2DARB")]
-            public static 
-            void CompressedTexSubImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T8 data)
-                where T8 : struct
+            void CompressedTexSubImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T6 data)
+                where T6 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -5646,8 +5573,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glCompressedTexSubImage2DARB((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
-                    data = (T8)data_ptr.Target;
+                    Delegates.glCompressedTexSubImage1DARB((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                    data = (T6)data_ptr.Target;
                 }
                 finally
                 {
@@ -5709,7 +5636,70 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glCompressedTexSubImage2DARB")]
             public static 
-            void CompressedTexSubImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T8[,,] data)
+            void CompressedTexSubImage2D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr data)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glCompressedTexSubImage2DARB((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)data);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Specify a two-dimensional texture subimage in a compressed format
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target texture. Must be GL_TEXTURE_2D, GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, or GL_TEXTURE_CUBE_MAP_NEGATIVE_Z.
+        /// </para>
+        /// </param>
+        /// <param name="level">
+        /// <para>
+        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
+        /// </para>
+        /// </param>
+        /// <param name="xoffset">
+        /// <para>
+        /// Specifies a texel offset in the x direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="yoffset">
+        /// <para>
+        /// Specifies a texel offset in the y direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// Specifies the width of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="height">
+        /// <para>
+        /// Specifies the height of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Specifies the format of the compressed image data stored at address data.
+        /// </para>
+        /// </param>
+        /// <param name="imageSize">
+        /// <para>
+        /// Specifies the number of unsigned bytes of image data starting at the address specified by data.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the compressed image data in memory.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glCompressedTexSubImage2DARB")]
+            public static 
+            void CompressedTexSubImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T8[] data)
                 where T8 : struct
             {
                 #if DEBUG
@@ -5853,7 +5843,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glCompressedTexSubImage2DARB")]
             public static 
-            void CompressedTexSubImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T8[] data)
+            void CompressedTexSubImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T8[,,] data)
                 where T8 : struct
             {
                 #if DEBUG
@@ -5925,76 +5915,8 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glCompressedTexSubImage2DARB")]
             public static 
-            void CompressedTexSubImage2D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr data)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glCompressedTexSubImage2DARB((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)data);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Specify a three-dimensional texture subimage in a compressed format
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target texture. Must be GL_TEXTURE_3D.
-        /// </para>
-        /// </param>
-        /// <param name="level">
-        /// <para>
-        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
-        /// </para>
-        /// </param>
-        /// <param name="xoffset">
-        /// <para>
-        /// Specifies a texel offset in the x direction within the texture array.
-        /// </para>
-        /// </param>
-        /// <param name="yoffset">
-        /// <para>
-        /// Specifies a texel offset in the y direction within the texture array.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// Specifies the width of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="height">
-        /// <para>
-        /// Specifies the height of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="depth">
-        /// <para>
-        /// Specifies the depth of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Specifies the format of the compressed image data stored at address data.
-        /// </para>
-        /// </param>
-        /// <param name="imageSize">
-        /// <para>
-        /// Specifies the number of unsigned bytes of image data starting at the address specified by data.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the compressed image data in memory.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glCompressedTexSubImage3DARB")]
-            public static 
-            void CompressedTexSubImage3D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T10 data)
-                where T10 : struct
+            void CompressedTexSubImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T8 data)
+                where T8 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -6003,8 +5925,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glCompressedTexSubImage3DARB((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
-                    data = (T10)data_ptr.Target;
+                    Delegates.glCompressedTexSubImage2DARB((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                    data = (T8)data_ptr.Target;
                 }
                 finally
                 {
@@ -6071,7 +5993,75 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glCompressedTexSubImage3DARB")]
             public static 
-            void CompressedTexSubImage3D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T10[,,] data)
+            void CompressedTexSubImage3D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr data)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glCompressedTexSubImage3DARB((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)data);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Specify a three-dimensional texture subimage in a compressed format
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target texture. Must be GL_TEXTURE_3D.
+        /// </para>
+        /// </param>
+        /// <param name="level">
+        /// <para>
+        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
+        /// </para>
+        /// </param>
+        /// <param name="xoffset">
+        /// <para>
+        /// Specifies a texel offset in the x direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="yoffset">
+        /// <para>
+        /// Specifies a texel offset in the y direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// Specifies the width of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="height">
+        /// <para>
+        /// Specifies the height of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="depth">
+        /// <para>
+        /// Specifies the depth of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Specifies the format of the compressed image data stored at address data.
+        /// </para>
+        /// </param>
+        /// <param name="imageSize">
+        /// <para>
+        /// Specifies the number of unsigned bytes of image data starting at the address specified by data.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the compressed image data in memory.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glCompressedTexSubImage3DARB")]
+            public static 
+            void CompressedTexSubImage3D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T10[] data)
                 where T10 : struct
             {
                 #if DEBUG
@@ -6225,7 +6215,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glCompressedTexSubImage3DARB")]
             public static 
-            void CompressedTexSubImage3D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T10[] data)
+            void CompressedTexSubImage3D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T10[,,] data)
                 where T10 : struct
             {
                 #if DEBUG
@@ -6302,13 +6292,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glCompressedTexSubImage3DARB")]
             public static 
-            void CompressedTexSubImage3D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr data)
+            void CompressedTexSubImage3D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T10 data)
+                where T10 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glCompressedTexSubImage3DARB((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)data);
+                GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glCompressedTexSubImage3DARB((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                    data = (T10)data_ptr.Target;
+                }
+                finally
+                {
+                    data_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -6357,35 +6357,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Delete named buffer objects
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of buffer objects to be deleted.
-        /// </para>
-        /// </param>
-        /// <param name="buffers">
-        /// <para>
-        /// Specifies an array of buffer objects to be deleted.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glDeleteBuffersARB")]
-            public static 
-            unsafe void DeleteBuffers(Int32 n, Int32* buffers)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glDeleteBuffersARB((Int32)n, (UInt32*)buffers);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Delete named buffer objects
         /// </summary>
@@ -6454,6 +6425,70 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Delete named buffer objects
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of buffer objects to be deleted.
+        /// </para>
+        /// </param>
+        /// <param name="buffers">
+        /// <para>
+        /// Specifies an array of buffer objects to be deleted.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glDeleteBuffersARB")]
+            public static 
+            unsafe void DeleteBuffers(Int32 n, Int32* buffers)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glDeleteBuffersARB((Int32)n, (UInt32*)buffers);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Delete named buffer objects
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of buffer objects to be deleted.
+        /// </para>
+        /// </param>
+        /// <param name="buffers">
+        /// <para>
+        /// Specifies an array of buffer objects to be deleted.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glDeleteBuffersARB")]
+            public static 
+            void DeleteBuffers(Int32 n, UInt32[] buffers)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* buffers_ptr = buffers)
+                    {
+                        Delegates.glDeleteBuffersARB((Int32)n, (UInt32*)buffers_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Delete named buffer objects
         /// </summary>
@@ -6517,41 +6552,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            
-        /// <summary>
-        /// Delete named buffer objects
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of buffer objects to be deleted.
-        /// </para>
-        /// </param>
-        /// <param name="buffers">
-        /// <para>
-        /// Specifies an array of buffer objects to be deleted.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glDeleteBuffersARB")]
-            public static 
-            void DeleteBuffers(Int32 n, UInt32[] buffers)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* buffers_ptr = buffers)
-                    {
-                        Delegates.glDeleteBuffersARB((Int32)n, (UInt32*)buffers_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glDeleteObjectARB")]
             public static 
             void DeleteObject(Int32 obj)
@@ -6582,30 +6582,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Deletes a program object
-        /// </summary>
-        /// <param name="program">
-        /// <para>
-        /// Specifies the program object to be deleted.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glDeleteProgramsARB")]
-            public static 
-            unsafe void DeleteProgram(Int32 n, Int32* programs)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glDeleteProgramsARB((Int32)n, (UInt32*)programs);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Deletes a program object
         /// </summary>
@@ -6675,37 +6651,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glDeleteProgramsARB")]
             public static 
-            void DeleteProgram(Int32 n, ref UInt32 programs)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* programs_ptr = &programs)
-                    {
-                        Delegates.glDeleteProgramsARB((Int32)n, (UInt32*)programs_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Deletes a program object
-        /// </summary>
-        /// <param name="program">
-        /// <para>
-        /// Specifies the program object to be deleted.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glDeleteProgramsARB")]
-            public static 
-            unsafe void DeleteProgram(Int32 n, UInt32* programs)
+            unsafe void DeleteProgram(Int32 n, Int32* programs)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -6749,28 +6695,53 @@ namespace OpenTK.Graphics.OpenGL
 
             
         /// <summary>
-        /// Delete named query objects
+        /// Deletes a program object
         /// </summary>
-        /// <param name="n">
+        /// <param name="program">
         /// <para>
-        /// Specifies the number of query objects to be deleted.
-        /// </para>
-        /// </param>
-        /// <param name="ids">
-        /// <para>
-        /// Specifies an array of query objects to be deleted.
+        /// Specifies the program object to be deleted.
         /// </para>
         /// </param>
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbOcclusionQuery", Version = "1.5", EntryPoint = "glDeleteQueriesARB")]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glDeleteProgramsARB")]
             public static 
-            unsafe void DeleteQueries(Int32 n, Int32* ids)
+            void DeleteProgram(Int32 n, ref UInt32 programs)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glDeleteQueriesARB((Int32)n, (UInt32*)ids);
+                unsafe
+                {
+                    fixed (UInt32* programs_ptr = &programs)
+                    {
+                        Delegates.glDeleteProgramsARB((Int32)n, (UInt32*)programs_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Deletes a program object
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// Specifies the program object to be deleted.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glDeleteProgramsARB")]
+            public static 
+            unsafe void DeleteProgram(Int32 n, UInt32* programs)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glDeleteProgramsARB((Int32)n, (UInt32*)programs);
                 #if DEBUG
                 }
                 #endif
@@ -6845,6 +6816,70 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Delete named query objects
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of query objects to be deleted.
+        /// </para>
+        /// </param>
+        /// <param name="ids">
+        /// <para>
+        /// Specifies an array of query objects to be deleted.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbOcclusionQuery", Version = "1.5", EntryPoint = "glDeleteQueriesARB")]
+            public static 
+            unsafe void DeleteQueries(Int32 n, Int32* ids)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glDeleteQueriesARB((Int32)n, (UInt32*)ids);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Delete named query objects
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of query objects to be deleted.
+        /// </para>
+        /// </param>
+        /// <param name="ids">
+        /// <para>
+        /// Specifies an array of query objects to be deleted.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbOcclusionQuery", Version = "1.5", EntryPoint = "glDeleteQueriesARB")]
+            public static 
+            void DeleteQueries(Int32 n, UInt32[] ids)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* ids_ptr = ids)
+                    {
+                        Delegates.glDeleteQueriesARB((Int32)n, (UInt32*)ids_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Delete named query objects
         /// </summary>
@@ -6908,41 +6943,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            
-        /// <summary>
-        /// Delete named query objects
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of query objects to be deleted.
-        /// </para>
-        /// </param>
-        /// <param name="ids">
-        /// <para>
-        /// Specifies an array of query objects to be deleted.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbOcclusionQuery", Version = "1.5", EntryPoint = "glDeleteQueriesARB")]
-            public static 
-            void DeleteQueries(Int32 n, UInt32[] ids)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* ids_ptr = ids)
-                    {
-                        Delegates.glDeleteQueriesARB((Int32)n, (UInt32*)ids_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glDetachObjectARB")]
             public static 
             void DetachObject(Int32 containerObj, Int32 attachedObj)
@@ -7016,35 +7016,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specifies a list of color buffers to be drawn into
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of buffers in bufs.
-        /// </para>
-        /// </param>
-        /// <param name="bufs">
-        /// <para>
-        /// Points to an array of symbolic constants specifying the buffers into which fragment colors or data values will be written.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbDrawBuffers", Version = "1.5", EntryPoint = "glDrawBuffersARB")]
-            public static 
-            unsafe void DrawBuffers(Int32 n, OpenTK.Graphics.OpenGL.ArbDrawBuffers* bufs)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glDrawBuffersARB((Int32)n, (OpenTK.Graphics.OpenGL.ArbDrawBuffers*)bufs);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specifies a list of color buffers to be drawn into
         /// </summary>
@@ -7112,25 +7083,30 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "ArbDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedARB")]
+            
+        /// <summary>
+        /// Specifies a list of color buffers to be drawn into
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of buffers in bufs.
+        /// </para>
+        /// </param>
+        /// <param name="bufs">
+        /// <para>
+        /// Points to an array of symbolic constants specifying the buffers into which fragment colors or data values will be written.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbDrawBuffers", Version = "1.5", EntryPoint = "glDrawBuffersARB")]
             public static 
-            void DrawElementsInstanced<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount)
-                where T3 : struct
+            unsafe void DrawBuffers(Int32 n, OpenTK.Graphics.OpenGL.ArbDrawBuffers* bufs)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glDrawElementsInstancedARB((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
-                    indices = (T3)indices_ptr.Target;
-                }
-                finally
-                {
-                    indices_ptr.Free();
-                }
+                Delegates.glDrawBuffersARB((Int32)n, (OpenTK.Graphics.OpenGL.ArbDrawBuffers*)bufs);
                 #if DEBUG
                 }
                 #endif
@@ -7138,7 +7114,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ArbDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedARB")]
             public static 
-            void DrawElementsInstanced<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount)
+            void DrawElementsInstanced(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glDrawElementsInstancedARB((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ArbDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedARB")]
+            public static 
+            void DrawElementsInstanced<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount)
                 where T3 : struct
             {
                 #if DEBUG
@@ -7184,7 +7174,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ArbDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedARB")]
             public static 
-            void DrawElementsInstanced<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount)
+            void DrawElementsInstanced<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount)
                 where T3 : struct
             {
                 #if DEBUG
@@ -7207,13 +7197,23 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ArbDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedARB")]
             public static 
-            void DrawElementsInstanced(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount)
+            void DrawElementsInstanced<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount)
+                where T3 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glDrawElementsInstancedARB((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount);
+                GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glDrawElementsInstancedARB((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
+                    indices = (T3)indices_ptr.Target;
+                }
+                finally
+                {
+                    indices_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -7368,35 +7368,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Generate buffer object names
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of buffer object names to be generated.
-        /// </para>
-        /// </param>
-        /// <param name="buffers">
-        /// <para>
-        /// Specifies an array in which the generated buffer object names are stored.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glGenBuffersARB")]
-            public static 
-            unsafe void GenBuffers(Int32 n, [OutAttribute] Int32* buffers)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGenBuffersARB((Int32)n, (UInt32*)buffers);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Generate buffer object names
         /// </summary>
@@ -7482,43 +7453,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glGenBuffersARB")]
             public static 
-            void GenBuffers(Int32 n, [OutAttribute] out UInt32 buffers)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* buffers_ptr = &buffers)
-                    {
-                        Delegates.glGenBuffersARB((Int32)n, (UInt32*)buffers_ptr);
-                        buffers = *buffers_ptr;
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Generate buffer object names
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of buffer object names to be generated.
-        /// </para>
-        /// </param>
-        /// <param name="buffers">
-        /// <para>
-        /// Specifies an array in which the generated buffer object names are stored.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glGenBuffersARB")]
-            public static 
-            unsafe void GenBuffers(Int32 n, [OutAttribute] UInt32* buffers)
+            unsafe void GenBuffers(Int32 n, [OutAttribute] Int32* buffers)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -7565,16 +7500,66 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            
+        /// <summary>
+        /// Generate buffer object names
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of buffer object names to be generated.
+        /// </para>
+        /// </param>
+        /// <param name="buffers">
+        /// <para>
+        /// Specifies an array in which the generated buffer object names are stored.
+        /// </para>
+        /// </param>
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGenProgramsARB")]
+            [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glGenBuffersARB")]
             public static 
-            unsafe void GenProgram(Int32 n, [OutAttribute] Int32* programs)
+            void GenBuffers(Int32 n, [OutAttribute] out UInt32 buffers)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGenProgramsARB((Int32)n, (UInt32*)programs);
+                unsafe
+                {
+                    fixed (UInt32* buffers_ptr = &buffers)
+                    {
+                        Delegates.glGenBuffersARB((Int32)n, (UInt32*)buffers_ptr);
+                        buffers = *buffers_ptr;
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Generate buffer object names
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of buffer object names to be generated.
+        /// </para>
+        /// </param>
+        /// <param name="buffers">
+        /// <para>
+        /// Specifies an array in which the generated buffer object names are stored.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glGenBuffersARB")]
+            public static 
+            unsafe void GenBuffers(Int32 n, [OutAttribute] UInt32* buffers)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGenBuffersARB((Int32)n, (UInt32*)buffers);
                 #if DEBUG
                 }
                 #endif
@@ -7624,29 +7609,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGenProgramsARB")]
             public static 
-            void GenProgram(Int32 n, [OutAttribute] out UInt32 programs)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* programs_ptr = &programs)
-                    {
-                        Delegates.glGenProgramsARB((Int32)n, (UInt32*)programs_ptr);
-                        programs = *programs_ptr;
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGenProgramsARB")]
-            public static 
-            unsafe void GenProgram(Int32 n, [OutAttribute] UInt32* programs)
+            unsafe void GenProgram(Int32 n, [OutAttribute] Int32* programs)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -7679,30 +7642,38 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            
-        /// <summary>
-        /// Generate query object names
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of query object names to be generated.
-        /// </para>
-        /// </param>
-        /// <param name="ids">
-        /// <para>
-        /// Specifies an array in which the generated query object names are stored.
-        /// </para>
-        /// </param>
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbOcclusionQuery", Version = "1.5", EntryPoint = "glGenQueriesARB")]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGenProgramsARB")]
             public static 
-            unsafe void GenQueries(Int32 n, [OutAttribute] Int32* ids)
+            void GenProgram(Int32 n, [OutAttribute] out UInt32 programs)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGenQueriesARB((Int32)n, (UInt32*)ids);
+                unsafe
+                {
+                    fixed (UInt32* programs_ptr = &programs)
+                    {
+                        Delegates.glGenProgramsARB((Int32)n, (UInt32*)programs_ptr);
+                        programs = *programs_ptr;
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGenProgramsARB")]
+            public static 
+            unsafe void GenProgram(Int32 n, [OutAttribute] UInt32* programs)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGenProgramsARB((Int32)n, (UInt32*)programs);
                 #if DEBUG
                 }
                 #endif
@@ -7794,43 +7765,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbOcclusionQuery", Version = "1.5", EntryPoint = "glGenQueriesARB")]
             public static 
-            void GenQueries(Int32 n, [OutAttribute] out UInt32 ids)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* ids_ptr = &ids)
-                    {
-                        Delegates.glGenQueriesARB((Int32)n, (UInt32*)ids_ptr);
-                        ids = *ids_ptr;
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Generate query object names
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of query object names to be generated.
-        /// </para>
-        /// </param>
-        /// <param name="ids">
-        /// <para>
-        /// Specifies an array in which the generated query object names are stored.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbOcclusionQuery", Version = "1.5", EntryPoint = "glGenQueriesARB")]
-            public static 
-            unsafe void GenQueries(Int32 n, [OutAttribute] UInt32* ids)
+            unsafe void GenQueries(Int32 n, [OutAttribute] Int32* ids)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -7879,53 +7814,64 @@ namespace OpenTK.Graphics.OpenGL
 
             
         /// <summary>
-        /// Returns information about an active attribute variable for the specified program object
+        /// Generate query object names
         /// </summary>
-        /// <param name="program">
+        /// <param name="n">
         /// <para>
-        /// Specifies the program object to be queried.
+        /// Specifies the number of query object names to be generated.
         /// </para>
         /// </param>
-        /// <param name="index">
+        /// <param name="ids">
         /// <para>
-        /// Specifies the index of the attribute variable to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="bufSize">
-        /// <para>
-        /// Specifies the maximum number of characters OpenGL is allowed to write in the character buffer indicated by name.
-        /// </para>
-        /// </param>
-        /// <param name="length">
-        /// <para>
-        /// Returns the number of characters actually written by OpenGL in the string indicated by name (excluding the null terminator) if a value other than NULL is passed.
-        /// </para>
-        /// </param>
-        /// <param name="size">
-        /// <para>
-        /// Returns the size of the attribute variable.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Returns the data type of the attribute variable.
-        /// </para>
-        /// </param>
-        /// <param name="name">
-        /// <para>
-        /// Returns a null terminated string containing the name of the attribute variable.
+        /// Specifies an array in which the generated query object names are stored.
         /// </para>
         /// </param>
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexShader", Version = "1.2", EntryPoint = "glGetActiveAttribARB")]
+            [AutoGenerated(Category = "ArbOcclusionQuery", Version = "1.5", EntryPoint = "glGenQueriesARB")]
             public static 
-            unsafe void GetActiveAttrib(Int32 programObj, Int32 index, Int32 maxLength, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ArbVertexShader* type, [OutAttribute] StringBuilder name)
+            void GenQueries(Int32 n, [OutAttribute] out UInt32 ids)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetActiveAttribARB((UInt32)programObj, (UInt32)index, (Int32)maxLength, (Int32*)length, (Int32*)size, (OpenTK.Graphics.OpenGL.ArbVertexShader*)type, (StringBuilder)name);
+                unsafe
+                {
+                    fixed (UInt32* ids_ptr = &ids)
+                    {
+                        Delegates.glGenQueriesARB((Int32)n, (UInt32*)ids_ptr);
+                        ids = *ids_ptr;
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Generate query object names
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of query object names to be generated.
+        /// </para>
+        /// </param>
+        /// <param name="ids">
+        /// <para>
+        /// Specifies an array in which the generated query object names are stored.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbOcclusionQuery", Version = "1.5", EntryPoint = "glGenQueriesARB")]
+            public static 
+            unsafe void GenQueries(Int32 n, [OutAttribute] UInt32* ids)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGenQueriesARB((Int32)n, (UInt32*)ids);
                 #if DEBUG
                 }
                 #endif
@@ -8037,7 +7983,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexShader", Version = "1.2", EntryPoint = "glGetActiveAttribARB")]
             public static 
-            unsafe void GetActiveAttrib(UInt32 programObj, UInt32 index, Int32 maxLength, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ArbVertexShader* type, [OutAttribute] StringBuilder name)
+            unsafe void GetActiveAttrib(Int32 programObj, Int32 index, Int32 maxLength, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ArbVertexShader* type, [OutAttribute] StringBuilder name)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -8116,7 +8062,7 @@ namespace OpenTK.Graphics.OpenGL
 
             
         /// <summary>
-        /// Returns information about an active uniform variable for the specified program object
+        /// Returns information about an active attribute variable for the specified program object
         /// </summary>
         /// <param name="program">
         /// <para>
@@ -8125,7 +8071,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         /// <param name="index">
         /// <para>
-        /// Specifies the index of the uniform variable to be queried.
+        /// Specifies the index of the attribute variable to be queried.
         /// </para>
         /// </param>
         /// <param name="bufSize">
@@ -8140,29 +8086,29 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         /// <param name="size">
         /// <para>
-        /// Returns the size of the uniform variable.
+        /// Returns the size of the attribute variable.
         /// </para>
         /// </param>
         /// <param name="type">
         /// <para>
-        /// Returns the data type of the uniform variable.
+        /// Returns the data type of the attribute variable.
         /// </para>
         /// </param>
         /// <param name="name">
         /// <para>
-        /// Returns a null terminated string containing the name of the uniform variable.
+        /// Returns a null terminated string containing the name of the attribute variable.
         /// </para>
         /// </param>
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetActiveUniformARB")]
+            [AutoGenerated(Category = "ArbVertexShader", Version = "1.2", EntryPoint = "glGetActiveAttribARB")]
             public static 
-            unsafe void GetActiveUniform(Int32 programObj, Int32 index, Int32 maxLength, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ArbShaderObjects* type, [OutAttribute] StringBuilder name)
+            unsafe void GetActiveAttrib(UInt32 programObj, UInt32 index, Int32 maxLength, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ArbVertexShader* type, [OutAttribute] StringBuilder name)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetActiveUniformARB((UInt32)programObj, (UInt32)index, (Int32)maxLength, (Int32*)length, (Int32*)size, (OpenTK.Graphics.OpenGL.ArbShaderObjects*)type, (StringBuilder)name);
+                Delegates.glGetActiveAttribARB((UInt32)programObj, (UInt32)index, (Int32)maxLength, (Int32*)length, (Int32*)size, (OpenTK.Graphics.OpenGL.ArbVertexShader*)type, (StringBuilder)name);
                 #if DEBUG
                 }
                 #endif
@@ -8274,7 +8220,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetActiveUniformARB")]
             public static 
-            unsafe void GetActiveUniform(UInt32 programObj, UInt32 index, Int32 maxLength, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ArbShaderObjects* type, [OutAttribute] StringBuilder name)
+            unsafe void GetActiveUniform(Int32 programObj, Int32 index, Int32 maxLength, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ArbShaderObjects* type, [OutAttribute] StringBuilder name)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -8351,34 +8297,55 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            
+        /// <summary>
+        /// Returns information about an active uniform variable for the specified program object
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// Specifies the program object to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the uniform variable to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="bufSize">
+        /// <para>
+        /// Specifies the maximum number of characters OpenGL is allowed to write in the character buffer indicated by name.
+        /// </para>
+        /// </param>
+        /// <param name="length">
+        /// <para>
+        /// Returns the number of characters actually written by OpenGL in the string indicated by name (excluding the null terminator) if a value other than NULL is passed.
+        /// </para>
+        /// </param>
+        /// <param name="size">
+        /// <para>
+        /// Returns the size of the uniform variable.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Returns the data type of the uniform variable.
+        /// </para>
+        /// </param>
+        /// <param name="name">
+        /// <para>
+        /// Returns a null terminated string containing the name of the uniform variable.
+        /// </para>
+        /// </param>
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetAttachedObjectsARB")]
+            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetActiveUniformARB")]
             public static 
-            unsafe void GetAttachedObjects(Int32 containerObj, Int32 maxCount, [OutAttribute] Int32* count, [OutAttribute] Int32* obj)
+            unsafe void GetActiveUniform(UInt32 programObj, UInt32 index, Int32 maxLength, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ArbShaderObjects* type, [OutAttribute] StringBuilder name)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetAttachedObjectsARB((UInt32)containerObj, (Int32)maxCount, (Int32*)count, (UInt32*)obj);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetAttachedObjectsARB")]
-            public static 
-            unsafe void GetAttachedObjects(Int32 containerObj, Int32 maxCount, [OutAttribute] Int32* count, [OutAttribute] Int32[] obj)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                fixed (Int32* obj_ptr = obj)
-                {
-                    Delegates.glGetAttachedObjectsARB((UInt32)containerObj, (Int32)maxCount, (Int32*)count, (UInt32*)obj_ptr);
-                }
+                Delegates.glGetActiveUniformARB((UInt32)programObj, (UInt32)index, (Int32)maxLength, (Int32*)length, (Int32*)size, (OpenTK.Graphics.OpenGL.ArbShaderObjects*)type, (StringBuilder)name);
                 #if DEBUG
                 }
                 #endif
@@ -8410,7 +8377,25 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetAttachedObjectsARB")]
             public static 
-            unsafe void GetAttachedObjects(UInt32 containerObj, Int32 maxCount, [OutAttribute] Int32* count, [OutAttribute] UInt32* obj)
+            unsafe void GetAttachedObjects(Int32 containerObj, Int32 maxCount, [OutAttribute] Int32* count, [OutAttribute] Int32[] obj)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                fixed (Int32* obj_ptr = obj)
+                {
+                    Delegates.glGetAttachedObjectsARB((UInt32)containerObj, (Int32)maxCount, (Int32*)count, (UInt32*)obj_ptr);
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetAttachedObjectsARB")]
+            public static 
+            unsafe void GetAttachedObjects(Int32 containerObj, Int32 maxCount, [OutAttribute] Int32* count, [OutAttribute] Int32* obj)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -8422,6 +8407,30 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetAttachedObjectsARB")]
+            public static 
+            void GetAttachedObjects(UInt32 containerObj, Int32 maxCount, [OutAttribute] out Int32 count, [OutAttribute] out UInt32 obj)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Int32* count_ptr = &count)
+                    fixed (UInt32* obj_ptr = &obj)
+                    {
+                        Delegates.glGetAttachedObjectsARB((UInt32)containerObj, (Int32)maxCount, (Int32*)count_ptr, (UInt32*)obj_ptr);
+                        count = *count_ptr;
+                        obj = *obj_ptr;
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetAttachedObjectsARB")]
             public static 
@@ -8443,22 +8452,13 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetAttachedObjectsARB")]
             public static 
-            void GetAttachedObjects(UInt32 containerObj, Int32 maxCount, [OutAttribute] out Int32 count, [OutAttribute] out UInt32 obj)
+            unsafe void GetAttachedObjects(UInt32 containerObj, Int32 maxCount, [OutAttribute] Int32* count, [OutAttribute] UInt32* obj)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                unsafe
-                {
-                    fixed (Int32* count_ptr = &count)
-                    fixed (UInt32* obj_ptr = &obj)
-                    {
-                        Delegates.glGetAttachedObjectsARB((UInt32)containerObj, (Int32)maxCount, (Int32*)count_ptr, (UInt32*)obj_ptr);
-                        count = *count_ptr;
-                        obj = *obj_ptr;
-                    }
-                }
+                Delegates.glGetAttachedObjectsARB((UInt32)containerObj, (Int32)maxCount, (Int32*)count, (UInt32*)obj);
                 #if DEBUG
                 }
                 #endif
@@ -8521,21 +8521,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glGetBufferParameterivARB")]
-            public static 
-            unsafe void GetBufferParameter(OpenTK.Graphics.OpenGL.ArbVertexBufferObject target, OpenTK.Graphics.OpenGL.BufferParameterNameArb pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetBufferParameterivARB((OpenTK.Graphics.OpenGL.ArbVertexBufferObject)target, (OpenTK.Graphics.OpenGL.BufferParameterNameArb)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glGetBufferParameterivARB")]
             public static 
             void GetBufferParameter(OpenTK.Graphics.OpenGL.ArbVertexBufferObject target, OpenTK.Graphics.OpenGL.BufferParameterNameArb pname, [OutAttribute] Int32[] @params)
@@ -8577,25 +8562,16 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glGetBufferPointervARB")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glGetBufferParameterivARB")]
             public static 
-            void GetBufferPointer<T2>(OpenTK.Graphics.OpenGL.ArbVertexBufferObject target, OpenTK.Graphics.OpenGL.BufferPointerNameArb pname, [InAttribute, OutAttribute] ref T2 @params)
-                where T2 : struct
+            unsafe void GetBufferParameter(OpenTK.Graphics.OpenGL.ArbVertexBufferObject target, OpenTK.Graphics.OpenGL.BufferParameterNameArb pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle @params_ptr = GCHandle.Alloc(@params, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetBufferPointervARB((OpenTK.Graphics.OpenGL.ArbVertexBufferObject)target, (OpenTK.Graphics.OpenGL.BufferPointerNameArb)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
-                    @params = (T2)@params_ptr.Target;
-                }
-                finally
-                {
-                    @params_ptr.Free();
-                }
+                Delegates.glGetBufferParameterivARB((OpenTK.Graphics.OpenGL.ArbVertexBufferObject)target, (OpenTK.Graphics.OpenGL.BufferParameterNameArb)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -8603,7 +8579,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glGetBufferPointervARB")]
             public static 
-            void GetBufferPointer<T2>(OpenTK.Graphics.OpenGL.ArbVertexBufferObject target, OpenTK.Graphics.OpenGL.BufferPointerNameArb pname, [InAttribute, OutAttribute] T2[,,] @params)
+            void GetBufferPointer(OpenTK.Graphics.OpenGL.ArbVertexBufferObject target, OpenTK.Graphics.OpenGL.BufferPointerNameArb pname, [OutAttribute] IntPtr @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetBufferPointervARB((OpenTK.Graphics.OpenGL.ArbVertexBufferObject)target, (OpenTK.Graphics.OpenGL.BufferPointerNameArb)pname, (IntPtr)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glGetBufferPointervARB")]
+            public static 
+            void GetBufferPointer<T2>(OpenTK.Graphics.OpenGL.ArbVertexBufferObject target, OpenTK.Graphics.OpenGL.BufferPointerNameArb pname, [InAttribute, OutAttribute] T2[] @params)
                 where T2 : struct
             {
                 #if DEBUG
@@ -8649,7 +8639,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glGetBufferPointervARB")]
             public static 
-            void GetBufferPointer<T2>(OpenTK.Graphics.OpenGL.ArbVertexBufferObject target, OpenTK.Graphics.OpenGL.BufferPointerNameArb pname, [InAttribute, OutAttribute] T2[] @params)
+            void GetBufferPointer<T2>(OpenTK.Graphics.OpenGL.ArbVertexBufferObject target, OpenTK.Graphics.OpenGL.BufferPointerNameArb pname, [InAttribute, OutAttribute] T2[,,] @params)
                 where T2 : struct
             {
                 #if DEBUG
@@ -8672,60 +8662,22 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glGetBufferPointervARB")]
             public static 
-            void GetBufferPointer(OpenTK.Graphics.OpenGL.ArbVertexBufferObject target, OpenTK.Graphics.OpenGL.BufferPointerNameArb pname, [OutAttribute] IntPtr @params)
+            void GetBufferPointer<T2>(OpenTK.Graphics.OpenGL.ArbVertexBufferObject target, OpenTK.Graphics.OpenGL.BufferPointerNameArb pname, [InAttribute, OutAttribute] ref T2 @params)
+                where T2 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetBufferPointervARB((OpenTK.Graphics.OpenGL.ArbVertexBufferObject)target, (OpenTK.Graphics.OpenGL.BufferPointerNameArb)pname, (IntPtr)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Returns a subset of a buffer object's data store
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target buffer object. The symbolic constant must be GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, or GL_PIXEL_UNPACK_BUFFER.
-        /// </para>
-        /// </param>
-        /// <param name="offset">
-        /// <para>
-        /// Specifies the offset into the buffer object's data store from which data will be returned, measured in bytes.
-        /// </para>
-        /// </param>
-        /// <param name="size">
-        /// <para>
-        /// Specifies the size in bytes of the data store region being returned.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the location where buffer object data is returned.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glGetBufferSubDataARB")]
-            public static 
-            void GetBufferSubData<T3>(OpenTK.Graphics.OpenGL.BufferTargetArb target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] ref T3 data)
-                where T3 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
+                GCHandle @params_ptr = GCHandle.Alloc(@params, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glGetBufferSubDataARB((OpenTK.Graphics.OpenGL.BufferTargetArb)target, (IntPtr)offset, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject());
-                    data = (T3)data_ptr.Target;
+                    Delegates.glGetBufferPointervARB((OpenTK.Graphics.OpenGL.ArbVertexBufferObject)target, (OpenTK.Graphics.OpenGL.BufferPointerNameArb)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
+                    @params = (T2)@params_ptr.Target;
                 }
                 finally
                 {
-                    data_ptr.Free();
+                    @params_ptr.Free();
                 }
                 #if DEBUG
                 }
@@ -8758,7 +8710,45 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glGetBufferSubDataARB")]
             public static 
-            void GetBufferSubData<T3>(OpenTK.Graphics.OpenGL.BufferTargetArb target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[,,] data)
+            void GetBufferSubData(OpenTK.Graphics.OpenGL.BufferTargetArb target, IntPtr offset, IntPtr size, [OutAttribute] IntPtr data)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetBufferSubDataARB((OpenTK.Graphics.OpenGL.BufferTargetArb)target, (IntPtr)offset, (IntPtr)size, (IntPtr)data);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Returns a subset of a buffer object's data store
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target buffer object. The symbolic constant must be GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, or GL_PIXEL_UNPACK_BUFFER.
+        /// </para>
+        /// </param>
+        /// <param name="offset">
+        /// <para>
+        /// Specifies the offset into the buffer object's data store from which data will be returned, measured in bytes.
+        /// </para>
+        /// </param>
+        /// <param name="size">
+        /// <para>
+        /// Specifies the size in bytes of the data store region being returned.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the location where buffer object data is returned.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glGetBufferSubDataARB")]
+            public static 
+            void GetBufferSubData<T3>(OpenTK.Graphics.OpenGL.BufferTargetArb target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[] data)
                 where T3 : struct
             {
                 #if DEBUG
@@ -8852,7 +8842,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glGetBufferSubDataARB")]
             public static 
-            void GetBufferSubData<T3>(OpenTK.Graphics.OpenGL.BufferTargetArb target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[] data)
+            void GetBufferSubData<T3>(OpenTK.Graphics.OpenGL.BufferTargetArb target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[,,] data)
                 where T3 : struct
             {
                 #if DEBUG
@@ -8899,55 +8889,22 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glGetBufferSubDataARB")]
             public static 
-            void GetBufferSubData(OpenTK.Graphics.OpenGL.BufferTargetArb target, IntPtr offset, IntPtr size, [OutAttribute] IntPtr data)
+            void GetBufferSubData<T3>(OpenTK.Graphics.OpenGL.BufferTargetArb target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] ref T3 data)
+                where T3 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetBufferSubDataARB((OpenTK.Graphics.OpenGL.BufferTargetArb)target, (IntPtr)offset, (IntPtr)size, (IntPtr)data);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Return a compressed texture image
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies which texture is to be obtained. GL_TEXTURE_1D, GL_TEXTURE_2D, and GL_TEXTURE_3D GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, and GL_TEXTURE_CUBE_MAP_NEGATIVE_Z are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="lod">
-        /// <para>
-        /// Specifies the level-of-detail number of the desired image. Level 0 is the base image level. Level is the th mipmap reduction image.
-        /// </para>
-        /// </param>
-        /// <param name="img">
-        /// <para>
-        /// Returns the compressed texture image.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glGetCompressedTexImageARB")]
-            public static 
-            void GetCompressedTexImage<T2>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, [InAttribute, OutAttribute] ref T2 img)
-                where T2 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle img_ptr = GCHandle.Alloc(img, GCHandleType.Pinned);
+                GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glGetCompressedTexImageARB((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (IntPtr)img_ptr.AddrOfPinnedObject());
-                    img = (T2)img_ptr.Target;
+                    Delegates.glGetBufferSubDataARB((OpenTK.Graphics.OpenGL.BufferTargetArb)target, (IntPtr)offset, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject());
+                    data = (T3)data_ptr.Target;
                 }
                 finally
                 {
-                    img_ptr.Free();
+                    data_ptr.Free();
                 }
                 #if DEBUG
                 }
@@ -8975,7 +8932,40 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glGetCompressedTexImageARB")]
             public static 
-            void GetCompressedTexImage<T2>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, [InAttribute, OutAttribute] T2[,,] img)
+            void GetCompressedTexImage(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, [OutAttribute] IntPtr img)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetCompressedTexImageARB((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (IntPtr)img);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Return a compressed texture image
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies which texture is to be obtained. GL_TEXTURE_1D, GL_TEXTURE_2D, and GL_TEXTURE_3D GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, and GL_TEXTURE_CUBE_MAP_NEGATIVE_Z are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="lod">
+        /// <para>
+        /// Specifies the level-of-detail number of the desired image. Level 0 is the base image level. Level is the th mipmap reduction image.
+        /// </para>
+        /// </param>
+        /// <param name="img">
+        /// <para>
+        /// Returns the compressed texture image.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glGetCompressedTexImageARB")]
+            public static 
+            void GetCompressedTexImage<T2>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, [InAttribute, OutAttribute] T2[] img)
                 where T2 : struct
             {
                 #if DEBUG
@@ -9059,7 +9049,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glGetCompressedTexImageARB")]
             public static 
-            void GetCompressedTexImage<T2>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, [InAttribute, OutAttribute] T2[] img)
+            void GetCompressedTexImage<T2>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, [InAttribute, OutAttribute] T2[,,] img)
                 where T2 : struct
             {
                 #if DEBUG
@@ -9101,13 +9091,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbTextureCompression", Version = "1.2", EntryPoint = "glGetCompressedTexImageARB")]
             public static 
-            void GetCompressedTexImage(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, [OutAttribute] IntPtr img)
+            void GetCompressedTexImage<T2>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, [InAttribute, OutAttribute] ref T2 img)
+                where T2 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetCompressedTexImageARB((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (IntPtr)img);
+                GCHandle img_ptr = GCHandle.Alloc(img, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetCompressedTexImageARB((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (IntPtr)img_ptr.AddrOfPinnedObject());
+                    img = (T2)img_ptr.Target;
+                }
+                finally
+                {
+                    img_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -9127,6 +9127,27 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetInfoLogARB")]
+            public static 
+            void GetInfoLog(Int32 obj, Int32 maxLength, [OutAttribute] out Int32 length, [OutAttribute] StringBuilder infoLog)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Int32* length_ptr = &length)
+                    {
+                        Delegates.glGetInfoLogARB((UInt32)obj, (Int32)maxLength, (Int32*)length_ptr, (StringBuilder)infoLog);
+                        length = *length_ptr;
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetInfoLogARB")]
             public static 
@@ -9142,9 +9163,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetInfoLogARB")]
             public static 
-            void GetInfoLog(Int32 obj, Int32 maxLength, [OutAttribute] out Int32 length, [OutAttribute] StringBuilder infoLog)
+            void GetInfoLog(UInt32 obj, Int32 maxLength, [OutAttribute] out Int32 length, [OutAttribute] StringBuilder infoLog)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -9178,10 +9200,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetInfoLogARB")]
+            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetObjectParameterfvARB")]
             public static 
-            void GetInfoLog(UInt32 obj, Int32 maxLength, [OutAttribute] out Int32 length, [OutAttribute] StringBuilder infoLog)
+            void GetObjectParameter(Int32 obj, OpenTK.Graphics.OpenGL.ArbShaderObjects pname, [OutAttribute] Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -9189,10 +9210,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
                 unsafe
                 {
-                    fixed (Int32* length_ptr = &length)
+                    fixed (Single* @params_ptr = @params)
                     {
-                        Delegates.glGetInfoLogARB((UInt32)obj, (Int32)maxLength, (Int32*)length_ptr, (StringBuilder)infoLog);
-                        length = *length_ptr;
+                        Delegates.glGetObjectParameterfvARB((UInt32)obj, (OpenTK.Graphics.OpenGL.ArbShaderObjects)pname, (Single*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -9236,9 +9256,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetObjectParameterfvARB")]
             public static 
-            void GetObjectParameter(Int32 obj, OpenTK.Graphics.OpenGL.ArbShaderObjects pname, [OutAttribute] Single[] @params)
+            void GetObjectParameter(UInt32 obj, OpenTK.Graphics.OpenGL.ArbShaderObjects pname, [OutAttribute] Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -9293,42 +9314,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetObjectParameterfvARB")]
-            public static 
-            void GetObjectParameter(UInt32 obj, OpenTK.Graphics.OpenGL.ArbShaderObjects pname, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetObjectParameterfvARB((UInt32)obj, (OpenTK.Graphics.OpenGL.ArbShaderObjects)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetObjectParameterivARB")]
-            public static 
-            unsafe void GetObjectParameter(Int32 obj, OpenTK.Graphics.OpenGL.ArbShaderObjects pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetObjectParameterivARB((UInt32)obj, (OpenTK.Graphics.OpenGL.ArbShaderObjects)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetObjectParameterivARB")]
             public static 
             void GetObjectParameter(Int32 obj, OpenTK.Graphics.OpenGL.ArbShaderObjects pname, [OutAttribute] Int32[] @params)
@@ -9373,7 +9358,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetObjectParameterivARB")]
             public static 
-            unsafe void GetObjectParameter(UInt32 obj, OpenTK.Graphics.OpenGL.ArbShaderObjects pname, [OutAttribute] Int32* @params)
+            unsafe void GetObjectParameter(Int32 obj, OpenTK.Graphics.OpenGL.ArbShaderObjects pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -9429,15 +9414,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetProgramEnvParameterdvARB")]
+            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetObjectParameterivARB")]
             public static 
-            unsafe void GetProgramEnvParameter(OpenTK.Graphics.OpenGL.ArbVertexProgram target, Int32 index, [OutAttribute] Double* @params)
+            unsafe void GetObjectParameter(UInt32 obj, OpenTK.Graphics.OpenGL.ArbShaderObjects pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetProgramEnvParameterdvARB((OpenTK.Graphics.OpenGL.ArbVertexProgram)target, (UInt32)index, (Double*)@params);
+                Delegates.glGetObjectParameterivARB((UInt32)obj, (OpenTK.Graphics.OpenGL.ArbShaderObjects)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -9487,7 +9472,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetProgramEnvParameterdvARB")]
             public static 
-            unsafe void GetProgramEnvParameter(OpenTK.Graphics.OpenGL.ArbVertexProgram target, UInt32 index, [OutAttribute] Double* @params)
+            unsafe void GetProgramEnvParameter(OpenTK.Graphics.OpenGL.ArbVertexProgram target, Int32 index, [OutAttribute] Double* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -9542,6 +9527,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetProgramEnvParameterdvARB")]
+            public static 
+            unsafe void GetProgramEnvParameter(OpenTK.Graphics.OpenGL.ArbVertexProgram target, UInt32 index, [OutAttribute] Double* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetProgramEnvParameterdvARB((OpenTK.Graphics.OpenGL.ArbVertexProgram)target, (UInt32)index, (Double*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetProgramEnvParameterfvARB")]
+            public static 
+            void GetProgramEnvParameter(OpenTK.Graphics.OpenGL.ArbVertexProgram target, Int32 index, [OutAttribute] Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glGetProgramEnvParameterfvARB((OpenTK.Graphics.OpenGL.ArbVertexProgram)target, (UInt32)index, (Single*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetProgramEnvParameterfvARB")]
             public static 
             void GetProgramEnvParameter(OpenTK.Graphics.OpenGL.ArbVertexProgram target, Int32 index, [OutAttribute] out Single @params)
@@ -9578,9 +9598,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetProgramEnvParameterfvARB")]
             public static 
-            void GetProgramEnvParameter(OpenTK.Graphics.OpenGL.ArbVertexProgram target, Int32 index, [OutAttribute] Single[] @params)
+            void GetProgramEnvParameter(OpenTK.Graphics.OpenGL.ArbVertexProgram target, UInt32 index, [OutAttribute] Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -9635,61 +9656,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetProgramEnvParameterfvARB")]
-            public static 
-            void GetProgramEnvParameter(OpenTK.Graphics.OpenGL.ArbVertexProgram target, UInt32 index, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetProgramEnvParameterfvARB((OpenTK.Graphics.OpenGL.ArbVertexProgram)target, (UInt32)index, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Returns a parameter from a program object
-        /// </summary>
-        /// <param name="program">
-        /// <para>
-        /// Specifies the program object to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the object parameter. Accepted symbolic names are GL_DELETE_STATUS, GL_LINK_STATUS, GL_VALIDATE_STATUS, GL_INFO_LOG_LENGTH, GL_ATTACHED_SHADERS, GL_ACTIVE_ATTRIBUTES, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, GL_ACTIVE_UNIFORMS, GL_ACTIVE_UNIFORM_MAX_LENGTH.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the requested object parameter.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetProgramivARB")]
-            public static 
-            unsafe void GetProgram(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetProgramivARB((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             
         /// <summary>
         /// Returns a parameter from a program object
@@ -9730,16 +9696,35 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            
+        /// <summary>
+        /// Returns a parameter from a program object
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// Specifies the program object to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the object parameter. Accepted symbolic names are GL_DELETE_STATUS, GL_LINK_STATUS, GL_VALIDATE_STATUS, GL_INFO_LOG_LENGTH, GL_ATTACHED_SHADERS, GL_ACTIVE_ATTRIBUTES, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, GL_ACTIVE_UNIFORMS, GL_ACTIVE_UNIFORM_MAX_LENGTH.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the requested object parameter.
+        /// </para>
+        /// </param>
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetProgramLocalParameterdvARB")]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetProgramivARB")]
             public static 
-            unsafe void GetProgramLocalParameter(OpenTK.Graphics.OpenGL.ArbVertexProgram target, Int32 index, [OutAttribute] Double* @params)
+            unsafe void GetProgram(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetProgramLocalParameterdvARB((OpenTK.Graphics.OpenGL.ArbVertexProgram)target, (UInt32)index, (Double*)@params);
+                Delegates.glGetProgramivARB((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -9789,7 +9774,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetProgramLocalParameterdvARB")]
             public static 
-            unsafe void GetProgramLocalParameter(OpenTK.Graphics.OpenGL.ArbVertexProgram target, UInt32 index, [OutAttribute] Double* @params)
+            unsafe void GetProgramLocalParameter(OpenTK.Graphics.OpenGL.ArbVertexProgram target, Int32 index, [OutAttribute] Double* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -9844,6 +9829,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetProgramLocalParameterdvARB")]
+            public static 
+            unsafe void GetProgramLocalParameter(OpenTK.Graphics.OpenGL.ArbVertexProgram target, UInt32 index, [OutAttribute] Double* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetProgramLocalParameterdvARB((OpenTK.Graphics.OpenGL.ArbVertexProgram)target, (UInt32)index, (Double*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetProgramLocalParameterfvARB")]
+            public static 
+            void GetProgramLocalParameter(OpenTK.Graphics.OpenGL.ArbVertexProgram target, Int32 index, [OutAttribute] Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glGetProgramLocalParameterfvARB((OpenTK.Graphics.OpenGL.ArbVertexProgram)target, (UInt32)index, (Single*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetProgramLocalParameterfvARB")]
             public static 
             void GetProgramLocalParameter(OpenTK.Graphics.OpenGL.ArbVertexProgram target, Int32 index, [OutAttribute] out Single @params)
@@ -9880,9 +9900,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetProgramLocalParameterfvARB")]
             public static 
-            void GetProgramLocalParameter(OpenTK.Graphics.OpenGL.ArbVertexProgram target, Int32 index, [OutAttribute] Single[] @params)
+            void GetProgramLocalParameter(OpenTK.Graphics.OpenGL.ArbVertexProgram target, UInt32 index, [OutAttribute] Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -9937,22 +9958,15 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetProgramLocalParameterfvARB")]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetProgramStringARB")]
             public static 
-            void GetProgramLocalParameter(OpenTK.Graphics.OpenGL.ArbVertexProgram target, UInt32 index, [OutAttribute] Single[] @params)
+            void GetProgramString(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, [OutAttribute] IntPtr @string)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetProgramLocalParameterfvARB((OpenTK.Graphics.OpenGL.ArbVertexProgram)target, (UInt32)index, (Single*)@params_ptr);
-                    }
-                }
+                Delegates.glGetProgramStringARB((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb)pname, (IntPtr)@string);
                 #if DEBUG
                 }
                 #endif
@@ -9960,31 +9974,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetProgramStringARB")]
             public static 
-            void GetProgramString<T2>(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, [InAttribute, OutAttribute] ref T2 @string)
-                where T2 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle @string_ptr = GCHandle.Alloc(@string, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetProgramStringARB((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb)pname, (IntPtr)@string_ptr.AddrOfPinnedObject());
-                    @string = (T2)@string_ptr.Target;
-                }
-                finally
-                {
-                    @string_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetProgramStringARB")]
-            public static 
-            void GetProgramString<T2>(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, [InAttribute, OutAttribute] T2[,,] @string)
+            void GetProgramString<T2>(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, [InAttribute, OutAttribute] T2[] @string)
                 where T2 : struct
             {
                 #if DEBUG
@@ -10030,7 +10020,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetProgramStringARB")]
             public static 
-            void GetProgramString<T2>(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, [InAttribute, OutAttribute] T2[] @string)
+            void GetProgramString<T2>(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, [InAttribute, OutAttribute] T2[,,] @string)
                 where T2 : struct
             {
                 #if DEBUG
@@ -10053,28 +10043,23 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetProgramStringARB")]
             public static 
-            void GetProgramString(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, [OutAttribute] IntPtr @string)
+            void GetProgramString<T2>(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, [InAttribute, OutAttribute] ref T2 @string)
+                where T2 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetProgramStringARB((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb)pname, (IntPtr)@string);
-                #if DEBUG
+                GCHandle @string_ptr = GCHandle.Alloc(@string, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetProgramStringARB((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb)pname, (IntPtr)@string_ptr.AddrOfPinnedObject());
+                    @string = (T2)@string_ptr.Target;
                 }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbOcclusionQuery", Version = "1.5", EntryPoint = "glGetQueryivARB")]
-            public static 
-            unsafe void GetQuery(OpenTK.Graphics.OpenGL.ArbOcclusionQuery target, OpenTK.Graphics.OpenGL.ArbOcclusionQuery pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                finally
                 {
-                #endif
-                Delegates.glGetQueryivARB((OpenTK.Graphics.OpenGL.ArbOcclusionQuery)target, (OpenTK.Graphics.OpenGL.ArbOcclusionQuery)pname, (Int32*)@params);
+                    @string_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -10121,35 +10106,16 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            
-        /// <summary>
-        /// Return parameters of a query object
-        /// </summary>
-        /// <param name="id">
-        /// <para>
-        /// Specifies the name of a query object.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the symbolic name of a query object parameter. Accepted values are GL_QUERY_RESULT or GL_QUERY_RESULT_AVAILABLE.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the requested data.
-        /// </para>
-        /// </param>
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbOcclusionQuery", Version = "1.5", EntryPoint = "glGetQueryObjectivARB")]
+            [AutoGenerated(Category = "ArbOcclusionQuery", Version = "1.5", EntryPoint = "glGetQueryivARB")]
             public static 
-            unsafe void GetQueryObject(Int32 id, OpenTK.Graphics.OpenGL.ArbOcclusionQuery pname, [OutAttribute] Int32* @params)
+            unsafe void GetQuery(OpenTK.Graphics.OpenGL.ArbOcclusionQuery target, OpenTK.Graphics.OpenGL.ArbOcclusionQuery pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetQueryObjectivARB((UInt32)id, (OpenTK.Graphics.OpenGL.ArbOcclusionQuery)pname, (Int32*)@params);
+                Delegates.glGetQueryivARB((OpenTK.Graphics.OpenGL.ArbOcclusionQuery)target, (OpenTK.Graphics.OpenGL.ArbOcclusionQuery)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -10256,7 +10222,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbOcclusionQuery", Version = "1.5", EntryPoint = "glGetQueryObjectivARB")]
             public static 
-            unsafe void GetQueryObject(UInt32 id, OpenTK.Graphics.OpenGL.ArbOcclusionQuery pname, [OutAttribute] Int32* @params)
+            unsafe void GetQueryObject(Int32 id, OpenTK.Graphics.OpenGL.ArbOcclusionQuery pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -10350,6 +10316,80 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Return parameters of a query object
+        /// </summary>
+        /// <param name="id">
+        /// <para>
+        /// Specifies the name of a query object.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the symbolic name of a query object parameter. Accepted values are GL_QUERY_RESULT or GL_QUERY_RESULT_AVAILABLE.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the requested data.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbOcclusionQuery", Version = "1.5", EntryPoint = "glGetQueryObjectivARB")]
+            public static 
+            unsafe void GetQueryObject(UInt32 id, OpenTK.Graphics.OpenGL.ArbOcclusionQuery pname, [OutAttribute] Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetQueryObjectivARB((UInt32)id, (OpenTK.Graphics.OpenGL.ArbOcclusionQuery)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Return parameters of a query object
+        /// </summary>
+        /// <param name="id">
+        /// <para>
+        /// Specifies the name of a query object.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the symbolic name of a query object parameter. Accepted values are GL_QUERY_RESULT or GL_QUERY_RESULT_AVAILABLE.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the requested data.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbOcclusionQuery", Version = "1.5", EntryPoint = "glGetQueryObjectuivARB")]
+            public static 
+            void GetQueryObject(UInt32 id, OpenTK.Graphics.OpenGL.ArbOcclusionQuery pname, [OutAttribute] UInt32[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* @params_ptr = @params)
+                    {
+                        Delegates.glGetQueryObjectuivARB((UInt32)id, (OpenTK.Graphics.OpenGL.ArbOcclusionQuery)pname, (UInt32*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Return parameters of a query object
         /// </summary>
@@ -10425,85 +10465,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Return parameters of a query object
-        /// </summary>
-        /// <param name="id">
-        /// <para>
-        /// Specifies the name of a query object.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the symbolic name of a query object parameter. Accepted values are GL_QUERY_RESULT or GL_QUERY_RESULT_AVAILABLE.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the requested data.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbOcclusionQuery", Version = "1.5", EntryPoint = "glGetQueryObjectuivARB")]
-            public static 
-            void GetQueryObject(UInt32 id, OpenTK.Graphics.OpenGL.ArbOcclusionQuery pname, [OutAttribute] UInt32[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* @params_ptr = @params)
-                    {
-                        Delegates.glGetQueryObjectuivARB((UInt32)id, (OpenTK.Graphics.OpenGL.ArbOcclusionQuery)pname, (UInt32*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Returns the source code string from a shader object
-        /// </summary>
-        /// <param name="shader">
-        /// <para>
-        /// Specifies the shader object to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="bufSize">
-        /// <para>
-        /// Specifies the size of the character buffer for storing the returned source code string.
-        /// </para>
-        /// </param>
-        /// <param name="length">
-        /// <para>
-        /// Returns the length of the string returned in source (excluding the null terminator).
-        /// </para>
-        /// </param>
-        /// <param name="source">
-        /// <para>
-        /// Specifies an array of characters that is used to return the source code string.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetShaderSourceARB")]
-            public static 
-            unsafe void GetShaderSource(Int32 obj, Int32 maxLength, [OutAttribute] Int32* length, [OutAttribute] StringBuilder source)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetShaderSourceARB((UInt32)obj, (Int32)maxLength, (Int32*)length, (StringBuilder)source);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Returns the source code string from a shader object
         /// </summary>
@@ -10575,7 +10536,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetShaderSourceARB")]
             public static 
-            unsafe void GetShaderSource(UInt32 obj, Int32 maxLength, [OutAttribute] Int32* length, [OutAttribute] StringBuilder source)
+            unsafe void GetShaderSource(Int32 obj, Int32 maxLength, [OutAttribute] Int32* length, [OutAttribute] StringBuilder source)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -10634,6 +10595,84 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Returns the source code string from a shader object
+        /// </summary>
+        /// <param name="shader">
+        /// <para>
+        /// Specifies the shader object to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="bufSize">
+        /// <para>
+        /// Specifies the size of the character buffer for storing the returned source code string.
+        /// </para>
+        /// </param>
+        /// <param name="length">
+        /// <para>
+        /// Returns the length of the string returned in source (excluding the null terminator).
+        /// </para>
+        /// </param>
+        /// <param name="source">
+        /// <para>
+        /// Specifies an array of characters that is used to return the source code string.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetShaderSourceARB")]
+            public static 
+            unsafe void GetShaderSource(UInt32 obj, Int32 maxLength, [OutAttribute] Int32* length, [OutAttribute] StringBuilder source)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetShaderSourceARB((UInt32)obj, (Int32)maxLength, (Int32*)length, (StringBuilder)source);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Returns the value of a uniform variable
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// Specifies the program object to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the value of the specified uniform variable.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetUniformfvARB")]
+            public static 
+            void GetUniform(Int32 programObj, Int32 location, [OutAttribute] Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glGetUniformfvARB((UInt32)programObj, (Int32)location, (Single*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Returns the value of a uniform variable
         /// </summary>
@@ -10726,9 +10765,10 @@ namespace OpenTK.Graphics.OpenGL
         /// Returns the value of the specified uniform variable.
         /// </para>
         /// </param>
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetUniformfvARB")]
             public static 
-            void GetUniform(Int32 programObj, Int32 location, [OutAttribute] Single[] @params)
+            void GetUniform(UInt32 programObj, Int32 location, [OutAttribute] Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -10822,80 +10862,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Returns the value of a uniform variable
-        /// </summary>
-        /// <param name="program">
-        /// <para>
-        /// Specifies the program object to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the value of the specified uniform variable.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetUniformfvARB")]
-            public static 
-            void GetUniform(UInt32 programObj, Int32 location, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetUniformfvARB((UInt32)programObj, (Int32)location, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Returns the value of a uniform variable
-        /// </summary>
-        /// <param name="program">
-        /// <para>
-        /// Specifies the program object to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the value of the specified uniform variable.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetUniformivARB")]
-            public static 
-            unsafe void GetUniform(Int32 programObj, Int32 location, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetUniformivARB((UInt32)programObj, (Int32)location, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Returns the value of a uniform variable
         /// </summary>
@@ -10996,7 +10962,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetUniformivARB")]
             public static 
-            unsafe void GetUniform(UInt32 programObj, Int32 location, [OutAttribute] Int32* @params)
+            unsafe void GetUniform(Int32 programObj, Int32 location, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -11090,6 +11056,40 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Returns the value of a uniform variable
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// Specifies the program object to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the value of the specified uniform variable.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glGetUniformivARB")]
+            public static 
+            unsafe void GetUniform(UInt32 programObj, Int32 location, [OutAttribute] Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetUniformivARB((UInt32)programObj, (Int32)location, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Returns the location of a uniform variable
         /// </summary>
@@ -11147,40 +11147,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Return a generic vertex attribute parameter
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the generic vertex attribute parameter to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the symbolic name of the vertex attribute parameter to be queried. Accepted values are GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, GL_VERTEX_ATTRIB_ARRAY_ENABLED, GL_VERTEX_ATTRIB_ARRAY_SIZE, GL_VERTEX_ATTRIB_ARRAY_STRIDE, GL_VERTEX_ATTRIB_ARRAY_TYPE, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, or GL_CURRENT_VERTEX_ATTRIB.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the requested data.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetVertexAttribdvARB")]
-            public static 
-            unsafe void GetVertexAttrib(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribParameterArb pname, [OutAttribute] Double* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetVertexAttribdvARB((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribParameterArb)pname, (Double*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Return a generic vertex attribute parameter
         /// </summary>
@@ -11281,7 +11247,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetVertexAttribdvARB")]
             public static 
-            unsafe void GetVertexAttrib(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribParameterArb pname, [OutAttribute] Double* @params)
+            unsafe void GetVertexAttrib(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribParameterArb pname, [OutAttribute] Double* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -11375,6 +11341,79 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Return a generic vertex attribute parameter
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the generic vertex attribute parameter to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the symbolic name of the vertex attribute parameter to be queried. Accepted values are GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, GL_VERTEX_ATTRIB_ARRAY_ENABLED, GL_VERTEX_ATTRIB_ARRAY_SIZE, GL_VERTEX_ATTRIB_ARRAY_STRIDE, GL_VERTEX_ATTRIB_ARRAY_TYPE, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, or GL_CURRENT_VERTEX_ATTRIB.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the requested data.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetVertexAttribdvARB")]
+            public static 
+            unsafe void GetVertexAttrib(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribParameterArb pname, [OutAttribute] Double* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetVertexAttribdvARB((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribParameterArb)pname, (Double*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Return a generic vertex attribute parameter
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the generic vertex attribute parameter to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the symbolic name of the vertex attribute parameter to be queried. Accepted values are GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, GL_VERTEX_ATTRIB_ARRAY_ENABLED, GL_VERTEX_ATTRIB_ARRAY_SIZE, GL_VERTEX_ATTRIB_ARRAY_STRIDE, GL_VERTEX_ATTRIB_ARRAY_TYPE, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, or GL_CURRENT_VERTEX_ATTRIB.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the requested data.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetVertexAttribfvARB")]
+            public static 
+            void GetVertexAttrib(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribParameterArb pname, [OutAttribute] Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glGetVertexAttribfvARB((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribParameterArb)pname, (Single*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Return a generic vertex attribute parameter
         /// </summary>
@@ -11467,9 +11506,10 @@ namespace OpenTK.Graphics.OpenGL
         /// Returns the requested data.
         /// </para>
         /// </param>
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetVertexAttribfvARB")]
             public static 
-            void GetVertexAttrib(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribParameterArb pname, [OutAttribute] Single[] @params)
+            void GetVertexAttrib(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribParameterArb pname, [OutAttribute] Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -11563,80 +11603,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Return a generic vertex attribute parameter
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the generic vertex attribute parameter to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the symbolic name of the vertex attribute parameter to be queried. Accepted values are GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, GL_VERTEX_ATTRIB_ARRAY_ENABLED, GL_VERTEX_ATTRIB_ARRAY_SIZE, GL_VERTEX_ATTRIB_ARRAY_STRIDE, GL_VERTEX_ATTRIB_ARRAY_TYPE, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, or GL_CURRENT_VERTEX_ATTRIB.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the requested data.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetVertexAttribfvARB")]
-            public static 
-            void GetVertexAttrib(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribParameterArb pname, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetVertexAttribfvARB((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribParameterArb)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Return a generic vertex attribute parameter
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the generic vertex attribute parameter to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the symbolic name of the vertex attribute parameter to be queried. Accepted values are GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, GL_VERTEX_ATTRIB_ARRAY_ENABLED, GL_VERTEX_ATTRIB_ARRAY_SIZE, GL_VERTEX_ATTRIB_ARRAY_STRIDE, GL_VERTEX_ATTRIB_ARRAY_TYPE, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, or GL_CURRENT_VERTEX_ATTRIB.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the requested data.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetVertexAttribivARB")]
-            public static 
-            unsafe void GetVertexAttrib(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribParameterArb pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetVertexAttribivARB((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribParameterArb)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Return a generic vertex attribute parameter
         /// </summary>
@@ -11737,7 +11703,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetVertexAttribivARB")]
             public static 
-            unsafe void GetVertexAttrib(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribParameterArb pname, [OutAttribute] Int32* @params)
+            unsafe void GetVertexAttrib(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribParameterArb pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -11830,25 +11796,35 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetVertexAttribPointervARB")]
+            
+        /// <summary>
+        /// Return a generic vertex attribute parameter
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the generic vertex attribute parameter to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the symbolic name of the vertex attribute parameter to be queried. Accepted values are GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, GL_VERTEX_ATTRIB_ARRAY_ENABLED, GL_VERTEX_ATTRIB_ARRAY_SIZE, GL_VERTEX_ATTRIB_ARRAY_STRIDE, GL_VERTEX_ATTRIB_ARRAY_TYPE, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, or GL_CURRENT_VERTEX_ATTRIB.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the requested data.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetVertexAttribivARB")]
             public static 
-            void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameterArb pname, [InAttribute, OutAttribute] ref T2 pointer)
-                where T2 : struct
+            unsafe void GetVertexAttrib(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribParameterArb pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetVertexAttribPointervARB((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerParameterArb)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                    pointer = (T2)pointer_ptr.Target;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
+                Delegates.glGetVertexAttribivARB((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribParameterArb)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -11856,7 +11832,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetVertexAttribPointervARB")]
             public static 
-            void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameterArb pname, [InAttribute, OutAttribute] T2[,,] pointer)
+            void GetVertexAttribPointer(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameterArb pname, [OutAttribute] IntPtr pointer)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetVertexAttribPointervARB((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerParameterArb)pname, (IntPtr)pointer);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetVertexAttribPointervARB")]
+            public static 
+            void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameterArb pname, [InAttribute, OutAttribute] T2[] pointer)
                 where T2 : struct
             {
                 #if DEBUG
@@ -11902,7 +11892,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetVertexAttribPointervARB")]
             public static 
-            void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameterArb pname, [InAttribute, OutAttribute] T2[] pointer)
+            void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameterArb pname, [InAttribute, OutAttribute] T2[,,] pointer)
                 where T2 : struct
             {
                 #if DEBUG
@@ -11925,22 +11915,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetVertexAttribPointervARB")]
             public static 
-            void GetVertexAttribPointer(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameterArb pname, [OutAttribute] IntPtr pointer)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetVertexAttribPointervARB((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerParameterArb)pname, (IntPtr)pointer);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetVertexAttribPointervARB")]
-            public static 
-            void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameterArb pname, [InAttribute, OutAttribute] ref T2 pointer)
+            void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameterArb pname, [InAttribute, OutAttribute] ref T2 pointer)
                 where T2 : struct
             {
                 #if DEBUG
@@ -11965,7 +11940,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetVertexAttribPointervARB")]
             public static 
-            void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameterArb pname, [InAttribute, OutAttribute] T2[,,] pointer)
+            void GetVertexAttribPointer(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameterArb pname, [OutAttribute] IntPtr pointer)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetVertexAttribPointervARB((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerParameterArb)pname, (IntPtr)pointer);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetVertexAttribPointervARB")]
+            public static 
+            void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameterArb pname, [InAttribute, OutAttribute] T2[] pointer)
                 where T2 : struct
             {
                 #if DEBUG
@@ -12013,7 +12003,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetVertexAttribPointervARB")]
             public static 
-            void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameterArb pname, [InAttribute, OutAttribute] T2[] pointer)
+            void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameterArb pname, [InAttribute, OutAttribute] T2[,,] pointer)
                 where T2 : struct
             {
                 #if DEBUG
@@ -12037,13 +12027,23 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glGetVertexAttribPointervARB")]
             public static 
-            void GetVertexAttribPointer(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameterArb pname, [OutAttribute] IntPtr pointer)
+            void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameterArb pname, [InAttribute, OutAttribute] ref T2 pointer)
+                where T2 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetVertexAttribPointervARB((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerParameterArb)pname, (IntPtr)pointer);
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetVertexAttribPointervARB((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerParameterArb)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    pointer = (T2)pointer_ptr.Target;
+                }
+                finally
+                {
+                    pointer_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -12238,30 +12238,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Replace the current matrix with the specified row-major ordered matrix
-        /// </summary>
-        /// <param name="m">
-        /// <para>
-        /// Specifies a pointer to 16 consecutive values, which are used as the elements of a 4 times 4 row-major matrix.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbTransposeMatrix", Version = "1.2", EntryPoint = "glLoadTransposeMatrixdARB")]
-            public static 
-            unsafe void LoadTransposeMatrix(Double* m)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glLoadTransposeMatrixdARB((Double*)m);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Replace the current matrix with the specified row-major ordered matrix
         /// </summary>
@@ -12320,6 +12296,59 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Replace the current matrix with the specified row-major ordered matrix
+        /// </summary>
+        /// <param name="m">
+        /// <para>
+        /// Specifies a pointer to 16 consecutive values, which are used as the elements of a 4 times 4 row-major matrix.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbTransposeMatrix", Version = "1.2", EntryPoint = "glLoadTransposeMatrixdARB")]
+            public static 
+            unsafe void LoadTransposeMatrix(Double* m)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glLoadTransposeMatrixdARB((Double*)m);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Replace the current matrix with the specified row-major ordered matrix
+        /// </summary>
+        /// <param name="m">
+        /// <para>
+        /// Specifies a pointer to 16 consecutive values, which are used as the elements of a 4 times 4 row-major matrix.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ArbTransposeMatrix", Version = "1.2", EntryPoint = "glLoadTransposeMatrixfARB")]
+            public static 
+            void LoadTransposeMatrix(Single[] m)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* m_ptr = m)
+                    {
+                        Delegates.glLoadTransposeMatrixfARB((Single*)m_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Replace the current matrix with the specified row-major ordered matrix
         /// </summary>
@@ -12373,35 +12402,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Replace the current matrix with the specified row-major ordered matrix
-        /// </summary>
-        /// <param name="m">
-        /// <para>
-        /// Specifies a pointer to 16 consecutive values, which are used as the elements of a 4 times 4 row-major matrix.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ArbTransposeMatrix", Version = "1.2", EntryPoint = "glLoadTransposeMatrixfARB")]
-            public static 
-            void LoadTransposeMatrix(Single[] m)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* m_ptr = m)
-                    {
-                        Delegates.glLoadTransposeMatrixfARB((Single*)m_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Map a buffer object's data store
         /// </summary>
@@ -12432,23 +12432,13 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ArbMatrixPalette", Version = "1.1", EntryPoint = "glMatrixIndexPointerARB")]
             public static 
-            void MatrixIndexPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ArbMatrixPalette type, Int32 stride, [InAttribute, OutAttribute] ref T3 pointer)
-                where T3 : struct
+            void MatrixIndexPointer(Int32 size, OpenTK.Graphics.OpenGL.ArbMatrixPalette type, Int32 stride, IntPtr pointer)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glMatrixIndexPointerARB((Int32)size, (OpenTK.Graphics.OpenGL.ArbMatrixPalette)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                    pointer = (T3)pointer_ptr.Target;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
+                Delegates.glMatrixIndexPointerARB((Int32)size, (OpenTK.Graphics.OpenGL.ArbMatrixPalette)type, (Int32)stride, (IntPtr)pointer);
                 #if DEBUG
                 }
                 #endif
@@ -12456,7 +12446,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ArbMatrixPalette", Version = "1.1", EntryPoint = "glMatrixIndexPointerARB")]
             public static 
-            void MatrixIndexPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ArbMatrixPalette type, Int32 stride, [InAttribute, OutAttribute] T3[,,] pointer)
+            void MatrixIndexPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ArbMatrixPalette type, Int32 stride, [InAttribute, OutAttribute] T3[] pointer)
                 where T3 : struct
             {
                 #if DEBUG
@@ -12502,7 +12492,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ArbMatrixPalette", Version = "1.1", EntryPoint = "glMatrixIndexPointerARB")]
             public static 
-            void MatrixIndexPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ArbMatrixPalette type, Int32 stride, [InAttribute, OutAttribute] T3[] pointer)
+            void MatrixIndexPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ArbMatrixPalette type, Int32 stride, [InAttribute, OutAttribute] T3[,,] pointer)
                 where T3 : struct
             {
                 #if DEBUG
@@ -12525,28 +12515,23 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ArbMatrixPalette", Version = "1.1", EntryPoint = "glMatrixIndexPointerARB")]
             public static 
-            void MatrixIndexPointer(Int32 size, OpenTK.Graphics.OpenGL.ArbMatrixPalette type, Int32 stride, IntPtr pointer)
+            void MatrixIndexPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ArbMatrixPalette type, Int32 stride, [InAttribute, OutAttribute] ref T3 pointer)
+                where T3 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glMatrixIndexPointerARB((Int32)size, (OpenTK.Graphics.OpenGL.ArbMatrixPalette)type, (Int32)stride, (IntPtr)pointer);
-                #if DEBUG
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glMatrixIndexPointerARB((Int32)size, (OpenTK.Graphics.OpenGL.ArbMatrixPalette)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    pointer = (T3)pointer_ptr.Target;
                 }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbMatrixPalette", Version = "1.1", EntryPoint = "glMatrixIndexubvARB")]
-            public static 
-            unsafe void MatrixIndex(Int32 size, Byte* indices)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                finally
                 {
-                #endif
-                Delegates.glMatrixIndexubvARB((Int32)size, (Byte*)indices);
+                    pointer_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -12593,15 +12578,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbMatrixPalette", Version = "1.1", EntryPoint = "glMatrixIndexuivARB")]
+            [AutoGenerated(Category = "ArbMatrixPalette", Version = "1.1", EntryPoint = "glMatrixIndexubvARB")]
             public static 
-            unsafe void MatrixIndex(Int32 size, Int32* indices)
+            unsafe void MatrixIndex(Int32 size, Byte* indices)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glMatrixIndexuivARB((Int32)size, (UInt32*)indices);
+                Delegates.glMatrixIndexubvARB((Int32)size, (Byte*)indices);
                 #if DEBUG
                 }
                 #endif
@@ -12650,28 +12635,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbMatrixPalette", Version = "1.1", EntryPoint = "glMatrixIndexuivARB")]
             public static 
-            void MatrixIndex(Int32 size, ref UInt32 indices)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* indices_ptr = &indices)
-                    {
-                        Delegates.glMatrixIndexuivARB((Int32)size, (UInt32*)indices_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbMatrixPalette", Version = "1.1", EntryPoint = "glMatrixIndexuivARB")]
-            public static 
-            unsafe void MatrixIndex(Int32 size, UInt32* indices)
+            unsafe void MatrixIndex(Int32 size, Int32* indices)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -12705,15 +12669,36 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbMatrixPalette", Version = "1.1", EntryPoint = "glMatrixIndexusvARB")]
+            [AutoGenerated(Category = "ArbMatrixPalette", Version = "1.1", EntryPoint = "glMatrixIndexuivARB")]
             public static 
-            unsafe void MatrixIndex(Int32 size, Int16* indices)
+            void MatrixIndex(Int32 size, ref UInt32 indices)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glMatrixIndexusvARB((Int32)size, (UInt16*)indices);
+                unsafe
+                {
+                    fixed (UInt32* indices_ptr = &indices)
+                    {
+                        Delegates.glMatrixIndexuivARB((Int32)size, (UInt32*)indices_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbMatrixPalette", Version = "1.1", EntryPoint = "glMatrixIndexuivARB")]
+            public static 
+            unsafe void MatrixIndex(Int32 size, UInt32* indices)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMatrixIndexuivARB((Int32)size, (UInt32*)indices);
                 #if DEBUG
                 }
                 #endif
@@ -12759,6 +12744,42 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbMatrixPalette", Version = "1.1", EntryPoint = "glMatrixIndexusvARB")]
+            public static 
+            unsafe void MatrixIndex(Int32 size, Int16* indices)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMatrixIndexusvARB((Int32)size, (UInt16*)indices);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbMatrixPalette", Version = "1.1", EntryPoint = "glMatrixIndexusvARB")]
+            public static 
+            void MatrixIndex(Int32 size, UInt16[] indices)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt16* indices_ptr = indices)
+                    {
+                        Delegates.glMatrixIndexusvARB((Int32)size, (UInt16*)indices_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbMatrixPalette", Version = "1.1", EntryPoint = "glMatrixIndexusvARB")]
             public static 
@@ -12795,27 +12816,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbMatrixPalette", Version = "1.1", EntryPoint = "glMatrixIndexusvARB")]
-            public static 
-            void MatrixIndex(Int32 size, UInt16[] indices)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt16* indices_ptr = indices)
-                    {
-                        Delegates.glMatrixIndexusvARB((Int32)size, (UInt16*)indices_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             
         /// <summary>
         /// Set the current texture coordinates
@@ -13073,35 +13073,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Set the current texture coordinates
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the texture unit whose coordinates should be modified. The number of texture units is implementation dependent, but must be at least two. Symbolic constant must be one of GL_TEXTURE, where i ranges from 0 to GL_MAX_TEXTURE_COORDS - 1, which is an implementation-dependent value.
-        /// </para>
-        /// </param>
-        /// <param name="s">
-        /// <para>
-        /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord2dvARB")]
-            public static 
-            unsafe void MultiTexCoord2(OpenTK.Graphics.OpenGL.TextureUnit target, Double* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMultiTexCoord2dvARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Double*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -13170,6 +13141,35 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Set the current texture coordinates
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the texture unit whose coordinates should be modified. The number of texture units is implementation dependent, but must be at least two. Symbolic constant must be one of GL_TEXTURE, where i ranges from 0 to GL_MAX_TEXTURE_COORDS - 1, which is an implementation-dependent value.
+        /// </para>
+        /// </param>
+        /// <param name="s">
+        /// <para>
+        /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord2dvARB")]
+            public static 
+            unsafe void MultiTexCoord2(OpenTK.Graphics.OpenGL.TextureUnit target, Double* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMultiTexCoord2dvARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Double*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -13198,6 +13198,40 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Set the current texture coordinates
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the texture unit whose coordinates should be modified. The number of texture units is implementation dependent, but must be at least two. Symbolic constant must be one of GL_TEXTURE, where i ranges from 0 to GL_MAX_TEXTURE_COORDS - 1, which is an implementation-dependent value.
+        /// </para>
+        /// </param>
+        /// <param name="s">
+        /// <para>
+        /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord2fvARB")]
+            public static 
+            void MultiTexCoord2(OpenTK.Graphics.OpenGL.TextureUnit target, Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glMultiTexCoord2fvARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -13261,40 +13295,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Set the current texture coordinates
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the texture unit whose coordinates should be modified. The number of texture units is implementation dependent, but must be at least two. Symbolic constant must be one of GL_TEXTURE, where i ranges from 0 to GL_MAX_TEXTURE_COORDS - 1, which is an implementation-dependent value.
-        /// </para>
-        /// </param>
-        /// <param name="s">
-        /// <para>
-        /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord2fvARB")]
-            public static 
-            void MultiTexCoord2(OpenTK.Graphics.OpenGL.TextureUnit target, Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glMultiTexCoord2fvARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -13323,35 +13323,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Set the current texture coordinates
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the texture unit whose coordinates should be modified. The number of texture units is implementation dependent, but must be at least two. Symbolic constant must be one of GL_TEXTURE, where i ranges from 0 to GL_MAX_TEXTURE_COORDS - 1, which is an implementation-dependent value.
-        /// </para>
-        /// </param>
-        /// <param name="s">
-        /// <para>
-        /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord2ivARB")]
-            public static 
-            unsafe void MultiTexCoord2(OpenTK.Graphics.OpenGL.TextureUnit target, Int32* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMultiTexCoord2ivARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int32*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -13433,15 +13404,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord2sARB")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord2ivARB")]
             public static 
-            void MultiTexCoord2(OpenTK.Graphics.OpenGL.TextureUnit target, Int16 s, Int16 t)
+            unsafe void MultiTexCoord2(OpenTK.Graphics.OpenGL.TextureUnit target, Int32* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glMultiTexCoord2sARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int16)s, (Int16)t);
+                Delegates.glMultiTexCoord2ivARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int32*)v);
                 #if DEBUG
                 }
                 #endif
@@ -13461,16 +13433,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord2svARB")]
+            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord2sARB")]
             public static 
-            unsafe void MultiTexCoord2(OpenTK.Graphics.OpenGL.TextureUnit target, Int16* v)
+            void MultiTexCoord2(OpenTK.Graphics.OpenGL.TextureUnit target, Int16 s, Int16 t)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glMultiTexCoord2svARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int16*)v);
+                Delegates.glMultiTexCoord2sARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int16)s, (Int16)t);
                 #if DEBUG
                 }
                 #endif
@@ -13558,15 +13529,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord3dARB")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord2svARB")]
             public static 
-            void MultiTexCoord3(OpenTK.Graphics.OpenGL.TextureUnit target, Double s, Double t, Double r)
+            unsafe void MultiTexCoord2(OpenTK.Graphics.OpenGL.TextureUnit target, Int16* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glMultiTexCoord3dARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Double)s, (Double)t, (Double)r);
+                Delegates.glMultiTexCoord2svARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int16*)v);
                 #if DEBUG
                 }
                 #endif
@@ -13586,16 +13558,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord3dvARB")]
+            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord3dARB")]
             public static 
-            unsafe void MultiTexCoord3(OpenTK.Graphics.OpenGL.TextureUnit target, Double* v)
+            void MultiTexCoord3(OpenTK.Graphics.OpenGL.TextureUnit target, Double s, Double t, Double r)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glMultiTexCoord3dvARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Double*)v);
+                Delegates.glMultiTexCoord3dARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Double)s, (Double)t, (Double)r);
                 #if DEBUG
                 }
                 #endif
@@ -13670,6 +13641,35 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Set the current texture coordinates
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the texture unit whose coordinates should be modified. The number of texture units is implementation dependent, but must be at least two. Symbolic constant must be one of GL_TEXTURE, where i ranges from 0 to GL_MAX_TEXTURE_COORDS - 1, which is an implementation-dependent value.
+        /// </para>
+        /// </param>
+        /// <param name="s">
+        /// <para>
+        /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord3dvARB")]
+            public static 
+            unsafe void MultiTexCoord3(OpenTK.Graphics.OpenGL.TextureUnit target, Double* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMultiTexCoord3dvARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Double*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -13698,6 +13698,40 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Set the current texture coordinates
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the texture unit whose coordinates should be modified. The number of texture units is implementation dependent, but must be at least two. Symbolic constant must be one of GL_TEXTURE, where i ranges from 0 to GL_MAX_TEXTURE_COORDS - 1, which is an implementation-dependent value.
+        /// </para>
+        /// </param>
+        /// <param name="s">
+        /// <para>
+        /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord3fvARB")]
+            public static 
+            void MultiTexCoord3(OpenTK.Graphics.OpenGL.TextureUnit target, Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glMultiTexCoord3fvARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -13761,40 +13795,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Set the current texture coordinates
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the texture unit whose coordinates should be modified. The number of texture units is implementation dependent, but must be at least two. Symbolic constant must be one of GL_TEXTURE, where i ranges from 0 to GL_MAX_TEXTURE_COORDS - 1, which is an implementation-dependent value.
-        /// </para>
-        /// </param>
-        /// <param name="s">
-        /// <para>
-        /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord3fvARB")]
-            public static 
-            void MultiTexCoord3(OpenTK.Graphics.OpenGL.TextureUnit target, Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glMultiTexCoord3fvARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -13823,35 +13823,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Set the current texture coordinates
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the texture unit whose coordinates should be modified. The number of texture units is implementation dependent, but must be at least two. Symbolic constant must be one of GL_TEXTURE, where i ranges from 0 to GL_MAX_TEXTURE_COORDS - 1, which is an implementation-dependent value.
-        /// </para>
-        /// </param>
-        /// <param name="s">
-        /// <para>
-        /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord3ivARB")]
-            public static 
-            unsafe void MultiTexCoord3(OpenTK.Graphics.OpenGL.TextureUnit target, Int32* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMultiTexCoord3ivARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int32*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -13933,15 +13904,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord3sARB")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord3ivARB")]
             public static 
-            void MultiTexCoord3(OpenTK.Graphics.OpenGL.TextureUnit target, Int16 s, Int16 t, Int16 r)
+            unsafe void MultiTexCoord3(OpenTK.Graphics.OpenGL.TextureUnit target, Int32* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glMultiTexCoord3sARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int16)s, (Int16)t, (Int16)r);
+                Delegates.glMultiTexCoord3ivARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int32*)v);
                 #if DEBUG
                 }
                 #endif
@@ -13961,16 +13933,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord3svARB")]
+            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord3sARB")]
             public static 
-            unsafe void MultiTexCoord3(OpenTK.Graphics.OpenGL.TextureUnit target, Int16* v)
+            void MultiTexCoord3(OpenTK.Graphics.OpenGL.TextureUnit target, Int16 s, Int16 t, Int16 r)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glMultiTexCoord3svARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int16*)v);
+                Delegates.glMultiTexCoord3sARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int16)s, (Int16)t, (Int16)r);
                 #if DEBUG
                 }
                 #endif
@@ -14058,15 +14029,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord4dARB")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord3svARB")]
             public static 
-            void MultiTexCoord4(OpenTK.Graphics.OpenGL.TextureUnit target, Double s, Double t, Double r, Double q)
+            unsafe void MultiTexCoord3(OpenTK.Graphics.OpenGL.TextureUnit target, Int16* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glMultiTexCoord4dARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Double)s, (Double)t, (Double)r, (Double)q);
+                Delegates.glMultiTexCoord3svARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int16*)v);
                 #if DEBUG
                 }
                 #endif
@@ -14086,16 +14058,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord4dvARB")]
+            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord4dARB")]
             public static 
-            unsafe void MultiTexCoord4(OpenTK.Graphics.OpenGL.TextureUnit target, Double* v)
+            void MultiTexCoord4(OpenTK.Graphics.OpenGL.TextureUnit target, Double s, Double t, Double r, Double q)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glMultiTexCoord4dvARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Double*)v);
+                Delegates.glMultiTexCoord4dARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Double)s, (Double)t, (Double)r, (Double)q);
                 #if DEBUG
                 }
                 #endif
@@ -14170,6 +14141,35 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Set the current texture coordinates
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the texture unit whose coordinates should be modified. The number of texture units is implementation dependent, but must be at least two. Symbolic constant must be one of GL_TEXTURE, where i ranges from 0 to GL_MAX_TEXTURE_COORDS - 1, which is an implementation-dependent value.
+        /// </para>
+        /// </param>
+        /// <param name="s">
+        /// <para>
+        /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord4dvARB")]
+            public static 
+            unsafe void MultiTexCoord4(OpenTK.Graphics.OpenGL.TextureUnit target, Double* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMultiTexCoord4dvARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Double*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -14198,6 +14198,40 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Set the current texture coordinates
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the texture unit whose coordinates should be modified. The number of texture units is implementation dependent, but must be at least two. Symbolic constant must be one of GL_TEXTURE, where i ranges from 0 to GL_MAX_TEXTURE_COORDS - 1, which is an implementation-dependent value.
+        /// </para>
+        /// </param>
+        /// <param name="s">
+        /// <para>
+        /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord4fvARB")]
+            public static 
+            void MultiTexCoord4(OpenTK.Graphics.OpenGL.TextureUnit target, Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glMultiTexCoord4fvARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -14261,40 +14295,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Set the current texture coordinates
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the texture unit whose coordinates should be modified. The number of texture units is implementation dependent, but must be at least two. Symbolic constant must be one of GL_TEXTURE, where i ranges from 0 to GL_MAX_TEXTURE_COORDS - 1, which is an implementation-dependent value.
-        /// </para>
-        /// </param>
-        /// <param name="s">
-        /// <para>
-        /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord4fvARB")]
-            public static 
-            void MultiTexCoord4(OpenTK.Graphics.OpenGL.TextureUnit target, Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glMultiTexCoord4fvARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -14323,35 +14323,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Set the current texture coordinates
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the texture unit whose coordinates should be modified. The number of texture units is implementation dependent, but must be at least two. Symbolic constant must be one of GL_TEXTURE, where i ranges from 0 to GL_MAX_TEXTURE_COORDS - 1, which is an implementation-dependent value.
-        /// </para>
-        /// </param>
-        /// <param name="s">
-        /// <para>
-        /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord4ivARB")]
-            public static 
-            unsafe void MultiTexCoord4(OpenTK.Graphics.OpenGL.TextureUnit target, Int32* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMultiTexCoord4ivARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int32*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -14433,15 +14404,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord4sARB")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord4ivARB")]
             public static 
-            void MultiTexCoord4(OpenTK.Graphics.OpenGL.TextureUnit target, Int16 s, Int16 t, Int16 r, Int16 q)
+            unsafe void MultiTexCoord4(OpenTK.Graphics.OpenGL.TextureUnit target, Int32* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glMultiTexCoord4sARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int16)s, (Int16)t, (Int16)r, (Int16)q);
+                Delegates.glMultiTexCoord4ivARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int32*)v);
                 #if DEBUG
                 }
                 #endif
@@ -14461,16 +14433,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord4svARB")]
+            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord4sARB")]
             public static 
-            unsafe void MultiTexCoord4(OpenTK.Graphics.OpenGL.TextureUnit target, Int16* v)
+            void MultiTexCoord4(OpenTK.Graphics.OpenGL.TextureUnit target, Int16 s, Int16 t, Int16 r, Int16 q)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glMultiTexCoord4svARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int16*)v);
+                Delegates.glMultiTexCoord4sARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int16)s, (Int16)t, (Int16)r, (Int16)q);
                 #if DEBUG
                 }
                 #endif
@@ -14546,23 +14517,28 @@ namespace OpenTK.Graphics.OpenGL
 
             
         /// <summary>
-        /// Multiply the current matrix with the specified row-major ordered matrix
+        /// Set the current texture coordinates
         /// </summary>
-        /// <param name="m">
+        /// <param name="target">
         /// <para>
-        /// Points to 16 consecutive values that are used as the elements of a 4 times 4 row-major matrix.
+        /// Specifies the texture unit whose coordinates should be modified. The number of texture units is implementation dependent, but must be at least two. Symbolic constant must be one of GL_TEXTURE, where i ranges from 0 to GL_MAX_TEXTURE_COORDS - 1, which is an implementation-dependent value.
+        /// </para>
+        /// </param>
+        /// <param name="s">
+        /// <para>
+        /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbTransposeMatrix", Version = "1.2", EntryPoint = "glMultTransposeMatrixdARB")]
+            [AutoGenerated(Category = "ArbMultitexture", Version = "1.2", EntryPoint = "glMultiTexCoord4svARB")]
             public static 
-            unsafe void MultTransposeMatrix(Double* m)
+            unsafe void MultiTexCoord4(OpenTK.Graphics.OpenGL.TextureUnit target, Int16* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glMultTransposeMatrixdARB((Double*)m);
+                Delegates.glMultiTexCoord4svARB((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int16*)v);
                 #if DEBUG
                 }
                 #endif
@@ -14627,6 +14603,59 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Multiply the current matrix with the specified row-major ordered matrix
+        /// </summary>
+        /// <param name="m">
+        /// <para>
+        /// Points to 16 consecutive values that are used as the elements of a 4 times 4 row-major matrix.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbTransposeMatrix", Version = "1.2", EntryPoint = "glMultTransposeMatrixdARB")]
+            public static 
+            unsafe void MultTransposeMatrix(Double* m)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMultTransposeMatrixdARB((Double*)m);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Multiply the current matrix with the specified row-major ordered matrix
+        /// </summary>
+        /// <param name="m">
+        /// <para>
+        /// Points to 16 consecutive values that are used as the elements of a 4 times 4 row-major matrix.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ArbTransposeMatrix", Version = "1.2", EntryPoint = "glMultTransposeMatrixfARB")]
+            public static 
+            void MultTransposeMatrix(Single[] m)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* m_ptr = m)
+                    {
+                        Delegates.glMultTransposeMatrixfARB((Single*)m_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Multiply the current matrix with the specified row-major ordered matrix
         /// </summary>
@@ -14680,35 +14709,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Multiply the current matrix with the specified row-major ordered matrix
-        /// </summary>
-        /// <param name="m">
-        /// <para>
-        /// Points to 16 consecutive values that are used as the elements of a 4 times 4 row-major matrix.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ArbTransposeMatrix", Version = "1.2", EntryPoint = "glMultTransposeMatrixfARB")]
-            public static 
-            void MultTransposeMatrix(Single[] m)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* m_ptr = m)
-                    {
-                        Delegates.glMultTransposeMatrixfARB((Single*)m_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specify point parameters
         /// </summary>
@@ -14750,16 +14750,21 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the value that pname will be set to.
         /// </para>
         /// </param>
-            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbPointParameters", Version = "1.0", EntryPoint = "glPointParameterfvARB")]
             public static 
-            unsafe void PointParameter(OpenTK.Graphics.OpenGL.ArbPointParameters pname, Single* @params)
+            void PointParameter(OpenTK.Graphics.OpenGL.ArbPointParameters pname, Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glPointParameterfvARB((OpenTK.Graphics.OpenGL.ArbPointParameters)pname, (Single*)@params);
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glPointParameterfvARB((OpenTK.Graphics.OpenGL.ArbPointParameters)pname, (Single*)@params_ptr);
+                    }
+                }
                 #if DEBUG
                 }
                 #endif
@@ -14779,21 +14784,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the value that pname will be set to.
         /// </para>
         /// </param>
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbPointParameters", Version = "1.0", EntryPoint = "glPointParameterfvARB")]
             public static 
-            void PointParameter(OpenTK.Graphics.OpenGL.ArbPointParameters pname, Single[] @params)
+            unsafe void PointParameter(OpenTK.Graphics.OpenGL.ArbPointParameters pname, Single* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glPointParameterfvARB((OpenTK.Graphics.OpenGL.ArbPointParameters)pname, (Single*)@params_ptr);
-                    }
-                }
+                Delegates.glPointParameterfvARB((OpenTK.Graphics.OpenGL.ArbPointParameters)pname, (Single*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -14828,21 +14828,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glProgramEnvParameter4dvARB")]
-            public static 
-            unsafe void ProgramEnvParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, Double* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glProgramEnvParameter4dvARB((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (UInt32)index, (Double*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glProgramEnvParameter4dvARB")]
             public static 
             void ProgramEnvParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, Double[] @params)
@@ -14886,7 +14871,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glProgramEnvParameter4dvARB")]
             public static 
-            unsafe void ProgramEnvParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 index, Double* @params)
+            unsafe void ProgramEnvParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, Double* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -14940,6 +14925,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glProgramEnvParameter4dvARB")]
+            public static 
+            unsafe void ProgramEnvParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 index, Double* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glProgramEnvParameter4dvARB((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (UInt32)index, (Double*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glProgramEnvParameter4fARB")]
             public static 
             void ProgramEnvParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, Single x, Single y, Single z, Single w)
@@ -14969,6 +14969,26 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glProgramEnvParameter4fvARB")]
+            public static 
+            void ProgramEnvParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glProgramEnvParameter4fvARB((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (UInt32)index, (Single*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glProgramEnvParameter4fvARB")]
             public static 
             void ProgramEnvParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, ref Single @params)
@@ -15004,9 +15024,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glProgramEnvParameter4fvARB")]
             public static 
-            void ProgramEnvParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, Single[] @params)
+            void ProgramEnvParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 index, Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -15060,27 +15081,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glProgramEnvParameter4fvARB")]
-            public static 
-            void ProgramEnvParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 index, Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glProgramEnvParameter4fvARB((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (UInt32)index, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glProgramLocalParameter4dARB")]
             public static 
             void ProgramLocalParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, Double x, Double y, Double z, Double w)
@@ -15110,21 +15110,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glProgramLocalParameter4dvARB")]
-            public static 
-            unsafe void ProgramLocalParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, Double* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glProgramLocalParameter4dvARB((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (UInt32)index, (Double*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glProgramLocalParameter4dvARB")]
             public static 
             void ProgramLocalParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, Double[] @params)
@@ -15168,7 +15153,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glProgramLocalParameter4dvARB")]
             public static 
-            unsafe void ProgramLocalParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 index, Double* @params)
+            unsafe void ProgramLocalParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, Double* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -15222,6 +15207,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glProgramLocalParameter4dvARB")]
+            public static 
+            unsafe void ProgramLocalParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 index, Double* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glProgramLocalParameter4dvARB((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (UInt32)index, (Double*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glProgramLocalParameter4fARB")]
             public static 
             void ProgramLocalParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, Single x, Single y, Single z, Single w)
@@ -15251,6 +15251,26 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glProgramLocalParameter4fvARB")]
+            public static 
+            void ProgramLocalParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glProgramLocalParameter4fvARB((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (UInt32)index, (Single*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glProgramLocalParameter4fvARB")]
             public static 
             void ProgramLocalParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, ref Single @params)
@@ -15286,9 +15306,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glProgramLocalParameter4fvARB")]
             public static 
-            void ProgramLocalParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, Single[] @params)
+            void ProgramLocalParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 index, Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -15342,27 +15363,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glProgramLocalParameter4fvARB")]
-            public static 
-            void ProgramLocalParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 index, Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glProgramLocalParameter4fvARB((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (UInt32)index, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ArbGeometryShader4", Version = "3.0", EntryPoint = "glProgramParameteriARB")]
             public static 
             void ProgramParameter(Int32 program, OpenTK.Graphics.OpenGL.ArbGeometryShader4 pname, Int32 value)
@@ -15394,23 +15394,13 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glProgramStringARB")]
             public static 
-            void ProgramString<T3>(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, OpenTK.Graphics.OpenGL.ArbVertexProgram format, Int32 len, [InAttribute, OutAttribute] ref T3 @string)
-                where T3 : struct
+            void ProgramString(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, OpenTK.Graphics.OpenGL.ArbVertexProgram format, Int32 len, IntPtr @string)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle @string_ptr = GCHandle.Alloc(@string, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glProgramStringARB((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (OpenTK.Graphics.OpenGL.ArbVertexProgram)format, (Int32)len, (IntPtr)@string_ptr.AddrOfPinnedObject());
-                    @string = (T3)@string_ptr.Target;
-                }
-                finally
-                {
-                    @string_ptr.Free();
-                }
+                Delegates.glProgramStringARB((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (OpenTK.Graphics.OpenGL.ArbVertexProgram)format, (Int32)len, (IntPtr)@string);
                 #if DEBUG
                 }
                 #endif
@@ -15418,7 +15408,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glProgramStringARB")]
             public static 
-            void ProgramString<T3>(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, OpenTK.Graphics.OpenGL.ArbVertexProgram format, Int32 len, [InAttribute, OutAttribute] T3[,,] @string)
+            void ProgramString<T3>(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, OpenTK.Graphics.OpenGL.ArbVertexProgram format, Int32 len, [InAttribute, OutAttribute] T3[] @string)
                 where T3 : struct
             {
                 #if DEBUG
@@ -15464,7 +15454,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glProgramStringARB")]
             public static 
-            void ProgramString<T3>(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, OpenTK.Graphics.OpenGL.ArbVertexProgram format, Int32 len, [InAttribute, OutAttribute] T3[] @string)
+            void ProgramString<T3>(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, OpenTK.Graphics.OpenGL.ArbVertexProgram format, Int32 len, [InAttribute, OutAttribute] T3[,,] @string)
                 where T3 : struct
             {
                 #if DEBUG
@@ -15487,13 +15477,23 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glProgramStringARB")]
             public static 
-            void ProgramString(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, OpenTK.Graphics.OpenGL.ArbVertexProgram format, Int32 len, IntPtr @string)
+            void ProgramString<T3>(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, OpenTK.Graphics.OpenGL.ArbVertexProgram format, Int32 len, [InAttribute, OutAttribute] ref T3 @string)
+                where T3 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glProgramStringARB((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (OpenTK.Graphics.OpenGL.ArbVertexProgram)format, (Int32)len, (IntPtr)@string);
+                GCHandle @string_ptr = GCHandle.Alloc(@string, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glProgramStringARB((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (OpenTK.Graphics.OpenGL.ArbVertexProgram)format, (Int32)len, (IntPtr)@string_ptr.AddrOfPinnedObject());
+                    @string = (T3)@string_ptr.Target;
+                }
+                finally
+                {
+                    @string_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -15528,45 +15528,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Replaces the source code in a shader object
-        /// </summary>
-        /// <param name="shader">
-        /// <para>
-        /// Specifies the handle of the shader object whose source code is to be replaced.
-        /// </para>
-        /// </param>
-        /// <param name="count">
-        /// <para>
-        /// Specifies the number of elements in the string and length arrays.
-        /// </para>
-        /// </param>
-        /// <param name="string">
-        /// <para>
-        /// Specifies an array of pointers to strings containing the source code to be loaded into the shader.
-        /// </para>
-        /// </param>
-        /// <param name="length">
-        /// <para>
-        /// Specifies an array of string lengths.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glShaderSourceARB")]
-            public static 
-            unsafe void ShaderSource(Int32 shaderObj, Int32 count, String[] @string, Int32* length)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glShaderSourceARB((UInt32)shaderObj, (Int32)count, (String[])@string, (Int32*)length);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Replaces the source code in a shader object
         /// </summary>
@@ -15637,7 +15598,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glShaderSourceARB")]
             public static 
-            unsafe void ShaderSource(UInt32 shaderObj, Int32 count, String[] @string, Int32* length)
+            unsafe void ShaderSource(Int32 shaderObj, Int32 count, String[] @string, Int32* length)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -15694,6 +15655,45 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            
+        /// <summary>
+        /// Replaces the source code in a shader object
+        /// </summary>
+        /// <param name="shader">
+        /// <para>
+        /// Specifies the handle of the shader object whose source code is to be replaced.
+        /// </para>
+        /// </param>
+        /// <param name="count">
+        /// <para>
+        /// Specifies the number of elements in the string and length arrays.
+        /// </para>
+        /// </param>
+        /// <param name="string">
+        /// <para>
+        /// Specifies an array of pointers to strings containing the source code to be loaded into the shader.
+        /// </para>
+        /// </param>
+        /// <param name="length">
+        /// <para>
+        /// Specifies an array of string lengths.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glShaderSourceARB")]
+            public static 
+            unsafe void ShaderSource(UInt32 shaderObj, Int32 count, String[] @string, Int32* length)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glShaderSourceARB((UInt32)shaderObj, (Int32)count, (String[])@string, (Int32*)length);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ArbTextureBufferObject", Version = "3.0", EntryPoint = "glTexBufferARB")]
             public static 
             void TexBuffer(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.ArbTextureBufferObject internalformat, Int32 buffer)
@@ -15752,6 +15752,40 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glUniform1fvARB")]
+            public static 
+            void Uniform1(Int32 location, Int32 count, Single[] value)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* value_ptr = value)
+                    {
+                        Delegates.glUniform1fvARB((Int32)location, (Int32)count, (Single*)value_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -15815,40 +15849,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glUniform1fvARB")]
-            public static 
-            void Uniform1(Int32 location, Int32 count, Single[] value)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* value_ptr = value)
-                    {
-                        Delegates.glUniform1fvARB((Int32)location, (Int32)count, (Single*)value_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -15877,35 +15877,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glUniform1ivARB")]
-            public static 
-            unsafe void Uniform1(Int32 location, Int32 count, Int32* value)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glUniform1ivARB((Int32)location, (Int32)count, (Int32*)value);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -15974,6 +15945,35 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glUniform1ivARB")]
+            public static 
+            unsafe void Uniform1(Int32 location, Int32 count, Int32* value)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glUniform1ivARB((Int32)location, (Int32)count, (Int32*)value);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -16002,6 +16002,40 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glUniform2fvARB")]
+            public static 
+            void Uniform2(Int32 location, Int32 count, Single[] value)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* value_ptr = value)
+                    {
+                        Delegates.glUniform2fvARB((Int32)location, (Int32)count, (Single*)value_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -16065,40 +16099,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glUniform2fvARB")]
-            public static 
-            void Uniform2(Int32 location, Int32 count, Single[] value)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* value_ptr = value)
-                    {
-                        Delegates.glUniform2fvARB((Int32)location, (Int32)count, (Single*)value_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -16127,35 +16127,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glUniform2ivARB")]
-            public static 
-            unsafe void Uniform2(Int32 location, Int32 count, Int32* value)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glUniform2ivARB((Int32)location, (Int32)count, (Int32*)value);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -16190,6 +16161,35 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glUniform2ivARB")]
+            public static 
+            unsafe void Uniform2(Int32 location, Int32 count, Int32* value)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glUniform2ivARB((Int32)location, (Int32)count, (Int32*)value);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -16218,6 +16218,40 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glUniform3fvARB")]
+            public static 
+            void Uniform3(Int32 location, Int32 count, Single[] value)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* value_ptr = value)
+                    {
+                        Delegates.glUniform3fvARB((Int32)location, (Int32)count, (Single*)value_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -16281,40 +16315,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glUniform3fvARB")]
-            public static 
-            void Uniform3(Int32 location, Int32 count, Single[] value)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* value_ptr = value)
-                    {
-                        Delegates.glUniform3fvARB((Int32)location, (Int32)count, (Single*)value_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -16343,35 +16343,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glUniform3ivARB")]
-            public static 
-            unsafe void Uniform3(Int32 location, Int32 count, Int32* value)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glUniform3ivARB((Int32)location, (Int32)count, (Int32*)value);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -16440,6 +16411,35 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glUniform3ivARB")]
+            public static 
+            unsafe void Uniform3(Int32 location, Int32 count, Int32* value)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glUniform3ivARB((Int32)location, (Int32)count, (Int32*)value);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -16468,6 +16468,40 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glUniform4fvARB")]
+            public static 
+            void Uniform4(Int32 location, Int32 count, Single[] value)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* value_ptr = value)
+                    {
+                        Delegates.glUniform4fvARB((Int32)location, (Int32)count, (Single*)value_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -16531,40 +16565,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glUniform4fvARB")]
-            public static 
-            void Uniform4(Int32 location, Int32 count, Single[] value)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* value_ptr = value)
-                    {
-                        Delegates.glUniform4fvARB((Int32)location, (Int32)count, (Single*)value_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -16593,35 +16593,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glUniform4ivARB")]
-            public static 
-            unsafe void Uniform4(Int32 location, Int32 count, Int32* value)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glUniform4ivARB((Int32)location, (Int32)count, (Int32*)value);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -16689,6 +16660,55 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glUniform4ivARB")]
+            public static 
+            unsafe void Uniform4(Int32 location, Int32 count, Int32* value)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glUniform4ivARB((Int32)location, (Int32)count, (Int32*)value);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glUniformMatrix2fvARB")]
+            public static 
+            void UniformMatrix2(Int32 location, Int32 count, bool transpose, Single[] value)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* value_ptr = value)
+                    {
+                        Delegates.glUniformMatrix2fvARB((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glUniformMatrix2fvARB")]
             public static 
             void UniformMatrix2(Int32 location, Int32 count, bool transpose, ref Single value)
@@ -16724,9 +16744,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glUniformMatrix2fvARB")]
+            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glUniformMatrix3fvARB")]
             public static 
-            void UniformMatrix2(Int32 location, Int32 count, bool transpose, Single[] value)
+            void UniformMatrix3(Int32 location, Int32 count, bool transpose, Single[] value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -16736,7 +16756,7 @@ namespace OpenTK.Graphics.OpenGL
                 {
                     fixed (Single* value_ptr = value)
                     {
-                        Delegates.glUniformMatrix2fvARB((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
+                        Delegates.glUniformMatrix3fvARB((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
                     }
                 }
                 #if DEBUG
@@ -16779,9 +16799,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glUniformMatrix3fvARB")]
+            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glUniformMatrix4fvARB")]
             public static 
-            void UniformMatrix3(Int32 location, Int32 count, bool transpose, Single[] value)
+            void UniformMatrix4(Int32 location, Int32 count, bool transpose, Single[] value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -16791,7 +16811,7 @@ namespace OpenTK.Graphics.OpenGL
                 {
                     fixed (Single* value_ptr = value)
                     {
-                        Delegates.glUniformMatrix3fvARB((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
+                        Delegates.glUniformMatrix4fvARB((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
                     }
                 }
                 #if DEBUG
@@ -16834,26 +16854,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "ArbShaderObjects", Version = "1.2", EntryPoint = "glUniformMatrix4fvARB")]
-            public static 
-            void UniformMatrix4(Int32 location, Int32 count, bool transpose, Single[] value)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* value_ptr = value)
-                    {
-                        Delegates.glUniformMatrix4fvARB((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ArbVertexBufferObject", Version = "1.2", EntryPoint = "glUnmapBufferARB")]
             public static 
             bool UnmapBuffer(OpenTK.Graphics.OpenGL.BufferTargetArb target)
@@ -17347,35 +17347,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib2dvARB")]
-            public static 
-            unsafe void VertexAttrib2(Int32 index, Double* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttrib2dvARB((UInt32)index, (Double*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -17460,7 +17431,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib2dvARB")]
             public static 
-            unsafe void VertexAttrib2(UInt32 index, Double* v)
+            unsafe void VertexAttrib2(Int32 index, Double* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -17543,6 +17514,35 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib2dvARB")]
+            public static 
+            unsafe void VertexAttrib2(UInt32 index, Double* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttrib2dvARB((UInt32)index, (Double*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -17600,6 +17600,40 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib2fvARB")]
+            public static 
+            void VertexAttrib2(Int32 index, Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glVertexAttrib2fvARB((UInt32)index, (Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -17676,9 +17710,10 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the new values to be used for the specified vertex attribute.
         /// </para>
         /// </param>
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib2fvARB")]
             public static 
-            void VertexAttrib2(Int32 index, Single[] v)
+            void VertexAttrib2(UInt32 index, Single[] v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -17761,41 +17796,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib2fvARB")]
-            public static 
-            void VertexAttrib2(UInt32 index, Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glVertexAttrib2fvARB((UInt32)index, (Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -17853,35 +17853,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib2svARB")]
-            public static 
-            unsafe void VertexAttrib2(Int32 index, Int16* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttrib2svARB((UInt32)index, (Int16*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -17966,7 +17937,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib2svARB")]
             public static 
-            unsafe void VertexAttrib2(UInt32 index, Int16* v)
+            unsafe void VertexAttrib2(Int32 index, Int16* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -18049,6 +18020,35 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib2svARB")]
+            public static 
+            unsafe void VertexAttrib2(UInt32 index, Int16* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttrib2svARB((UInt32)index, (Int16*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -18106,35 +18106,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib3dvARB")]
-            public static 
-            unsafe void VertexAttrib3(Int32 index, Double* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttrib3dvARB((UInt32)index, (Double*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -18219,7 +18190,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib3dvARB")]
             public static 
-            unsafe void VertexAttrib3(UInt32 index, Double* v)
+            unsafe void VertexAttrib3(Int32 index, Double* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -18302,6 +18273,35 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib3dvARB")]
+            public static 
+            unsafe void VertexAttrib3(UInt32 index, Double* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttrib3dvARB((UInt32)index, (Double*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -18359,6 +18359,40 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib3fvARB")]
+            public static 
+            void VertexAttrib3(Int32 index, Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glVertexAttrib3fvARB((UInt32)index, (Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -18435,9 +18469,10 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the new values to be used for the specified vertex attribute.
         /// </para>
         /// </param>
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib3fvARB")]
             public static 
-            void VertexAttrib3(Int32 index, Single[] v)
+            void VertexAttrib3(UInt32 index, Single[] v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -18520,41 +18555,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib3fvARB")]
-            public static 
-            void VertexAttrib3(UInt32 index, Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glVertexAttrib3fvARB((UInt32)index, (Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -18612,35 +18612,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib3svARB")]
-            public static 
-            unsafe void VertexAttrib3(Int32 index, Int16* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttrib3svARB((UInt32)index, (Int16*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -18725,7 +18696,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib3svARB")]
             public static 
-            unsafe void VertexAttrib3(UInt32 index, Int16* v)
+            unsafe void VertexAttrib3(Int32 index, Int16* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -18808,6 +18779,70 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib3svARB")]
+            public static 
+            unsafe void VertexAttrib3(UInt32 index, Int16* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttrib3svARB((UInt32)index, (Int16*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4bvARB")]
+            public static 
+            void VertexAttrib4(UInt32 index, SByte[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (SByte* v_ptr = v)
+                    {
+                        Delegates.glVertexAttrib4bvARB((UInt32)index, (SByte*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -18872,41 +18907,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4bvARB")]
-            public static 
-            void VertexAttrib4(UInt32 index, SByte[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (SByte* v_ptr = v)
-                    {
-                        Delegates.glVertexAttrib4bvARB((UInt32)index, (SByte*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -18964,35 +18964,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4dvARB")]
-            public static 
-            unsafe void VertexAttrib4(Int32 index, Double* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttrib4dvARB((UInt32)index, (Double*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -19077,7 +19048,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4dvARB")]
             public static 
-            unsafe void VertexAttrib4(UInt32 index, Double* v)
+            unsafe void VertexAttrib4(Int32 index, Double* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -19160,6 +19131,35 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4dvARB")]
+            public static 
+            unsafe void VertexAttrib4(UInt32 index, Double* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttrib4dvARB((UInt32)index, (Double*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -19217,6 +19217,40 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4fvARB")]
+            public static 
+            void VertexAttrib4(Int32 index, Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glVertexAttrib4fvARB((UInt32)index, (Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -19293,9 +19327,10 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the new values to be used for the specified vertex attribute.
         /// </para>
         /// </param>
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4fvARB")]
             public static 
-            void VertexAttrib4(Int32 index, Single[] v)
+            void VertexAttrib4(UInt32 index, Single[] v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -19378,70 +19413,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4fvARB")]
-            public static 
-            void VertexAttrib4(UInt32 index, Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glVertexAttrib4fvARB((UInt32)index, (Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4ivARB")]
-            public static 
-            unsafe void VertexAttrib4(Int32 index, Int32* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttrib4ivARB((UInt32)index, (Int32*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -19526,7 +19497,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4ivARB")]
             public static 
-            unsafe void VertexAttrib4(UInt32 index, Int32* v)
+            unsafe void VertexAttrib4(Int32 index, Int32* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -19608,6 +19579,56 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4ivARB")]
+            public static 
+            unsafe void VertexAttrib4(UInt32 index, Int32* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttrib4ivARB((UInt32)index, (Int32*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NbvARB")]
+            public static 
+            void VertexAttrib4N(UInt32 index, SByte[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (SByte* v_ptr = v)
+                    {
+                        Delegates.glVertexAttrib4NbvARB((UInt32)index, (SByte*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NbvARB")]
             public static 
@@ -19644,42 +19665,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NbvARB")]
-            public static 
-            void VertexAttrib4N(UInt32 index, SByte[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (SByte* v_ptr = v)
-                    {
-                        Delegates.glVertexAttrib4NbvARB((UInt32)index, (SByte*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NivARB")]
-            public static 
-            unsafe void VertexAttrib4N(Int32 index, Int32* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttrib4NivARB((UInt32)index, (Int32*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NivARB")]
             public static 
             void VertexAttrib4N(Int32 index, Int32[] v)
@@ -19723,7 +19708,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NivARB")]
             public static 
-            unsafe void VertexAttrib4N(UInt32 index, Int32* v)
+            unsafe void VertexAttrib4N(Int32 index, Int32* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -19778,15 +19763,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NsvARB")]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NivARB")]
             public static 
-            unsafe void VertexAttrib4N(Int32 index, Int16* v)
+            unsafe void VertexAttrib4N(UInt32 index, Int32* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glVertexAttrib4NsvARB((UInt32)index, (Int16*)v);
+                Delegates.glVertexAttrib4NivARB((UInt32)index, (Int32*)v);
                 #if DEBUG
                 }
                 #endif
@@ -19835,7 +19820,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NsvARB")]
             public static 
-            unsafe void VertexAttrib4N(UInt32 index, Int16* v)
+            unsafe void VertexAttrib4N(Int32 index, Int16* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -19889,6 +19874,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NsvARB")]
+            public static 
+            unsafe void VertexAttrib4N(UInt32 index, Int16* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttrib4NsvARB((UInt32)index, (Int16*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NubARB")]
             public static 
             void VertexAttrib4N(Int32 index, Byte x, Byte y, Byte z, Byte w)
@@ -19918,21 +19918,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NubvARB")]
-            public static 
-            unsafe void VertexAttrib4N(Int32 index, Byte* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttrib4NubvARB((UInt32)index, (Byte*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NubvARB")]
             public static 
             void VertexAttrib4N(Int32 index, Byte[] v)
@@ -19976,7 +19961,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NubvARB")]
             public static 
-            unsafe void VertexAttrib4N(UInt32 index, Byte* v)
+            unsafe void VertexAttrib4N(Int32 index, Byte* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -20030,6 +20015,42 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NubvARB")]
+            public static 
+            unsafe void VertexAttrib4N(UInt32 index, Byte* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttrib4NubvARB((UInt32)index, (Byte*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NuivARB")]
+            public static 
+            void VertexAttrib4N(UInt32 index, UInt32[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* v_ptr = v)
+                    {
+                        Delegates.glVertexAttrib4NuivARB((UInt32)index, (UInt32*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NuivARB")]
             public static 
@@ -20067,9 +20088,9 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NuivARB")]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NusvARB")]
             public static 
-            void VertexAttrib4N(UInt32 index, UInt32[] v)
+            void VertexAttrib4N(UInt32 index, UInt16[] v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -20077,9 +20098,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
                 unsafe
                 {
-                    fixed (UInt32* v_ptr = v)
+                    fixed (UInt16* v_ptr = v)
                     {
-                        Delegates.glVertexAttrib4NuivARB((UInt32)index, (UInt32*)v_ptr);
+                        Delegates.glVertexAttrib4NusvARB((UInt32)index, (UInt16*)v_ptr);
                     }
                 }
                 #if DEBUG
@@ -20123,27 +20144,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4NusvARB")]
-            public static 
-            void VertexAttrib4N(UInt32 index, UInt16[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt16* v_ptr = v)
-                    {
-                        Delegates.glVertexAttrib4NusvARB((UInt32)index, (UInt16*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             
         /// <summary>
         /// Specifies the value of a generic vertex attribute
@@ -20202,35 +20202,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4svARB")]
-            public static 
-            unsafe void VertexAttrib4(Int32 index, Int16* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttrib4svARB((UInt32)index, (Int16*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -20315,7 +20286,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4svARB")]
             public static 
-            unsafe void VertexAttrib4(UInt32 index, Int16* v)
+            unsafe void VertexAttrib4(Int32 index, Int16* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -20412,15 +20383,15 @@ namespace OpenTK.Graphics.OpenGL
         /// </para>
         /// </param>
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4ubvARB")]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4svARB")]
             public static 
-            unsafe void VertexAttrib4(Int32 index, Byte* v)
+            unsafe void VertexAttrib4(UInt32 index, Int16* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glVertexAttrib4ubvARB((UInt32)index, (Byte*)v);
+                Delegates.glVertexAttrib4svARB((UInt32)index, (Int16*)v);
                 #if DEBUG
                 }
                 #endif
@@ -20511,7 +20482,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4ubvARB")]
             public static 
-            unsafe void VertexAttrib4(UInt32 index, Byte* v)
+            unsafe void VertexAttrib4(Int32 index, Byte* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -20594,6 +20565,70 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4ubvARB")]
+            public static 
+            unsafe void VertexAttrib4(UInt32 index, Byte* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttrib4ubvARB((UInt32)index, (Byte*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4uivARB")]
+            public static 
+            void VertexAttrib4(UInt32 index, UInt32[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* v_ptr = v)
+                    {
+                        Delegates.glVertexAttrib4uivARB((UInt32)index, (UInt32*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -20672,9 +20707,9 @@ namespace OpenTK.Graphics.OpenGL
         /// </para>
         /// </param>
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4uivARB")]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4usvARB")]
             public static 
-            void VertexAttrib4(UInt32 index, UInt32[] v)
+            void VertexAttrib4(UInt32 index, UInt16[] v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -20682,9 +20717,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
                 unsafe
                 {
-                    fixed (UInt32* v_ptr = v)
+                    fixed (UInt16* v_ptr = v)
                     {
-                        Delegates.glVertexAttrib4uivARB((UInt32)index, (UInt32*)v_ptr);
+                        Delegates.glVertexAttrib4usvARB((UInt32)index, (UInt16*)v_ptr);
                     }
                 }
                 #if DEBUG
@@ -20756,41 +20791,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttrib4usvARB")]
-            public static 
-            void VertexAttrib4(UInt32 index, UInt16[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt16* v_ptr = v)
-                    {
-                        Delegates.glVertexAttrib4usvARB((UInt32)index, (UInt16*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ArbInstancedArrays", Version = "2.0", EntryPoint = "glVertexAttribDivisorARB")]
             public static 
             void VertexAttribDivisor(Int32 index, Int32 divisor)
@@ -20856,23 +20856,13 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttribPointerARB")]
             public static 
-            void VertexAttribPointer<T5>(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerTypeArb type, bool normalized, Int32 stride, [InAttribute, OutAttribute] ref T5 pointer)
-                where T5 : struct
+            void VertexAttribPointer(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerTypeArb type, bool normalized, Int32 stride, IntPtr pointer)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glVertexAttribPointerARB((UInt32)index, (Int32)size, (OpenTK.Graphics.OpenGL.VertexAttribPointerTypeArb)type, (bool)normalized, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                    pointer = (T5)pointer_ptr.Target;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
+                Delegates.glVertexAttribPointerARB((UInt32)index, (Int32)size, (OpenTK.Graphics.OpenGL.VertexAttribPointerTypeArb)type, (bool)normalized, (Int32)stride, (IntPtr)pointer);
                 #if DEBUG
                 }
                 #endif
@@ -20914,7 +20904,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttribPointerARB")]
             public static 
-            void VertexAttribPointer<T5>(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerTypeArb type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[,,] pointer)
+            void VertexAttribPointer<T5>(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerTypeArb type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[] pointer)
                 where T5 : struct
             {
                 #if DEBUG
@@ -21028,7 +21018,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttribPointerARB")]
             public static 
-            void VertexAttribPointer<T5>(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerTypeArb type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[] pointer)
+            void VertexAttribPointer<T5>(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerTypeArb type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[,,] pointer)
                 where T5 : struct
             {
                 #if DEBUG
@@ -21085,56 +21075,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttribPointerARB")]
             public static 
-            void VertexAttribPointer(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerTypeArb type, bool normalized, Int32 stride, IntPtr pointer)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttribPointerARB((UInt32)index, (Int32)size, (OpenTK.Graphics.OpenGL.VertexAttribPointerTypeArb)type, (bool)normalized, (Int32)stride, (IntPtr)pointer);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Define an array of generic vertex attribute data
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="size">
-        /// <para>
-        /// Specifies the number of components per generic vertex attribute. Must be 1, 2, 3, or 4. The initial value is 4.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the data type of each component in the array. Symbolic constants GL_BYTE, GL_UNSIGNED_BYTE, GL_SHORT, GL_UNSIGNED_SHORT, GL_INT, GL_UNSIGNED_INT, GL_FLOAT, or GL_DOUBLE are accepted. The initial value is GL_FLOAT.
-        /// </para>
-        /// </param>
-        /// <param name="normalized">
-        /// <para>
-        /// Specifies whether fixed-point data values should be normalized (GL_TRUE) or converted directly as fixed-point values (GL_FALSE) when they are accessed.
-        /// </para>
-        /// </param>
-        /// <param name="stride">
-        /// <para>
-        /// Specifies the byte offset between consecutive generic vertex attributes. If stride is 0, the generic vertex attributes are understood to be tightly packed in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-        /// <param name="pointer">
-        /// <para>
-        /// Specifies a pointer to the first component of the first generic vertex attribute in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttribPointerARB")]
-            public static 
-            void VertexAttribPointer<T5>(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerTypeArb type, bool normalized, Int32 stride, [InAttribute, OutAttribute] ref T5 pointer)
+            void VertexAttribPointer<T5>(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerTypeArb type, bool normalized, Int32 stride, [InAttribute, OutAttribute] ref T5 pointer)
                 where T5 : struct
             {
                 #if DEBUG
@@ -21193,7 +21134,56 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttribPointerARB")]
             public static 
-            void VertexAttribPointer<T5>(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerTypeArb type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[,,] pointer)
+            void VertexAttribPointer(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerTypeArb type, bool normalized, Int32 stride, IntPtr pointer)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttribPointerARB((UInt32)index, (Int32)size, (OpenTK.Graphics.OpenGL.VertexAttribPointerTypeArb)type, (bool)normalized, (Int32)stride, (IntPtr)pointer);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Define an array of generic vertex attribute data
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="size">
+        /// <para>
+        /// Specifies the number of components per generic vertex attribute. Must be 1, 2, 3, or 4. The initial value is 4.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the data type of each component in the array. Symbolic constants GL_BYTE, GL_UNSIGNED_BYTE, GL_SHORT, GL_UNSIGNED_SHORT, GL_INT, GL_UNSIGNED_INT, GL_FLOAT, or GL_DOUBLE are accepted. The initial value is GL_FLOAT.
+        /// </para>
+        /// </param>
+        /// <param name="normalized">
+        /// <para>
+        /// Specifies whether fixed-point data values should be normalized (GL_TRUE) or converted directly as fixed-point values (GL_FALSE) when they are accessed.
+        /// </para>
+        /// </param>
+        /// <param name="stride">
+        /// <para>
+        /// Specifies the byte offset between consecutive generic vertex attributes. If stride is 0, the generic vertex attributes are understood to be tightly packed in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+        /// <param name="pointer">
+        /// <para>
+        /// Specifies a pointer to the first component of the first generic vertex attribute in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttribPointerARB")]
+            public static 
+            void VertexAttribPointer<T5>(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerTypeArb type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[] pointer)
                 where T5 : struct
             {
                 #if DEBUG
@@ -21309,7 +21299,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttribPointerARB")]
             public static 
-            void VertexAttribPointer<T5>(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerTypeArb type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[] pointer)
+            void VertexAttribPointer<T5>(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerTypeArb type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[,,] pointer)
                 where T5 : struct
             {
                 #if DEBUG
@@ -21367,13 +21357,23 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexProgram", Version = "1.3", EntryPoint = "glVertexAttribPointerARB")]
             public static 
-            void VertexAttribPointer(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerTypeArb type, bool normalized, Int32 stride, IntPtr pointer)
+            void VertexAttribPointer<T5>(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerTypeArb type, bool normalized, Int32 stride, [InAttribute, OutAttribute] ref T5 pointer)
+                where T5 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glVertexAttribPointerARB((UInt32)index, (Int32)size, (OpenTK.Graphics.OpenGL.VertexAttribPointerTypeArb)type, (bool)normalized, (Int32)stride, (IntPtr)pointer);
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glVertexAttribPointerARB((UInt32)index, (Int32)size, (OpenTK.Graphics.OpenGL.VertexAttribPointerTypeArb)type, (bool)normalized, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    pointer = (T5)pointer_ptr.Target;
+                }
+                finally
+                {
+                    pointer_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -21393,6 +21393,27 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightbvARB")]
+            public static 
+            void Weight(Int32 size, SByte[] weights)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (SByte* weights_ptr = weights)
+                    {
+                        Delegates.glWeightbvARB((Int32)size, (SByte*)weights_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightbvARB")]
             public static 
@@ -21429,42 +21450,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightbvARB")]
-            public static 
-            void Weight(Int32 size, SByte[] weights)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (SByte* weights_ptr = weights)
-                    {
-                        Delegates.glWeightbvARB((Int32)size, (SByte*)weights_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightdvARB")]
-            public static 
-            unsafe void Weight(Int32 size, Double* weights)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glWeightdvARB((Int32)size, (Double*)weights);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightdvARB")]
             public static 
             void Weight(Int32 size, Double[] weights)
@@ -21505,6 +21490,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightdvARB")]
+            public static 
+            unsafe void Weight(Int32 size, Double* weights)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glWeightdvARB((Int32)size, (Double*)weights);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightfvARB")]
+            public static 
+            void Weight(Int32 size, Single[] weights)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* weights_ptr = weights)
+                    {
+                        Delegates.glWeightfvARB((Int32)size, (Single*)weights_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightfvARB")]
             public static 
             void Weight(Int32 size, ref Single weights)
@@ -21540,41 +21560,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightfvARB")]
-            public static 
-            void Weight(Int32 size, Single[] weights)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* weights_ptr = weights)
-                    {
-                        Delegates.glWeightfvARB((Int32)size, (Single*)weights_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightivARB")]
-            public static 
-            unsafe void Weight(Int32 size, Int32* weights)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glWeightivARB((Int32)size, (Int32*)weights);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightivARB")]
             public static 
             void Weight(Int32 size, Int32[] weights)
@@ -21615,25 +21600,16 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightPointerARB")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightivARB")]
             public static 
-            void WeightPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ArbVertexBlend type, Int32 stride, [InAttribute, OutAttribute] ref T3 pointer)
-                where T3 : struct
+            unsafe void Weight(Int32 size, Int32* weights)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glWeightPointerARB((Int32)size, (OpenTK.Graphics.OpenGL.ArbVertexBlend)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                    pointer = (T3)pointer_ptr.Target;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
+                Delegates.glWeightivARB((Int32)size, (Int32*)weights);
                 #if DEBUG
                 }
                 #endif
@@ -21641,7 +21617,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightPointerARB")]
             public static 
-            void WeightPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ArbVertexBlend type, Int32 stride, [InAttribute, OutAttribute] T3[,,] pointer)
+            void WeightPointer(Int32 size, OpenTK.Graphics.OpenGL.ArbVertexBlend type, Int32 stride, IntPtr pointer)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glWeightPointerARB((Int32)size, (OpenTK.Graphics.OpenGL.ArbVertexBlend)type, (Int32)stride, (IntPtr)pointer);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightPointerARB")]
+            public static 
+            void WeightPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ArbVertexBlend type, Int32 stride, [InAttribute, OutAttribute] T3[] pointer)
                 where T3 : struct
             {
                 #if DEBUG
@@ -21687,7 +21677,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightPointerARB")]
             public static 
-            void WeightPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ArbVertexBlend type, Int32 stride, [InAttribute, OutAttribute] T3[] pointer)
+            void WeightPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ArbVertexBlend type, Int32 stride, [InAttribute, OutAttribute] T3[,,] pointer)
                 where T3 : struct
             {
                 #if DEBUG
@@ -21710,28 +21700,23 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightPointerARB")]
             public static 
-            void WeightPointer(Int32 size, OpenTK.Graphics.OpenGL.ArbVertexBlend type, Int32 stride, IntPtr pointer)
+            void WeightPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ArbVertexBlend type, Int32 stride, [InAttribute, OutAttribute] ref T3 pointer)
+                where T3 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glWeightPointerARB((Int32)size, (OpenTK.Graphics.OpenGL.ArbVertexBlend)type, (Int32)stride, (IntPtr)pointer);
-                #if DEBUG
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glWeightPointerARB((Int32)size, (OpenTK.Graphics.OpenGL.ArbVertexBlend)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    pointer = (T3)pointer_ptr.Target;
                 }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightsvARB")]
-            public static 
-            unsafe void Weight(Int32 size, Int16* weights)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                finally
                 {
-                #endif
-                Delegates.glWeightsvARB((Int32)size, (Int16*)weights);
+                    pointer_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -21778,15 +21763,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightubvARB")]
+            [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightsvARB")]
             public static 
-            unsafe void Weight(Int32 size, Byte* weights)
+            unsafe void Weight(Int32 size, Int16* weights)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glWeightubvARB((Int32)size, (Byte*)weights);
+                Delegates.glWeightsvARB((Int32)size, (Int16*)weights);
                 #if DEBUG
                 }
                 #endif
@@ -21832,6 +21817,42 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightubvARB")]
+            public static 
+            unsafe void Weight(Int32 size, Byte* weights)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glWeightubvARB((Int32)size, (Byte*)weights);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightuivARB")]
+            public static 
+            void Weight(Int32 size, UInt32[] weights)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* weights_ptr = weights)
+                    {
+                        Delegates.glWeightuivARB((Int32)size, (UInt32*)weights_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightuivARB")]
             public static 
@@ -21869,9 +21890,9 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightuivARB")]
+            [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightusvARB")]
             public static 
-            void Weight(Int32 size, UInt32[] weights)
+            void Weight(Int32 size, UInt16[] weights)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -21879,9 +21900,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
                 unsafe
                 {
-                    fixed (UInt32* weights_ptr = weights)
+                    fixed (UInt16* weights_ptr = weights)
                     {
-                        Delegates.glWeightuivARB((Int32)size, (UInt32*)weights_ptr);
+                        Delegates.glWeightusvARB((Int32)size, (UInt16*)weights_ptr);
                     }
                 }
                 #if DEBUG
@@ -21925,27 +21946,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbVertexBlend", Version = "1.1", EntryPoint = "glWeightusvARB")]
-            public static 
-            void Weight(Int32 size, UInt16[] weights)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt16* weights_ptr = weights)
-                    {
-                        Delegates.glWeightusvARB((Int32)size, (UInt16*)weights_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
@@ -21970,30 +21970,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specify the raster position in window coordinates for pixel operations
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify the , , coordinates for the raster position.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbWindowPos", Version = "1.0", EntryPoint = "glWindowPos2dvARB")]
-            public static 
-            unsafe void WindowPos2(Double* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glWindowPos2dvARB((Double*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -22052,6 +22028,30 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specify the raster position in window coordinates for pixel operations
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify the , , coordinates for the raster position.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbWindowPos", Version = "1.0", EntryPoint = "glWindowPos2dvARB")]
+            public static 
+            unsafe void WindowPos2(Double* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glWindowPos2dvARB((Double*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -22075,6 +22075,35 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specify the raster position in window coordinates for pixel operations
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify the , , coordinates for the raster position.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ArbWindowPos", Version = "1.0", EntryPoint = "glWindowPos2fvARB")]
+            public static 
+            void WindowPos2(Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glWindowPos2fvARB((Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -22128,35 +22157,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specify the raster position in window coordinates for pixel operations
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify the , , coordinates for the raster position.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ArbWindowPos", Version = "1.0", EntryPoint = "glWindowPos2fvARB")]
-            public static 
-            void WindowPos2(Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glWindowPos2fvARB((Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -22180,30 +22180,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specify the raster position in window coordinates for pixel operations
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify the , , coordinates for the raster position.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbWindowPos", Version = "1.0", EntryPoint = "glWindowPos2ivARB")]
-            public static 
-            unsafe void WindowPos2(Int32* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glWindowPos2ivARB((Int32*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -22270,15 +22246,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , coordinates for the raster position.
         /// </para>
         /// </param>
-            [AutoGenerated(Category = "ArbWindowPos", Version = "1.0", EntryPoint = "glWindowPos2sARB")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbWindowPos", Version = "1.0", EntryPoint = "glWindowPos2ivARB")]
             public static 
-            void WindowPos2(Int16 x, Int16 y)
+            unsafe void WindowPos2(Int32* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glWindowPos2sARB((Int16)x, (Int16)y);
+                Delegates.glWindowPos2ivARB((Int32*)v);
                 #if DEBUG
                 }
                 #endif
@@ -22293,16 +22270,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , coordinates for the raster position.
         /// </para>
         /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbWindowPos", Version = "1.0", EntryPoint = "glWindowPos2svARB")]
+            [AutoGenerated(Category = "ArbWindowPos", Version = "1.0", EntryPoint = "glWindowPos2sARB")]
             public static 
-            unsafe void WindowPos2(Int16* v)
+            void WindowPos2(Int16 x, Int16 y)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glWindowPos2svARB((Int16*)v);
+                Delegates.glWindowPos2sARB((Int16)x, (Int16)y);
                 #if DEBUG
                 }
                 #endif
@@ -22375,15 +22351,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , coordinates for the raster position.
         /// </para>
         /// </param>
-            [AutoGenerated(Category = "ArbWindowPos", Version = "1.0", EntryPoint = "glWindowPos3dARB")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbWindowPos", Version = "1.0", EntryPoint = "glWindowPos2svARB")]
             public static 
-            void WindowPos3(Double x, Double y, Double z)
+            unsafe void WindowPos2(Int16* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glWindowPos3dARB((Double)x, (Double)y, (Double)z);
+                Delegates.glWindowPos2svARB((Int16*)v);
                 #if DEBUG
                 }
                 #endif
@@ -22398,16 +22375,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , coordinates for the raster position.
         /// </para>
         /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbWindowPos", Version = "1.0", EntryPoint = "glWindowPos3dvARB")]
+            [AutoGenerated(Category = "ArbWindowPos", Version = "1.0", EntryPoint = "glWindowPos3dARB")]
             public static 
-            unsafe void WindowPos3(Double* v)
+            void WindowPos3(Double x, Double y, Double z)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glWindowPos3dvARB((Double*)v);
+                Delegates.glWindowPos3dARB((Double)x, (Double)y, (Double)z);
                 #if DEBUG
                 }
                 #endif
@@ -22472,6 +22448,30 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specify the raster position in window coordinates for pixel operations
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify the , , coordinates for the raster position.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbWindowPos", Version = "1.0", EntryPoint = "glWindowPos3dvARB")]
+            public static 
+            unsafe void WindowPos3(Double* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glWindowPos3dvARB((Double*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -22495,6 +22495,35 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specify the raster position in window coordinates for pixel operations
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify the , , coordinates for the raster position.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ArbWindowPos", Version = "1.0", EntryPoint = "glWindowPos3fvARB")]
+            public static 
+            void WindowPos3(Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glWindowPos3fvARB((Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -22548,35 +22577,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specify the raster position in window coordinates for pixel operations
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify the , , coordinates for the raster position.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ArbWindowPos", Version = "1.0", EntryPoint = "glWindowPos3fvARB")]
-            public static 
-            void WindowPos3(Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glWindowPos3fvARB((Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -22600,30 +22600,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specify the raster position in window coordinates for pixel operations
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify the , , coordinates for the raster position.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbWindowPos", Version = "1.0", EntryPoint = "glWindowPos3ivARB")]
-            public static 
-            unsafe void WindowPos3(Int32* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glWindowPos3ivARB((Int32*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -22690,15 +22666,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , coordinates for the raster position.
         /// </para>
         /// </param>
-            [AutoGenerated(Category = "ArbWindowPos", Version = "1.0", EntryPoint = "glWindowPos3sARB")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbWindowPos", Version = "1.0", EntryPoint = "glWindowPos3ivARB")]
             public static 
-            void WindowPos3(Int16 x, Int16 y, Int16 z)
+            unsafe void WindowPos3(Int32* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glWindowPos3sARB((Int16)x, (Int16)y, (Int16)z);
+                Delegates.glWindowPos3ivARB((Int32*)v);
                 #if DEBUG
                 }
                 #endif
@@ -22713,16 +22690,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , coordinates for the raster position.
         /// </para>
         /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ArbWindowPos", Version = "1.0", EntryPoint = "glWindowPos3svARB")]
+            [AutoGenerated(Category = "ArbWindowPos", Version = "1.0", EntryPoint = "glWindowPos3sARB")]
             public static 
-            unsafe void WindowPos3(Int16* v)
+            void WindowPos3(Int16 x, Int16 y, Int16 z)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glWindowPos3svARB((Int16*)v);
+                Delegates.glWindowPos3sARB((Int16)x, (Int16)y, (Int16)z);
                 #if DEBUG
                 }
                 #endif
@@ -22786,6 +22762,30 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            
+        /// <summary>
+        /// Specify the raster position in window coordinates for pixel operations
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify the , , coordinates for the raster position.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ArbWindowPos", Version = "1.0", EntryPoint = "glWindowPos3svARB")]
+            public static 
+            unsafe void WindowPos3(Int16* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glWindowPos3svARB((Int16*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
         }
 
         public static partial class Ati
@@ -23080,35 +23080,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specifies a list of color buffers to be drawn into
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of buffers in bufs.
-        /// </para>
-        /// </param>
-        /// <param name="bufs">
-        /// <para>
-        /// Points to an array of symbolic constants specifying the buffers into which fragment colors or data values will be written.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AtiDrawBuffers", Version = "1.2", EntryPoint = "glDrawBuffersATI")]
-            public static 
-            unsafe void DrawBuffers(Int32 n, OpenTK.Graphics.OpenGL.AtiDrawBuffers* bufs)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glDrawBuffersATI((Int32)n, (OpenTK.Graphics.OpenGL.AtiDrawBuffers*)bufs);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specifies a list of color buffers to be drawn into
         /// </summary>
@@ -23176,6 +23147,35 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            
+        /// <summary>
+        /// Specifies a list of color buffers to be drawn into
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of buffers in bufs.
+        /// </para>
+        /// </param>
+        /// <param name="bufs">
+        /// <para>
+        /// Points to an array of symbolic constants specifying the buffers into which fragment colors or data values will be written.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AtiDrawBuffers", Version = "1.2", EntryPoint = "glDrawBuffersATI")]
+            public static 
+            unsafe void DrawBuffers(Int32 n, OpenTK.Graphics.OpenGL.AtiDrawBuffers* bufs)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glDrawBuffersATI((Int32)n, (OpenTK.Graphics.OpenGL.AtiDrawBuffers*)bufs);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "AtiElementArray", Version = "1.2", EntryPoint = "glDrawElementArrayATI")]
             public static 
             void DrawElementArray(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count)
@@ -23221,23 +23221,13 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AtiElementArray", Version = "1.2", EntryPoint = "glElementPointerATI")]
             public static 
-            void ElementPointer<T1>(OpenTK.Graphics.OpenGL.AtiElementArray type, [InAttribute, OutAttribute] ref T1 pointer)
-                where T1 : struct
+            void ElementPointer(OpenTK.Graphics.OpenGL.AtiElementArray type, IntPtr pointer)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glElementPointerATI((OpenTK.Graphics.OpenGL.AtiElementArray)type, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                    pointer = (T1)pointer_ptr.Target;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
+                Delegates.glElementPointerATI((OpenTK.Graphics.OpenGL.AtiElementArray)type, (IntPtr)pointer);
                 #if DEBUG
                 }
                 #endif
@@ -23245,7 +23235,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AtiElementArray", Version = "1.2", EntryPoint = "glElementPointerATI")]
             public static 
-            void ElementPointer<T1>(OpenTK.Graphics.OpenGL.AtiElementArray type, [InAttribute, OutAttribute] T1[,,] pointer)
+            void ElementPointer<T1>(OpenTK.Graphics.OpenGL.AtiElementArray type, [InAttribute, OutAttribute] T1[] pointer)
                 where T1 : struct
             {
                 #if DEBUG
@@ -23291,7 +23281,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AtiElementArray", Version = "1.2", EntryPoint = "glElementPointerATI")]
             public static 
-            void ElementPointer<T1>(OpenTK.Graphics.OpenGL.AtiElementArray type, [InAttribute, OutAttribute] T1[] pointer)
+            void ElementPointer<T1>(OpenTK.Graphics.OpenGL.AtiElementArray type, [InAttribute, OutAttribute] T1[,,] pointer)
                 where T1 : struct
             {
                 #if DEBUG
@@ -23314,13 +23304,23 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AtiElementArray", Version = "1.2", EntryPoint = "glElementPointerATI")]
             public static 
-            void ElementPointer(OpenTK.Graphics.OpenGL.AtiElementArray type, IntPtr pointer)
+            void ElementPointer<T1>(OpenTK.Graphics.OpenGL.AtiElementArray type, [InAttribute, OutAttribute] ref T1 pointer)
+                where T1 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glElementPointerATI((OpenTK.Graphics.OpenGL.AtiElementArray)type, (IntPtr)pointer);
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glElementPointerATI((OpenTK.Graphics.OpenGL.AtiElementArray)type, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    pointer = (T1)pointer_ptr.Target;
+                }
+                finally
+                {
+                    pointer_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -23434,21 +23434,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AtiVertexArrayObject", Version = "1.2", EntryPoint = "glGetArrayObjectivATI")]
-            public static 
-            unsafe void GetArrayObject(OpenTK.Graphics.OpenGL.EnableCap array, OpenTK.Graphics.OpenGL.AtiVertexArrayObject pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetArrayObjectivATI((OpenTK.Graphics.OpenGL.EnableCap)array, (OpenTK.Graphics.OpenGL.AtiVertexArrayObject)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AtiVertexArrayObject", Version = "1.2", EntryPoint = "glGetArrayObjectivATI")]
             public static 
             void GetArrayObject(OpenTK.Graphics.OpenGL.EnableCap array, OpenTK.Graphics.OpenGL.AtiVertexArrayObject pname, [OutAttribute] out Int32 @params)
@@ -23470,6 +23455,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AtiVertexArrayObject", Version = "1.2", EntryPoint = "glGetArrayObjectivATI")]
+            public static 
+            unsafe void GetArrayObject(OpenTK.Graphics.OpenGL.EnableCap array, OpenTK.Graphics.OpenGL.AtiVertexArrayObject pname, [OutAttribute] Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetArrayObjectivATI((OpenTK.Graphics.OpenGL.EnableCap)array, (OpenTK.Graphics.OpenGL.AtiVertexArrayObject)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "AtiVertexArrayObject", Version = "1.2", EntryPoint = "glGetObjectBufferfvATI")]
             public static 
             void GetObjectBuffer(Int32 buffer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject pname, [OutAttribute] out Single @params)
@@ -23543,6 +23543,27 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "AtiVertexArrayObject", Version = "1.2", EntryPoint = "glGetObjectBufferivATI")]
+            public static 
+            void GetObjectBuffer(Int32 buffer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject pname, [OutAttribute] out Int32 @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Int32* @params_ptr = &@params)
+                    {
+                        Delegates.glGetObjectBufferivATI((UInt32)buffer, (OpenTK.Graphics.OpenGL.AtiVertexArrayObject)pname, (Int32*)@params_ptr);
+                        @params = *@params_ptr;
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AtiVertexArrayObject", Version = "1.2", EntryPoint = "glGetObjectBufferivATI")]
             public static 
@@ -23558,9 +23579,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AtiVertexArrayObject", Version = "1.2", EntryPoint = "glGetObjectBufferivATI")]
             public static 
-            void GetObjectBuffer(Int32 buffer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject pname, [OutAttribute] out Int32 @params)
+            void GetObjectBuffer(UInt32 buffer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject pname, [OutAttribute] out Int32 @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -23594,10 +23616,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AtiVertexArrayObject", Version = "1.2", EntryPoint = "glGetObjectBufferivATI")]
+            [AutoGenerated(Category = "AtiEnvmapBumpmap", Version = "1.2", EntryPoint = "glGetTexBumpParameterfvATI")]
             public static 
-            void GetObjectBuffer(UInt32 buffer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject pname, [OutAttribute] out Int32 @params)
+            void GetTexBumpParameter(OpenTK.Graphics.OpenGL.AtiEnvmapBumpmap pname, [OutAttribute] Single[] param)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -23605,10 +23626,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
                 unsafe
                 {
-                    fixed (Int32* @params_ptr = &@params)
+                    fixed (Single* param_ptr = param)
                     {
-                        Delegates.glGetObjectBufferivATI((UInt32)buffer, (OpenTK.Graphics.OpenGL.AtiVertexArrayObject)pname, (Int32*)@params_ptr);
-                        @params = *@params_ptr;
+                        Delegates.glGetTexBumpParameterfvATI((OpenTK.Graphics.OpenGL.AtiEnvmapBumpmap)pname, (Single*)param_ptr);
                     }
                 }
                 #if DEBUG
@@ -23652,41 +23672,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "AtiEnvmapBumpmap", Version = "1.2", EntryPoint = "glGetTexBumpParameterfvATI")]
-            public static 
-            void GetTexBumpParameter(OpenTK.Graphics.OpenGL.AtiEnvmapBumpmap pname, [OutAttribute] Single[] param)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* param_ptr = param)
-                    {
-                        Delegates.glGetTexBumpParameterfvATI((OpenTK.Graphics.OpenGL.AtiEnvmapBumpmap)pname, (Single*)param_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AtiEnvmapBumpmap", Version = "1.2", EntryPoint = "glGetTexBumpParameterivATI")]
-            public static 
-            unsafe void GetTexBumpParameter(OpenTK.Graphics.OpenGL.AtiEnvmapBumpmap pname, [OutAttribute] Int32* param)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetTexBumpParameterivATI((OpenTK.Graphics.OpenGL.AtiEnvmapBumpmap)pname, (Int32*)param);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AtiEnvmapBumpmap", Version = "1.2", EntryPoint = "glGetTexBumpParameterivATI")]
             public static 
             void GetTexBumpParameter(OpenTK.Graphics.OpenGL.AtiEnvmapBumpmap pname, [OutAttribute] Int32[] param)
@@ -23728,6 +23713,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AtiEnvmapBumpmap", Version = "1.2", EntryPoint = "glGetTexBumpParameterivATI")]
+            public static 
+            unsafe void GetTexBumpParameter(OpenTK.Graphics.OpenGL.AtiEnvmapBumpmap pname, [OutAttribute] Int32* param)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetTexBumpParameterivATI((OpenTK.Graphics.OpenGL.AtiEnvmapBumpmap)pname, (Int32*)param);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "AtiVertexArrayObject", Version = "1.2", EntryPoint = "glGetVariantArrayObjectfvATI")]
             public static 
             void GetVariantArrayObject(Int32 id, OpenTK.Graphics.OpenGL.AtiVertexArrayObject pname, [OutAttribute] out Single @params)
@@ -23801,6 +23801,27 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "AtiVertexArrayObject", Version = "1.2", EntryPoint = "glGetVariantArrayObjectivATI")]
+            public static 
+            void GetVariantArrayObject(Int32 id, OpenTK.Graphics.OpenGL.AtiVertexArrayObject pname, [OutAttribute] out Int32 @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Int32* @params_ptr = &@params)
+                    {
+                        Delegates.glGetVariantArrayObjectivATI((UInt32)id, (OpenTK.Graphics.OpenGL.AtiVertexArrayObject)pname, (Int32*)@params_ptr);
+                        @params = *@params_ptr;
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AtiVertexArrayObject", Version = "1.2", EntryPoint = "glGetVariantArrayObjectivATI")]
             public static 
@@ -23816,9 +23837,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AtiVertexArrayObject", Version = "1.2", EntryPoint = "glGetVariantArrayObjectivATI")]
             public static 
-            void GetVariantArrayObject(Int32 id, OpenTK.Graphics.OpenGL.AtiVertexArrayObject pname, [OutAttribute] out Int32 @params)
+            void GetVariantArrayObject(UInt32 id, OpenTK.Graphics.OpenGL.AtiVertexArrayObject pname, [OutAttribute] out Int32 @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -23852,10 +23874,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AtiVertexArrayObject", Version = "1.2", EntryPoint = "glGetVariantArrayObjectivATI")]
+            [AutoGenerated(Category = "AtiVertexAttribArrayObject", Version = "1.2", EntryPoint = "glGetVertexAttribArrayObjectfvATI")]
             public static 
-            void GetVariantArrayObject(UInt32 id, OpenTK.Graphics.OpenGL.AtiVertexArrayObject pname, [OutAttribute] out Int32 @params)
+            void GetVertexAttribArrayObject(Int32 index, OpenTK.Graphics.OpenGL.AtiVertexAttribArrayObject pname, [OutAttribute] Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -23863,10 +23884,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
                 unsafe
                 {
-                    fixed (Int32* @params_ptr = &@params)
+                    fixed (Single* @params_ptr = @params)
                     {
-                        Delegates.glGetVariantArrayObjectivATI((UInt32)id, (OpenTK.Graphics.OpenGL.AtiVertexArrayObject)pname, (Int32*)@params_ptr);
-                        @params = *@params_ptr;
+                        Delegates.glGetVertexAttribArrayObjectfvATI((UInt32)index, (OpenTK.Graphics.OpenGL.AtiVertexAttribArrayObject)pname, (Single*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -23910,9 +23930,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AtiVertexAttribArrayObject", Version = "1.2", EntryPoint = "glGetVertexAttribArrayObjectfvATI")]
             public static 
-            void GetVertexAttribArrayObject(Int32 index, OpenTK.Graphics.OpenGL.AtiVertexAttribArrayObject pname, [OutAttribute] Single[] @params)
+            void GetVertexAttribArrayObject(UInt32 index, OpenTK.Graphics.OpenGL.AtiVertexAttribArrayObject pname, [OutAttribute] Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -23967,42 +23988,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AtiVertexAttribArrayObject", Version = "1.2", EntryPoint = "glGetVertexAttribArrayObjectfvATI")]
-            public static 
-            void GetVertexAttribArrayObject(UInt32 index, OpenTK.Graphics.OpenGL.AtiVertexAttribArrayObject pname, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetVertexAttribArrayObjectfvATI((UInt32)index, (OpenTK.Graphics.OpenGL.AtiVertexAttribArrayObject)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AtiVertexAttribArrayObject", Version = "1.2", EntryPoint = "glGetVertexAttribArrayObjectivATI")]
-            public static 
-            unsafe void GetVertexAttribArrayObject(Int32 index, OpenTK.Graphics.OpenGL.AtiVertexAttribArrayObject pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetVertexAttribArrayObjectivATI((UInt32)index, (OpenTK.Graphics.OpenGL.AtiVertexAttribArrayObject)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AtiVertexAttribArrayObject", Version = "1.2", EntryPoint = "glGetVertexAttribArrayObjectivATI")]
             public static 
             void GetVertexAttribArrayObject(Int32 index, OpenTK.Graphics.OpenGL.AtiVertexAttribArrayObject pname, [OutAttribute] Int32[] @params)
@@ -24047,7 +24032,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AtiVertexAttribArrayObject", Version = "1.2", EntryPoint = "glGetVertexAttribArrayObjectivATI")]
             public static 
-            unsafe void GetVertexAttribArrayObject(UInt32 index, OpenTK.Graphics.OpenGL.AtiVertexAttribArrayObject pname, [OutAttribute] Int32* @params)
+            unsafe void GetVertexAttribArrayObject(Int32 index, OpenTK.Graphics.OpenGL.AtiVertexAttribArrayObject pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24102,6 +24087,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AtiVertexAttribArrayObject", Version = "1.2", EntryPoint = "glGetVertexAttribArrayObjectivATI")]
+            public static 
+            unsafe void GetVertexAttribArrayObject(UInt32 index, OpenTK.Graphics.OpenGL.AtiVertexAttribArrayObject pname, [OutAttribute] Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetVertexAttribArrayObjectivATI((UInt32)index, (OpenTK.Graphics.OpenGL.AtiVertexAttribArrayObject)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "AtiVertexArrayObject", Version = "1.2", EntryPoint = "glIsObjectBufferATI")]
             public static 
             bool IsObjectBuffer(Int32 buffer)
@@ -24163,24 +24163,13 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AtiVertexArrayObject", Version = "1.2", EntryPoint = "glNewObjectBufferATI")]
             public static 
-            Int32 NewObjectBuffer<T1>(Int32 size, [InAttribute, OutAttribute] ref T1 pointer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject usage)
-                where T1 : struct
+            Int32 NewObjectBuffer(Int32 size, IntPtr pointer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject usage)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Int32 retval = Delegates.glNewObjectBufferATI((Int32)size, (IntPtr)pointer_ptr.AddrOfPinnedObject(), (OpenTK.Graphics.OpenGL.AtiVertexArrayObject)usage);
-                    pointer = (T1)pointer_ptr.Target;
-                    return retval;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
+                return Delegates.glNewObjectBufferATI((Int32)size, (IntPtr)pointer, (OpenTK.Graphics.OpenGL.AtiVertexArrayObject)usage);
                 #if DEBUG
                 }
                 #endif
@@ -24188,7 +24177,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AtiVertexArrayObject", Version = "1.2", EntryPoint = "glNewObjectBufferATI")]
             public static 
-            Int32 NewObjectBuffer<T1>(Int32 size, [InAttribute, OutAttribute] T1[,,] pointer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject usage)
+            Int32 NewObjectBuffer<T1>(Int32 size, [InAttribute, OutAttribute] T1[] pointer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject usage)
                 where T1 : struct
             {
                 #if DEBUG
@@ -24234,7 +24223,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AtiVertexArrayObject", Version = "1.2", EntryPoint = "glNewObjectBufferATI")]
             public static 
-            Int32 NewObjectBuffer<T1>(Int32 size, [InAttribute, OutAttribute] T1[] pointer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject usage)
+            Int32 NewObjectBuffer<T1>(Int32 size, [InAttribute, OutAttribute] T1[,,] pointer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject usage)
                 where T1 : struct
             {
                 #if DEBUG
@@ -24257,13 +24246,24 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AtiVertexArrayObject", Version = "1.2", EntryPoint = "glNewObjectBufferATI")]
             public static 
-            Int32 NewObjectBuffer(Int32 size, IntPtr pointer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject usage)
+            Int32 NewObjectBuffer<T1>(Int32 size, [InAttribute, OutAttribute] ref T1 pointer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject usage)
+                where T1 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                return Delegates.glNewObjectBufferATI((Int32)size, (IntPtr)pointer, (OpenTK.Graphics.OpenGL.AtiVertexArrayObject)usage);
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                try
+                {
+                    Int32 retval = Delegates.glNewObjectBufferATI((Int32)size, (IntPtr)pointer_ptr.AddrOfPinnedObject(), (OpenTK.Graphics.OpenGL.AtiVertexArrayObject)usage);
+                    pointer = (T1)pointer_ptr.Target;
+                    return retval;
+                }
+                finally
+                {
+                    pointer_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -24298,21 +24298,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glNormalStream3bvATI")]
-            public static 
-            unsafe void NormalStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Byte* coords)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glNormalStream3bvATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (SByte*)coords);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glNormalStream3bvATI")]
             public static 
             void NormalStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Byte[] coords)
@@ -24353,6 +24338,42 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glNormalStream3bvATI")]
+            public static 
+            unsafe void NormalStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Byte* coords)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glNormalStream3bvATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (SByte*)coords);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glNormalStream3bvATI")]
+            public static 
+            void NormalStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, SByte[] coords)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (SByte* coords_ptr = coords)
+                    {
+                        Delegates.glNormalStream3bvATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (SByte*)coords_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glNormalStream3bvATI")]
             public static 
@@ -24389,27 +24410,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glNormalStream3bvATI")]
-            public static 
-            void NormalStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, SByte[] coords)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (SByte* coords_ptr = coords)
-                    {
-                        Delegates.glNormalStream3bvATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (SByte*)coords_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glNormalStream3dATI")]
             public static 
             void NormalStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Double nx, Double ny, Double nz)
@@ -24424,21 +24424,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glNormalStream3dvATI")]
-            public static 
-            unsafe void NormalStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Double* coords)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glNormalStream3dvATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Double*)coords);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glNormalStream3dvATI")]
             public static 
             void NormalStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Double[] coords)
@@ -24479,6 +24464,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glNormalStream3dvATI")]
+            public static 
+            unsafe void NormalStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Double* coords)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glNormalStream3dvATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Double*)coords);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glNormalStream3fATI")]
             public static 
             void NormalStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Single nx, Single ny, Single nz)
@@ -24493,6 +24493,26 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glNormalStream3fvATI")]
+            public static 
+            void NormalStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Single[] coords)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* coords_ptr = coords)
+                    {
+                        Delegates.glNormalStream3fvATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Single*)coords_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glNormalStream3fvATI")]
             public static 
             void NormalStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, ref Single coords)
@@ -24528,26 +24548,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glNormalStream3fvATI")]
-            public static 
-            void NormalStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Single[] coords)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* coords_ptr = coords)
-                    {
-                        Delegates.glNormalStream3fvATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Single*)coords_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glNormalStream3iATI")]
             public static 
             void NormalStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int32 nx, Int32 ny, Int32 nz)
@@ -24562,21 +24562,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glNormalStream3ivATI")]
-            public static 
-            unsafe void NormalStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int32* coords)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glNormalStream3ivATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Int32*)coords);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glNormalStream3ivATI")]
             public static 
             void NormalStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int32[] coords)
@@ -24617,6 +24602,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glNormalStream3ivATI")]
+            public static 
+            unsafe void NormalStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int32* coords)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glNormalStream3ivATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Int32*)coords);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glNormalStream3sATI")]
             public static 
             void NormalStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int16 nx, Int16 ny, Int16 nz)
@@ -24631,21 +24631,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glNormalStream3svATI")]
-            public static 
-            unsafe void NormalStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int16* coords)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glNormalStream3svATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Int16*)coords);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glNormalStream3svATI")]
             public static 
             void NormalStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int16[] coords)
@@ -24686,6 +24671,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glNormalStream3svATI")]
+            public static 
+            unsafe void NormalStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int16* coords)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glNormalStream3svATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Int16*)coords);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "AtiFragmentShader", Version = "1.2", EntryPoint = "glPassTexCoordATI")]
             public static 
             void PassTexCoor(Int32 dst, Int32 coord, OpenTK.Graphics.OpenGL.AtiFragmentShader swizzle)
@@ -24772,6 +24772,26 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "AtiFragmentShader", Version = "1.2", EntryPoint = "glSetFragmentShaderConstantATI")]
+            public static 
+            void SetFragmentShaderConstant(Int32 dst, Single[] value)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* value_ptr = value)
+                    {
+                        Delegates.glSetFragmentShaderConstantATI((UInt32)dst, (Single*)value_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "AtiFragmentShader", Version = "1.2", EntryPoint = "glSetFragmentShaderConstantATI")]
             public static 
             void SetFragmentShaderConstant(Int32 dst, ref Single value)
@@ -24807,9 +24827,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AtiFragmentShader", Version = "1.2", EntryPoint = "glSetFragmentShaderConstantATI")]
             public static 
-            void SetFragmentShaderConstant(Int32 dst, Single[] value)
+            void SetFragmentShaderConstant(UInt32 dst, Single[] value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -24863,27 +24884,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AtiFragmentShader", Version = "1.2", EntryPoint = "glSetFragmentShaderConstantATI")]
-            public static 
-            void SetFragmentShaderConstant(UInt32 dst, Single[] value)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* value_ptr = value)
-                    {
-                        Delegates.glSetFragmentShaderConstantATI((UInt32)dst, (Single*)value_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             
         /// <summary>
         /// Set front and/or back function and reference value for stencil testing
@@ -24999,6 +24999,26 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "AtiEnvmapBumpmap", Version = "1.2", EntryPoint = "glTexBumpParameterfvATI")]
+            public static 
+            void TexBumpParameter(OpenTK.Graphics.OpenGL.AtiEnvmapBumpmap pname, Single[] param)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* param_ptr = param)
+                    {
+                        Delegates.glTexBumpParameterfvATI((OpenTK.Graphics.OpenGL.AtiEnvmapBumpmap)pname, (Single*)param_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "AtiEnvmapBumpmap", Version = "1.2", EntryPoint = "glTexBumpParameterfvATI")]
             public static 
             void TexBumpParameter(OpenTK.Graphics.OpenGL.AtiEnvmapBumpmap pname, ref Single param)
@@ -25034,41 +25054,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "AtiEnvmapBumpmap", Version = "1.2", EntryPoint = "glTexBumpParameterfvATI")]
-            public static 
-            void TexBumpParameter(OpenTK.Graphics.OpenGL.AtiEnvmapBumpmap pname, Single[] param)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* param_ptr = param)
-                    {
-                        Delegates.glTexBumpParameterfvATI((OpenTK.Graphics.OpenGL.AtiEnvmapBumpmap)pname, (Single*)param_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AtiEnvmapBumpmap", Version = "1.2", EntryPoint = "glTexBumpParameterivATI")]
-            public static 
-            unsafe void TexBumpParameter(OpenTK.Graphics.OpenGL.AtiEnvmapBumpmap pname, Int32* param)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glTexBumpParameterivATI((OpenTK.Graphics.OpenGL.AtiEnvmapBumpmap)pname, (Int32*)param);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AtiEnvmapBumpmap", Version = "1.2", EntryPoint = "glTexBumpParameterivATI")]
             public static 
             void TexBumpParameter(OpenTK.Graphics.OpenGL.AtiEnvmapBumpmap pname, Int32[] param)
@@ -25109,6 +25094,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AtiEnvmapBumpmap", Version = "1.2", EntryPoint = "glTexBumpParameterivATI")]
+            public static 
+            unsafe void TexBumpParameter(OpenTK.Graphics.OpenGL.AtiEnvmapBumpmap pname, Int32* param)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTexBumpParameterivATI((OpenTK.Graphics.OpenGL.AtiEnvmapBumpmap)pname, (Int32*)param);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "AtiMapObjectBuffer", Version = "1.2", EntryPoint = "glUnmapObjectBufferATI")]
             public static 
             void UnmapObjectBuffer(Int32 buffer)
@@ -25140,23 +25140,13 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AtiVertexArrayObject", Version = "1.2", EntryPoint = "glUpdateObjectBufferATI")]
             public static 
-            void UpdateObjectBuffer<T3>(Int32 buffer, Int32 offset, Int32 size, [InAttribute, OutAttribute] ref T3 pointer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject preserve)
-                where T3 : struct
+            void UpdateObjectBuffer(Int32 buffer, Int32 offset, Int32 size, IntPtr pointer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject preserve)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glUpdateObjectBufferATI((UInt32)buffer, (UInt32)offset, (Int32)size, (IntPtr)pointer_ptr.AddrOfPinnedObject(), (OpenTK.Graphics.OpenGL.AtiVertexArrayObject)preserve);
-                    pointer = (T3)pointer_ptr.Target;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
+                Delegates.glUpdateObjectBufferATI((UInt32)buffer, (UInt32)offset, (Int32)size, (IntPtr)pointer, (OpenTK.Graphics.OpenGL.AtiVertexArrayObject)preserve);
                 #if DEBUG
                 }
                 #endif
@@ -25164,7 +25154,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AtiVertexArrayObject", Version = "1.2", EntryPoint = "glUpdateObjectBufferATI")]
             public static 
-            void UpdateObjectBuffer<T3>(Int32 buffer, Int32 offset, Int32 size, [InAttribute, OutAttribute] T3[,,] pointer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject preserve)
+            void UpdateObjectBuffer<T3>(Int32 buffer, Int32 offset, Int32 size, [InAttribute, OutAttribute] T3[] pointer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject preserve)
                 where T3 : struct
             {
                 #if DEBUG
@@ -25210,7 +25200,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AtiVertexArrayObject", Version = "1.2", EntryPoint = "glUpdateObjectBufferATI")]
             public static 
-            void UpdateObjectBuffer<T3>(Int32 buffer, Int32 offset, Int32 size, [InAttribute, OutAttribute] T3[] pointer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject preserve)
+            void UpdateObjectBuffer<T3>(Int32 buffer, Int32 offset, Int32 size, [InAttribute, OutAttribute] T3[,,] pointer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject preserve)
                 where T3 : struct
             {
                 #if DEBUG
@@ -25233,22 +25223,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "AtiVertexArrayObject", Version = "1.2", EntryPoint = "glUpdateObjectBufferATI")]
             public static 
-            void UpdateObjectBuffer(Int32 buffer, Int32 offset, Int32 size, IntPtr pointer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject preserve)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glUpdateObjectBufferATI((UInt32)buffer, (UInt32)offset, (Int32)size, (IntPtr)pointer, (OpenTK.Graphics.OpenGL.AtiVertexArrayObject)preserve);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AtiVertexArrayObject", Version = "1.2", EntryPoint = "glUpdateObjectBufferATI")]
-            public static 
-            void UpdateObjectBuffer<T3>(UInt32 buffer, UInt32 offset, Int32 size, [InAttribute, OutAttribute] ref T3 pointer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject preserve)
+            void UpdateObjectBuffer<T3>(Int32 buffer, Int32 offset, Int32 size, [InAttribute, OutAttribute] ref T3 pointer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject preserve)
                 where T3 : struct
             {
                 #if DEBUG
@@ -25273,7 +25248,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AtiVertexArrayObject", Version = "1.2", EntryPoint = "glUpdateObjectBufferATI")]
             public static 
-            void UpdateObjectBuffer<T3>(UInt32 buffer, UInt32 offset, Int32 size, [InAttribute, OutAttribute] T3[,,] pointer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject preserve)
+            void UpdateObjectBuffer(UInt32 buffer, UInt32 offset, Int32 size, IntPtr pointer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject preserve)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glUpdateObjectBufferATI((UInt32)buffer, (UInt32)offset, (Int32)size, (IntPtr)pointer, (OpenTK.Graphics.OpenGL.AtiVertexArrayObject)preserve);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AtiVertexArrayObject", Version = "1.2", EntryPoint = "glUpdateObjectBufferATI")]
+            public static 
+            void UpdateObjectBuffer<T3>(UInt32 buffer, UInt32 offset, Int32 size, [InAttribute, OutAttribute] T3[] pointer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject preserve)
                 where T3 : struct
             {
                 #if DEBUG
@@ -25321,7 +25311,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AtiVertexArrayObject", Version = "1.2", EntryPoint = "glUpdateObjectBufferATI")]
             public static 
-            void UpdateObjectBuffer<T3>(UInt32 buffer, UInt32 offset, Int32 size, [InAttribute, OutAttribute] T3[] pointer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject preserve)
+            void UpdateObjectBuffer<T3>(UInt32 buffer, UInt32 offset, Int32 size, [InAttribute, OutAttribute] T3[,,] pointer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject preserve)
                 where T3 : struct
             {
                 #if DEBUG
@@ -25345,13 +25335,23 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "AtiVertexArrayObject", Version = "1.2", EntryPoint = "glUpdateObjectBufferATI")]
             public static 
-            void UpdateObjectBuffer(UInt32 buffer, UInt32 offset, Int32 size, IntPtr pointer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject preserve)
+            void UpdateObjectBuffer<T3>(UInt32 buffer, UInt32 offset, Int32 size, [InAttribute, OutAttribute] ref T3 pointer, OpenTK.Graphics.OpenGL.AtiVertexArrayObject preserve)
+                where T3 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glUpdateObjectBufferATI((UInt32)buffer, (UInt32)offset, (Int32)size, (IntPtr)pointer, (OpenTK.Graphics.OpenGL.AtiVertexArrayObject)preserve);
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glUpdateObjectBufferATI((UInt32)buffer, (UInt32)offset, (Int32)size, (IntPtr)pointer_ptr.AddrOfPinnedObject(), (OpenTK.Graphics.OpenGL.AtiVertexArrayObject)preserve);
+                    pointer = (T3)pointer_ptr.Target;
+                }
+                finally
+                {
+                    pointer_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -25573,21 +25573,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream2dvATI")]
-            public static 
-            unsafe void VertexStream2(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Double* coords)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexStream2dvATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Double*)coords);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream2dvATI")]
             public static 
             void VertexStream2(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Double[] coords)
@@ -25628,6 +25613,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream2dvATI")]
+            public static 
+            unsafe void VertexStream2(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Double* coords)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexStream2dvATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Double*)coords);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream2fATI")]
             public static 
             void VertexStream2(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Single x, Single y)
@@ -25642,6 +25642,26 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream2fvATI")]
+            public static 
+            void VertexStream2(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Single[] coords)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* coords_ptr = coords)
+                    {
+                        Delegates.glVertexStream2fvATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Single*)coords_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream2fvATI")]
             public static 
             void VertexStream2(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, ref Single coords)
@@ -25677,26 +25697,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream2fvATI")]
-            public static 
-            void VertexStream2(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Single[] coords)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* coords_ptr = coords)
-                    {
-                        Delegates.glVertexStream2fvATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Single*)coords_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream2iATI")]
             public static 
             void VertexStream2(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int32 x, Int32 y)
@@ -25711,21 +25711,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream2ivATI")]
-            public static 
-            unsafe void VertexStream2(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int32* coords)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexStream2ivATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Int32*)coords);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream2ivATI")]
             public static 
             void VertexStream2(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int32[] coords)
@@ -25766,6 +25751,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream2ivATI")]
+            public static 
+            unsafe void VertexStream2(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int32* coords)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexStream2ivATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Int32*)coords);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream2sATI")]
             public static 
             void VertexStream2(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int16 x, Int16 y)
@@ -25780,21 +25780,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream2svATI")]
-            public static 
-            unsafe void VertexStream2(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int16* coords)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexStream2svATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Int16*)coords);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream2svATI")]
             public static 
             void VertexStream2(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int16[] coords)
@@ -25835,6 +25820,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream2svATI")]
+            public static 
+            unsafe void VertexStream2(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int16* coords)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexStream2svATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Int16*)coords);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream3dATI")]
             public static 
             void VertexStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Double x, Double y, Double z)
@@ -25849,21 +25849,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream3dvATI")]
-            public static 
-            unsafe void VertexStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Double* coords)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexStream3dvATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Double*)coords);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream3dvATI")]
             public static 
             void VertexStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Double[] coords)
@@ -25904,6 +25889,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream3dvATI")]
+            public static 
+            unsafe void VertexStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Double* coords)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexStream3dvATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Double*)coords);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream3fATI")]
             public static 
             void VertexStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Single x, Single y, Single z)
@@ -25918,6 +25918,26 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream3fvATI")]
+            public static 
+            void VertexStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Single[] coords)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* coords_ptr = coords)
+                    {
+                        Delegates.glVertexStream3fvATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Single*)coords_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream3fvATI")]
             public static 
             void VertexStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, ref Single coords)
@@ -25953,26 +25973,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream3fvATI")]
-            public static 
-            void VertexStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Single[] coords)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* coords_ptr = coords)
-                    {
-                        Delegates.glVertexStream3fvATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Single*)coords_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream3iATI")]
             public static 
             void VertexStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int32 x, Int32 y, Int32 z)
@@ -25987,21 +25987,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream3ivATI")]
-            public static 
-            unsafe void VertexStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int32* coords)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexStream3ivATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Int32*)coords);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream3ivATI")]
             public static 
             void VertexStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int32[] coords)
@@ -26042,6 +26027,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream3ivATI")]
+            public static 
+            unsafe void VertexStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int32* coords)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexStream3ivATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Int32*)coords);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream3sATI")]
             public static 
             void VertexStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int16 x, Int16 y, Int16 z)
@@ -26056,21 +26056,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream3svATI")]
-            public static 
-            unsafe void VertexStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int16* coords)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexStream3svATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Int16*)coords);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream3svATI")]
             public static 
             void VertexStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int16[] coords)
@@ -26111,6 +26096,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream3svATI")]
+            public static 
+            unsafe void VertexStream3(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int16* coords)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexStream3svATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Int16*)coords);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream4dATI")]
             public static 
             void VertexStream4(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Double x, Double y, Double z, Double w)
@@ -26125,21 +26125,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream4dvATI")]
-            public static 
-            unsafe void VertexStream4(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Double* coords)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexStream4dvATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Double*)coords);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream4dvATI")]
             public static 
             void VertexStream4(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Double[] coords)
@@ -26180,6 +26165,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream4dvATI")]
+            public static 
+            unsafe void VertexStream4(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Double* coords)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexStream4dvATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Double*)coords);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream4fATI")]
             public static 
             void VertexStream4(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Single x, Single y, Single z, Single w)
@@ -26194,6 +26194,26 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream4fvATI")]
+            public static 
+            void VertexStream4(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Single[] coords)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* coords_ptr = coords)
+                    {
+                        Delegates.glVertexStream4fvATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Single*)coords_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream4fvATI")]
             public static 
             void VertexStream4(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, ref Single coords)
@@ -26229,26 +26249,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream4fvATI")]
-            public static 
-            void VertexStream4(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Single[] coords)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* coords_ptr = coords)
-                    {
-                        Delegates.glVertexStream4fvATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Single*)coords_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream4iATI")]
             public static 
             void VertexStream4(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int32 x, Int32 y, Int32 z, Int32 w)
@@ -26263,21 +26263,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream4ivATI")]
-            public static 
-            unsafe void VertexStream4(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int32* coords)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexStream4ivATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Int32*)coords);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream4ivATI")]
             public static 
             void VertexStream4(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int32[] coords)
@@ -26318,6 +26303,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream4ivATI")]
+            public static 
+            unsafe void VertexStream4(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int32* coords)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexStream4ivATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Int32*)coords);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream4sATI")]
             public static 
             void VertexStream4(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int16 x, Int16 y, Int16 z, Int16 w)
@@ -26332,21 +26332,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream4svATI")]
-            public static 
-            unsafe void VertexStream4(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int16* coords)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexStream4svATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Int16*)coords);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream4svATI")]
             public static 
             void VertexStream4(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int16[] coords)
@@ -26387,6 +26372,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "AtiVertexStreams", Version = "1.2", EntryPoint = "glVertexStream4svATI")]
+            public static 
+            unsafe void VertexStream4(OpenTK.Graphics.OpenGL.AtiVertexStreams stream, Int16* coords)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexStream4svATI((OpenTK.Graphics.OpenGL.AtiVertexStreams)stream, (Int16*)coords);
+                #if DEBUG
+                }
+                #endif
+            }
+
         }
 
         
@@ -26469,40 +26469,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Determine if textures are loaded in texture memory
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of textures to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="textures">
-        /// <para>
-        /// Specifies an array containing the names of the textures to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="residences">
-        /// <para>
-        /// Specifies an array in which the texture residence status is returned. The residence status of a texture named by an element of textures is returned in the corresponding element of residences.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glAreTexturesResident")]
-        public static 
-        unsafe bool AreTexturesResident(Int32 n, Int32* textures, [OutAttribute] bool* residences)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            return Delegates.glAreTexturesResident((Int32)n, (UInt32*)textures, (bool*)residences);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Determine if textures are loaded in texture memory
         /// </summary>
@@ -26585,6 +26551,81 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Determine if textures are loaded in texture memory
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of textures to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="textures">
+        /// <para>
+        /// Specifies an array containing the names of the textures to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="residences">
+        /// <para>
+        /// Specifies an array in which the texture residence status is returned. The residence status of a texture named by an element of textures is returned in the corresponding element of residences.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glAreTexturesResident")]
+        public static 
+        unsafe bool AreTexturesResident(Int32 n, Int32* textures, [OutAttribute] bool* residences)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            return Delegates.glAreTexturesResident((Int32)n, (UInt32*)textures, (bool*)residences);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Determine if textures are loaded in texture memory
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of textures to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="textures">
+        /// <para>
+        /// Specifies an array containing the names of the textures to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="residences">
+        /// <para>
+        /// Specifies an array in which the texture residence status is returned. The residence status of a texture named by an element of textures is returned in the corresponding element of residences.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glAreTexturesResident")]
+        public static 
+        bool AreTexturesResident(Int32 n, UInt32[] textures, [OutAttribute] bool[] residences)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* textures_ptr = textures)
+                fixed (bool* residences_ptr = residences)
+                {
+                    return Delegates.glAreTexturesResident((Int32)n, (UInt32*)textures_ptr, (bool*)residences_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Determine if textures are loaded in texture memory
         /// </summary>
@@ -26662,47 +26703,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Determine if textures are loaded in texture memory
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of textures to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="textures">
-        /// <para>
-        /// Specifies an array containing the names of the textures to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="residences">
-        /// <para>
-        /// Specifies an array in which the texture residence status is returned. The residence status of a texture named by an element of textures is returned in the corresponding element of residences.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glAreTexturesResident")]
-        public static 
-        bool AreTexturesResident(Int32 n, UInt32[] textures, [OutAttribute] bool[] residences)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* textures_ptr = textures)
-                fixed (bool* residences_ptr = residences)
-                {
-                    return Delegates.glAreTexturesResident((Int32)n, (UInt32*)textures_ptr, (bool*)residences_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Render a vertex using the specified vertex array element
         /// </summary>
@@ -27262,45 +27262,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Draw a bitmap
-        /// </summary>
-        /// <param name="width">
-        /// <para>
-        /// Specify the pixel width and height of the bitmap image.
-        /// </para>
-        /// </param>
-        /// <param name="xorig">
-        /// <para>
-        /// Specify the location of the origin in the bitmap image. The origin is measured from the lower left corner of the bitmap, with right and up being the positive axes.
-        /// </para>
-        /// </param>
-        /// <param name="xmove">
-        /// <para>
-        /// Specify the x and y offsets to be added to the current raster position after the bitmap is drawn.
-        /// </para>
-        /// </param>
-        /// <param name="bitmap">
-        /// <para>
-        /// Specifies the address of the bitmap image.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glBitmap")]
-        public static 
-        unsafe void Bitmap(Int32 width, Int32 height, Single xorig, Single yorig, Single xmove, Single ymove, Byte* bitmap)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glBitmap((Int32)width, (Int32)height, (Single)xorig, (Single)yorig, (Single)xmove, (Single)ymove, (Byte*)bitmap);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Draw a bitmap
         /// </summary>
@@ -27389,6 +27350,45 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Draw a bitmap
+        /// </summary>
+        /// <param name="width">
+        /// <para>
+        /// Specify the pixel width and height of the bitmap image.
+        /// </para>
+        /// </param>
+        /// <param name="xorig">
+        /// <para>
+        /// Specify the location of the origin in the bitmap image. The origin is measured from the lower left corner of the bitmap, with right and up being the positive axes.
+        /// </para>
+        /// </param>
+        /// <param name="xmove">
+        /// <para>
+        /// Specify the x and y offsets to be added to the current raster position after the bitmap is drawn.
+        /// </para>
+        /// </param>
+        /// <param name="bitmap">
+        /// <para>
+        /// Specifies the address of the bitmap image.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glBitmap")]
+        public static 
+        unsafe void Bitmap(Int32 width, Int32 height, Single xorig, Single yorig, Single xmove, Single ymove, Byte* bitmap)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glBitmap((Int32)width, (Int32)height, (Single)xorig, (Single)yorig, (Single)xmove, (Single)ymove, (Byte*)bitmap);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the blend color
         /// </summary>
@@ -27806,23 +27806,13 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glBufferData")]
         public static 
-        void BufferData<T2>(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr size, [InAttribute, OutAttribute] ref T2 data, OpenTK.Graphics.OpenGL.BufferUsageHint usage)
-            where T2 : struct
+        void BufferData(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr size, IntPtr data, OpenTK.Graphics.OpenGL.BufferUsageHint usage)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glBufferData((OpenTK.Graphics.OpenGL.BufferTarget)target, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject(), (OpenTK.Graphics.OpenGL.BufferUsageHint)usage);
-                data = (T2)data_ptr.Target;
-            }
-            finally
-            {
-                data_ptr.Free();
-            }
+            Delegates.glBufferData((OpenTK.Graphics.OpenGL.BufferTarget)target, (IntPtr)size, (IntPtr)data, (OpenTK.Graphics.OpenGL.BufferUsageHint)usage);
             #if DEBUG
             }
             #endif
@@ -27854,7 +27844,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glBufferData")]
         public static 
-        void BufferData<T2>(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr size, [InAttribute, OutAttribute] T2[,,] data, OpenTK.Graphics.OpenGL.BufferUsageHint usage)
+        void BufferData<T2>(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr size, [InAttribute, OutAttribute] T2[] data, OpenTK.Graphics.OpenGL.BufferUsageHint usage)
             where T2 : struct
         {
             #if DEBUG
@@ -27948,7 +27938,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glBufferData")]
         public static 
-        void BufferData<T2>(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr size, [InAttribute, OutAttribute] T2[] data, OpenTK.Graphics.OpenGL.BufferUsageHint usage)
+        void BufferData<T2>(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr size, [InAttribute, OutAttribute] T2[,,] data, OpenTK.Graphics.OpenGL.BufferUsageHint usage)
             where T2 : struct
         {
             #if DEBUG
@@ -27995,46 +27985,8 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glBufferData")]
         public static 
-        void BufferData(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr size, IntPtr data, OpenTK.Graphics.OpenGL.BufferUsageHint usage)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glBufferData((OpenTK.Graphics.OpenGL.BufferTarget)target, (IntPtr)size, (IntPtr)data, (OpenTK.Graphics.OpenGL.BufferUsageHint)usage);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Updates a subset of a buffer object's data store
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target buffer object. The symbolic constant must be GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, or GL_PIXEL_UNPACK_BUFFER.
-        /// </para>
-        /// </param>
-        /// <param name="offset">
-        /// <para>
-        /// Specifies the offset into the buffer object's data store where data replacement will begin, measured in bytes.
-        /// </para>
-        /// </param>
-        /// <param name="size">
-        /// <para>
-        /// Specifies the size in bytes of the data store region being replaced.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the new data that will be copied into the data store.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glBufferSubData")]
-        public static 
-        void BufferSubData<T3>(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] ref T3 data)
-            where T3 : struct
+        void BufferData<T2>(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr size, [InAttribute, OutAttribute] ref T2 data, OpenTK.Graphics.OpenGL.BufferUsageHint usage)
+            where T2 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -28043,8 +27995,8 @@ namespace OpenTK.Graphics.OpenGL
             GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
             try
             {
-                Delegates.glBufferSubData((OpenTK.Graphics.OpenGL.BufferTarget)target, (IntPtr)offset, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject());
-                data = (T3)data_ptr.Target;
+                Delegates.glBufferData((OpenTK.Graphics.OpenGL.BufferTarget)target, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject(), (OpenTK.Graphics.OpenGL.BufferUsageHint)usage);
+                data = (T2)data_ptr.Target;
             }
             finally
             {
@@ -28081,7 +28033,45 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glBufferSubData")]
         public static 
-        void BufferSubData<T3>(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[,,] data)
+        void BufferSubData(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr offset, IntPtr size, IntPtr data)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glBufferSubData((OpenTK.Graphics.OpenGL.BufferTarget)target, (IntPtr)offset, (IntPtr)size, (IntPtr)data);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Updates a subset of a buffer object's data store
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target buffer object. The symbolic constant must be GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, or GL_PIXEL_UNPACK_BUFFER.
+        /// </para>
+        /// </param>
+        /// <param name="offset">
+        /// <para>
+        /// Specifies the offset into the buffer object's data store where data replacement will begin, measured in bytes.
+        /// </para>
+        /// </param>
+        /// <param name="size">
+        /// <para>
+        /// Specifies the size in bytes of the data store region being replaced.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the new data that will be copied into the data store.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glBufferSubData")]
+        public static 
+        void BufferSubData<T3>(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[] data)
             where T3 : struct
         {
             #if DEBUG
@@ -28175,7 +28165,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glBufferSubData")]
         public static 
-        void BufferSubData<T3>(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[] data)
+        void BufferSubData<T3>(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[,,] data)
             where T3 : struct
         {
             #if DEBUG
@@ -28222,13 +28212,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glBufferSubData")]
         public static 
-        void BufferSubData(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr offset, IntPtr size, IntPtr data)
+        void BufferSubData<T3>(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] ref T3 data)
+            where T3 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glBufferSubData((OpenTK.Graphics.OpenGL.BufferTarget)target, (IntPtr)offset, (IntPtr)size, (IntPtr)data);
+            GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glBufferSubData((OpenTK.Graphics.OpenGL.BufferTarget)target, (IntPtr)offset, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject());
+                data = (T3)data_ptr.Target;
+            }
+            finally
+            {
+                data_ptr.Free();
+            }
             #if DEBUG
             }
             #endif
@@ -28302,23 +28302,13 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glCallLists")]
         public static 
-        void CallLists<T2>(Int32 n, OpenTK.Graphics.OpenGL.ListNameType type, [InAttribute, OutAttribute] ref T2 lists)
-            where T2 : struct
+        void CallLists(Int32 n, OpenTK.Graphics.OpenGL.ListNameType type, IntPtr lists)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle lists_ptr = GCHandle.Alloc(lists, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glCallLists((Int32)n, (OpenTK.Graphics.OpenGL.ListNameType)type, (IntPtr)lists_ptr.AddrOfPinnedObject());
-                lists = (T2)lists_ptr.Target;
-            }
-            finally
-            {
-                lists_ptr.Free();
-            }
+            Delegates.glCallLists((Int32)n, (OpenTK.Graphics.OpenGL.ListNameType)type, (IntPtr)lists);
             #if DEBUG
             }
             #endif
@@ -28345,7 +28335,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glCallLists")]
         public static 
-        void CallLists<T2>(Int32 n, OpenTK.Graphics.OpenGL.ListNameType type, [InAttribute, OutAttribute] T2[,,] lists)
+        void CallLists<T2>(Int32 n, OpenTK.Graphics.OpenGL.ListNameType type, [InAttribute, OutAttribute] T2[] lists)
             where T2 : struct
         {
             #if DEBUG
@@ -28429,7 +28419,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glCallLists")]
         public static 
-        void CallLists<T2>(Int32 n, OpenTK.Graphics.OpenGL.ListNameType type, [InAttribute, OutAttribute] T2[] lists)
+        void CallLists<T2>(Int32 n, OpenTK.Graphics.OpenGL.ListNameType type, [InAttribute, OutAttribute] T2[,,] lists)
             where T2 : struct
         {
             #if DEBUG
@@ -28471,13 +28461,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glCallLists")]
         public static 
-        void CallLists(Int32 n, OpenTK.Graphics.OpenGL.ListNameType type, IntPtr lists)
+        void CallLists<T2>(Int32 n, OpenTK.Graphics.OpenGL.ListNameType type, [InAttribute, OutAttribute] ref T2 lists)
+            where T2 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glCallLists((Int32)n, (OpenTK.Graphics.OpenGL.ListNameType)type, (IntPtr)lists);
+            GCHandle lists_ptr = GCHandle.Alloc(lists, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glCallLists((Int32)n, (OpenTK.Graphics.OpenGL.ListNameType)type, (IntPtr)lists_ptr.AddrOfPinnedObject());
+                lists = (T2)lists_ptr.Target;
+            }
+            finally
+            {
+                lists_ptr.Free();
+            }
             #if DEBUG
             }
             #endif
@@ -28571,6 +28571,26 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glClearBufferfv")]
+        public static 
+        void ClearBuffer(OpenTK.Graphics.OpenGL.ClearBuffer buffer, Int32 drawbuffer, Single[] value)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* value_ptr = value)
+                {
+                    Delegates.glClearBufferfv((OpenTK.Graphics.OpenGL.ClearBuffer)buffer, (Int32)drawbuffer, (Single*)value_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glClearBufferfv")]
         public static 
         void ClearBuffer(OpenTK.Graphics.OpenGL.ClearBuffer buffer, Int32 drawbuffer, ref Single value)
@@ -28606,41 +28626,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glClearBufferfv")]
-        public static 
-        void ClearBuffer(OpenTK.Graphics.OpenGL.ClearBuffer buffer, Int32 drawbuffer, Single[] value)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* value_ptr = value)
-                {
-                    Delegates.glClearBufferfv((OpenTK.Graphics.OpenGL.ClearBuffer)buffer, (Int32)drawbuffer, (Single*)value_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glClearBufferiv")]
-        public static 
-        unsafe void ClearBuffer(OpenTK.Graphics.OpenGL.ClearBuffer buffer, Int32 drawbuffer, Int32* value)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glClearBufferiv((OpenTK.Graphics.OpenGL.ClearBuffer)buffer, (Int32)drawbuffer, (Int32*)value);
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glClearBufferiv")]
         public static 
         void ClearBuffer(OpenTK.Graphics.OpenGL.ClearBuffer buffer, Int32 drawbuffer, Int32[] value)
@@ -28681,6 +28666,42 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glClearBufferiv")]
+        public static 
+        unsafe void ClearBuffer(OpenTK.Graphics.OpenGL.ClearBuffer buffer, Int32 drawbuffer, Int32* value)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glClearBufferiv((OpenTK.Graphics.OpenGL.ClearBuffer)buffer, (Int32)drawbuffer, (Int32*)value);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glClearBufferuiv")]
+        public static 
+        void ClearBuffer(OpenTK.Graphics.OpenGL.ClearBuffer buffer, Int32 drawbuffer, UInt32[] value)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* value_ptr = value)
+                {
+                    Delegates.glClearBufferuiv((OpenTK.Graphics.OpenGL.ClearBuffer)buffer, (Int32)drawbuffer, (UInt32*)value_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glClearBufferuiv")]
         public static 
@@ -28717,27 +28738,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glClearBufferuiv")]
-        public static 
-        void ClearBuffer(OpenTK.Graphics.OpenGL.ClearBuffer buffer, Int32 drawbuffer, UInt32[] value)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* value_ptr = value)
-                {
-                    Delegates.glClearBufferuiv((OpenTK.Graphics.OpenGL.ClearBuffer)buffer, (Int32)drawbuffer, (UInt32*)value_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
         
         /// <summary>
         /// Specify clear values for the color buffers
@@ -28883,35 +28883,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specify a plane against which all geometry is clipped
-        /// </summary>
-        /// <param name="plane">
-        /// <para>
-        /// Specifies which clipping plane is being positioned. Symbolic names of the form GL_CLIP_PLANEi, where i is an integer between 0 and GL_MAX_CLIP_PLANES - 1, are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="equation">
-        /// <para>
-        /// Specifies the address of an array of four double-precision floating-point values. These values are interpreted as a plane equation.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glClipPlane")]
-        public static 
-        unsafe void ClipPlane(OpenTK.Graphics.OpenGL.ClipPlaneName plane, Double* equation)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glClipPlane((OpenTK.Graphics.OpenGL.ClipPlaneName)plane, (Double*)equation);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify a plane against which all geometry is clipped
         /// </summary>
@@ -28980,6 +28951,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specify a plane against which all geometry is clipped
+        /// </summary>
+        /// <param name="plane">
+        /// <para>
+        /// Specifies which clipping plane is being positioned. Symbolic names of the form GL_CLIP_PLANEi, where i is an integer between 0 and GL_MAX_CLIP_PLANES - 1, are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="equation">
+        /// <para>
+        /// Specifies the address of an array of four double-precision floating-point values. These values are interpreted as a plane equation.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glClipPlane")]
+        public static 
+        unsafe void ClipPlane(OpenTK.Graphics.OpenGL.ClipPlaneName plane, Double* equation)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glClipPlane((OpenTK.Graphics.OpenGL.ClipPlaneName)plane, (Double*)equation);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current color
         /// </summary>
@@ -29009,6 +29009,41 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the current color
+        /// </summary>
+        /// <param name="red">
+        /// <para>
+        /// Specify new red, green, and blue values for the current color.
+        /// </para>
+        /// </param>
+        /// <param name="alpha">
+        /// <para>
+        /// Specifies a new alpha value for the current color. Included only in the four-argument glColor4 commands.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor3bv")]
+        public static 
+        void Color3(SByte[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (SByte* v_ptr = v)
+                {
+                    Delegates.glColor3bv((SByte*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current color
         /// </summary>
@@ -29073,41 +29108,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current color
-        /// </summary>
-        /// <param name="red">
-        /// <para>
-        /// Specify new red, green, and blue values for the current color.
-        /// </para>
-        /// </param>
-        /// <param name="alpha">
-        /// <para>
-        /// Specifies a new alpha value for the current color. Included only in the four-argument glColor4 commands.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor3bv")]
-        public static 
-        void Color3(SByte[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (SByte* v_ptr = v)
-                {
-                    Delegates.glColor3bv((SByte*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current color
         /// </summary>
@@ -29136,35 +29136,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current color
-        /// </summary>
-        /// <param name="red">
-        /// <para>
-        /// Specify new red, green, and blue values for the current color.
-        /// </para>
-        /// </param>
-        /// <param name="alpha">
-        /// <para>
-        /// Specifies a new alpha value for the current color. Included only in the four-argument glColor4 commands.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor3dv")]
-        public static 
-        unsafe void Color3(Double* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glColor3dv((Double*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current color
         /// </summary>
@@ -29233,6 +29204,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the current color
+        /// </summary>
+        /// <param name="red">
+        /// <para>
+        /// Specify new red, green, and blue values for the current color.
+        /// </para>
+        /// </param>
+        /// <param name="alpha">
+        /// <para>
+        /// Specifies a new alpha value for the current color. Included only in the four-argument glColor4 commands.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor3dv")]
+        public static 
+        unsafe void Color3(Double* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glColor3dv((Double*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current color
         /// </summary>
@@ -29261,6 +29261,40 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the current color
+        /// </summary>
+        /// <param name="red">
+        /// <para>
+        /// Specify new red, green, and blue values for the current color.
+        /// </para>
+        /// </param>
+        /// <param name="alpha">
+        /// <para>
+        /// Specifies a new alpha value for the current color. Included only in the four-argument glColor4 commands.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor3fv")]
+        public static 
+        void Color3(Single[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* v_ptr = v)
+                {
+                    Delegates.glColor3fv((Single*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current color
         /// </summary>
@@ -29324,40 +29358,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current color
-        /// </summary>
-        /// <param name="red">
-        /// <para>
-        /// Specify new red, green, and blue values for the current color.
-        /// </para>
-        /// </param>
-        /// <param name="alpha">
-        /// <para>
-        /// Specifies a new alpha value for the current color. Included only in the four-argument glColor4 commands.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor3fv")]
-        public static 
-        void Color3(Single[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* v_ptr = v)
-                {
-                    Delegates.glColor3fv((Single*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current color
         /// </summary>
@@ -29386,35 +29386,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current color
-        /// </summary>
-        /// <param name="red">
-        /// <para>
-        /// Specify new red, green, and blue values for the current color.
-        /// </para>
-        /// </param>
-        /// <param name="alpha">
-        /// <para>
-        /// Specifies a new alpha value for the current color. Included only in the four-argument glColor4 commands.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor3iv")]
-        public static 
-        unsafe void Color3(Int32* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glColor3iv((Int32*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current color
         /// </summary>
@@ -29496,15 +29467,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies a new alpha value for the current color. Included only in the four-argument glColor4 commands.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor3s")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor3iv")]
         public static 
-        void Color3(Int16 red, Int16 green, Int16 blue)
+        unsafe void Color3(Int32* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glColor3s((Int16)red, (Int16)green, (Int16)blue);
+            Delegates.glColor3iv((Int32*)v);
             #if DEBUG
             }
             #endif
@@ -29524,16 +29496,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies a new alpha value for the current color. Included only in the four-argument glColor4 commands.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor3sv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor3s")]
         public static 
-        unsafe void Color3(Int16* v)
+        void Color3(Int16 red, Int16 green, Int16 blue)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glColor3sv((Int16*)v);
+            Delegates.glColor3s((Int16)red, (Int16)green, (Int16)blue);
             #if DEBUG
             }
             #endif
@@ -29621,15 +29592,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies a new alpha value for the current color. Included only in the four-argument glColor4 commands.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor3ub")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor3sv")]
         public static 
-        void Color3(Byte red, Byte green, Byte blue)
+        unsafe void Color3(Int16* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glColor3ub((Byte)red, (Byte)green, (Byte)blue);
+            Delegates.glColor3sv((Int16*)v);
             #if DEBUG
             }
             #endif
@@ -29649,16 +29621,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies a new alpha value for the current color. Included only in the four-argument glColor4 commands.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor3ubv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor3ub")]
         public static 
-        unsafe void Color3(Byte* v)
+        void Color3(Byte red, Byte green, Byte blue)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glColor3ubv((Byte*)v);
+            Delegates.glColor3ub((Byte)red, (Byte)green, (Byte)blue);
             #if DEBUG
             }
             #endif
@@ -29733,6 +29704,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the current color
+        /// </summary>
+        /// <param name="red">
+        /// <para>
+        /// Specify new red, green, and blue values for the current color.
+        /// </para>
+        /// </param>
+        /// <param name="alpha">
+        /// <para>
+        /// Specifies a new alpha value for the current color. Included only in the four-argument glColor4 commands.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor3ubv")]
+        public static 
+        unsafe void Color3(Byte* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glColor3ubv((Byte*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current color
         /// </summary>
@@ -29762,6 +29762,41 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the current color
+        /// </summary>
+        /// <param name="red">
+        /// <para>
+        /// Specify new red, green, and blue values for the current color.
+        /// </para>
+        /// </param>
+        /// <param name="alpha">
+        /// <para>
+        /// Specifies a new alpha value for the current color. Included only in the four-argument glColor4 commands.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor3uiv")]
+        public static 
+        void Color3(UInt32[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* v_ptr = v)
+                {
+                    Delegates.glColor3uiv((UInt32*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current color
         /// </summary>
@@ -29840,21 +29875,15 @@ namespace OpenTK.Graphics.OpenGL
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor3uiv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor3us")]
         public static 
-        void Color3(UInt32[] v)
+        void Color3(UInt16 red, UInt16 green, UInt16 blue)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            unsafe
-            {
-                fixed (UInt32* v_ptr = v)
-                {
-                    Delegates.glColor3uiv((UInt32*)v_ptr);
-                }
-            }
+            Delegates.glColor3us((UInt16)red, (UInt16)green, (UInt16)blue);
             #if DEBUG
             }
             #endif
@@ -29875,15 +29904,21 @@ namespace OpenTK.Graphics.OpenGL
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor3us")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor3usv")]
         public static 
-        void Color3(UInt16 red, UInt16 green, UInt16 blue)
+        void Color3(UInt16[] v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glColor3us((UInt16)red, (UInt16)green, (UInt16)blue);
+            unsafe
+            {
+                fixed (UInt16* v_ptr = v)
+                {
+                    Delegates.glColor3usv((UInt16*)v_ptr);
+                }
+            }
             #if DEBUG
             }
             #endif
@@ -29968,21 +30003,15 @@ namespace OpenTK.Graphics.OpenGL
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor3usv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor4b")]
         public static 
-        void Color3(UInt16[] v)
+        void Color4(SByte red, SByte green, SByte blue, SByte alpha)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            unsafe
-            {
-                fixed (UInt16* v_ptr = v)
-                {
-                    Delegates.glColor3usv((UInt16*)v_ptr);
-                }
-            }
+            Delegates.glColor4b((SByte)red, (SByte)green, (SByte)blue, (SByte)alpha);
             #if DEBUG
             }
             #endif
@@ -30003,15 +30032,21 @@ namespace OpenTK.Graphics.OpenGL
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor4b")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor4bv")]
         public static 
-        void Color4(SByte red, SByte green, SByte blue, SByte alpha)
+        void Color4(SByte[] v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glColor4b((SByte)red, (SByte)green, (SByte)blue, (SByte)alpha);
+            unsafe
+            {
+                fixed (SByte* v_ptr = v)
+                {
+                    Delegates.glColor4bv((SByte*)v_ptr);
+                }
+            }
             #if DEBUG
             }
             #endif
@@ -30082,41 +30117,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current color
-        /// </summary>
-        /// <param name="red">
-        /// <para>
-        /// Specify new red, green, and blue values for the current color.
-        /// </para>
-        /// </param>
-        /// <param name="alpha">
-        /// <para>
-        /// Specifies a new alpha value for the current color. Included only in the four-argument glColor4 commands.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor4bv")]
-        public static 
-        void Color4(SByte[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (SByte* v_ptr = v)
-                {
-                    Delegates.glColor4bv((SByte*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current color
         /// </summary>
@@ -30145,35 +30145,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current color
-        /// </summary>
-        /// <param name="red">
-        /// <para>
-        /// Specify new red, green, and blue values for the current color.
-        /// </para>
-        /// </param>
-        /// <param name="alpha">
-        /// <para>
-        /// Specifies a new alpha value for the current color. Included only in the four-argument glColor4 commands.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor4dv")]
-        public static 
-        unsafe void Color4(Double* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glColor4dv((Double*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current color
         /// </summary>
@@ -30242,6 +30213,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the current color
+        /// </summary>
+        /// <param name="red">
+        /// <para>
+        /// Specify new red, green, and blue values for the current color.
+        /// </para>
+        /// </param>
+        /// <param name="alpha">
+        /// <para>
+        /// Specifies a new alpha value for the current color. Included only in the four-argument glColor4 commands.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor4dv")]
+        public static 
+        unsafe void Color4(Double* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glColor4dv((Double*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current color
         /// </summary>
@@ -30270,6 +30270,40 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the current color
+        /// </summary>
+        /// <param name="red">
+        /// <para>
+        /// Specify new red, green, and blue values for the current color.
+        /// </para>
+        /// </param>
+        /// <param name="alpha">
+        /// <para>
+        /// Specifies a new alpha value for the current color. Included only in the four-argument glColor4 commands.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor4fv")]
+        public static 
+        void Color4(Single[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* v_ptr = v)
+                {
+                    Delegates.glColor4fv((Single*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current color
         /// </summary>
@@ -30333,40 +30367,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current color
-        /// </summary>
-        /// <param name="red">
-        /// <para>
-        /// Specify new red, green, and blue values for the current color.
-        /// </para>
-        /// </param>
-        /// <param name="alpha">
-        /// <para>
-        /// Specifies a new alpha value for the current color. Included only in the four-argument glColor4 commands.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor4fv")]
-        public static 
-        void Color4(Single[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* v_ptr = v)
-                {
-                    Delegates.glColor4fv((Single*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current color
         /// </summary>
@@ -30395,35 +30395,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current color
-        /// </summary>
-        /// <param name="red">
-        /// <para>
-        /// Specify new red, green, and blue values for the current color.
-        /// </para>
-        /// </param>
-        /// <param name="alpha">
-        /// <para>
-        /// Specifies a new alpha value for the current color. Included only in the four-argument glColor4 commands.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor4iv")]
-        public static 
-        unsafe void Color4(Int32* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glColor4iv((Int32*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current color
         /// </summary>
@@ -30505,15 +30476,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies a new alpha value for the current color. Included only in the four-argument glColor4 commands.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor4s")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor4iv")]
         public static 
-        void Color4(Int16 red, Int16 green, Int16 blue, Int16 alpha)
+        unsafe void Color4(Int32* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glColor4s((Int16)red, (Int16)green, (Int16)blue, (Int16)alpha);
+            Delegates.glColor4iv((Int32*)v);
             #if DEBUG
             }
             #endif
@@ -30533,16 +30505,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies a new alpha value for the current color. Included only in the four-argument glColor4 commands.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor4sv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor4s")]
         public static 
-        unsafe void Color4(Int16* v)
+        void Color4(Int16 red, Int16 green, Int16 blue, Int16 alpha)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glColor4sv((Int16*)v);
+            Delegates.glColor4s((Int16)red, (Int16)green, (Int16)blue, (Int16)alpha);
             #if DEBUG
             }
             #endif
@@ -30630,15 +30601,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies a new alpha value for the current color. Included only in the four-argument glColor4 commands.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor4ub")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor4sv")]
         public static 
-        void Color4(Byte red, Byte green, Byte blue, Byte alpha)
+        unsafe void Color4(Int16* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glColor4ub((Byte)red, (Byte)green, (Byte)blue, (Byte)alpha);
+            Delegates.glColor4sv((Int16*)v);
             #if DEBUG
             }
             #endif
@@ -30658,16 +30630,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies a new alpha value for the current color. Included only in the four-argument glColor4 commands.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor4ubv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor4ub")]
         public static 
-        unsafe void Color4(Byte* v)
+        void Color4(Byte red, Byte green, Byte blue, Byte alpha)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glColor4ubv((Byte*)v);
+            Delegates.glColor4ub((Byte)red, (Byte)green, (Byte)blue, (Byte)alpha);
             #if DEBUG
             }
             #endif
@@ -30742,6 +30713,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the current color
+        /// </summary>
+        /// <param name="red">
+        /// <para>
+        /// Specify new red, green, and blue values for the current color.
+        /// </para>
+        /// </param>
+        /// <param name="alpha">
+        /// <para>
+        /// Specifies a new alpha value for the current color. Included only in the four-argument glColor4 commands.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor4ubv")]
+        public static 
+        unsafe void Color4(Byte* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glColor4ubv((Byte*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current color
         /// </summary>
@@ -30771,6 +30771,41 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the current color
+        /// </summary>
+        /// <param name="red">
+        /// <para>
+        /// Specify new red, green, and blue values for the current color.
+        /// </para>
+        /// </param>
+        /// <param name="alpha">
+        /// <para>
+        /// Specifies a new alpha value for the current color. Included only in the four-argument glColor4 commands.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor4uiv")]
+        public static 
+        void Color4(UInt32[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* v_ptr = v)
+                {
+                    Delegates.glColor4uiv((UInt32*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current color
         /// </summary>
@@ -30849,21 +30884,15 @@ namespace OpenTK.Graphics.OpenGL
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor4uiv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor4us")]
         public static 
-        void Color4(UInt32[] v)
+        void Color4(UInt16 red, UInt16 green, UInt16 blue, UInt16 alpha)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            unsafe
-            {
-                fixed (UInt32* v_ptr = v)
-                {
-                    Delegates.glColor4uiv((UInt32*)v_ptr);
-                }
-            }
+            Delegates.glColor4us((UInt16)red, (UInt16)green, (UInt16)blue, (UInt16)alpha);
             #if DEBUG
             }
             #endif
@@ -30884,15 +30913,21 @@ namespace OpenTK.Graphics.OpenGL
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor4us")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor4usv")]
         public static 
-        void Color4(UInt16 red, UInt16 green, UInt16 blue, UInt16 alpha)
+        void Color4(UInt16[] v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glColor4us((UInt16)red, (UInt16)green, (UInt16)blue, (UInt16)alpha);
+            unsafe
+            {
+                fixed (UInt16* v_ptr = v)
+                {
+                    Delegates.glColor4usv((UInt16*)v_ptr);
+                }
+            }
             #if DEBUG
             }
             #endif
@@ -30963,41 +30998,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current color
-        /// </summary>
-        /// <param name="red">
-        /// <para>
-        /// Specify new red, green, and blue values for the current color.
-        /// </para>
-        /// </param>
-        /// <param name="alpha">
-        /// <para>
-        /// Specifies a new alpha value for the current color. Included only in the four-argument glColor4 commands.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glColor4usv")]
-        public static 
-        void Color4(UInt16[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt16* v_ptr = v)
-                {
-                    Delegates.glColor4usv((UInt16*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Enable and disable writing of frame buffer color components
         /// </summary>
@@ -31121,23 +31121,13 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glColorPointer")]
         public static 
-        void ColorPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T3 pointer)
-            where T3 : struct
+        void ColorPointer(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, IntPtr pointer)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glColorPointer((Int32)size, (OpenTK.Graphics.OpenGL.ColorPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                pointer = (T3)pointer_ptr.Target;
-            }
-            finally
-            {
-                pointer_ptr.Free();
-            }
+            Delegates.glColorPointer((Int32)size, (OpenTK.Graphics.OpenGL.ColorPointerType)type, (Int32)stride, (IntPtr)pointer);
             #if DEBUG
             }
             #endif
@@ -31169,7 +31159,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glColorPointer")]
         public static 
-        void ColorPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[,,] pointer)
+        void ColorPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[] pointer)
             where T3 : struct
         {
             #if DEBUG
@@ -31263,7 +31253,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glColorPointer")]
         public static 
-        void ColorPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[] pointer)
+        void ColorPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[,,] pointer)
             where T3 : struct
         {
             #if DEBUG
@@ -31310,70 +31300,22 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glColorPointer")]
         public static 
-        void ColorPointer(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, IntPtr pointer)
+        void ColorPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T3 pointer)
+            where T3 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glColorPointer((Int32)size, (OpenTK.Graphics.OpenGL.ColorPointerType)type, (Int32)stride, (IntPtr)pointer);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Respecify a portion of a color table
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Must be one of GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, or GL_POST_COLOR_MATRIX_COLOR_TABLE.
-        /// </para>
-        /// </param>
-        /// <param name="start">
-        /// <para>
-        /// The starting index of the portion of the color table to be replaced.
-        /// </para>
-        /// </param>
-        /// <param name="count">
-        /// <para>
-        /// The number of table entries to replace.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// The format of the pixel data in data. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_RGB, GL_BGR, GL_RGBA, and GL_BGRA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// The type of the pixel data in data. The allowable values are GL_UNSIGNED_BYTE, GL_BYTE, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Pointer to a one-dimensional array of pixel data that is processed to replace the specified region of the color table.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glColorSubTable")]
-        public static 
-        void ColorSubTable<T5>(OpenTK.Graphics.OpenGL.ColorTableTarget target, Int32 start, Int32 count, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T5 data)
-            where T5 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
+            GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
             try
             {
-                Delegates.glColorSubTable((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (Int32)start, (Int32)count, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)data_ptr.AddrOfPinnedObject());
-                data = (T5)data_ptr.Target;
+                Delegates.glColorPointer((Int32)size, (OpenTK.Graphics.OpenGL.ColorPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                pointer = (T3)pointer_ptr.Target;
             }
             finally
             {
-                data_ptr.Free();
+                pointer_ptr.Free();
             }
             #if DEBUG
             }
@@ -31416,7 +31358,55 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glColorSubTable")]
         public static 
-        void ColorSubTable<T5>(OpenTK.Graphics.OpenGL.ColorTableTarget target, Int32 start, Int32 count, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[,,] data)
+        void ColorSubTable(OpenTK.Graphics.OpenGL.ColorTableTarget target, Int32 start, Int32 count, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr data)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glColorSubTable((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (Int32)start, (Int32)count, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)data);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Respecify a portion of a color table
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be one of GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, or GL_POST_COLOR_MATRIX_COLOR_TABLE.
+        /// </para>
+        /// </param>
+        /// <param name="start">
+        /// <para>
+        /// The starting index of the portion of the color table to be replaced.
+        /// </para>
+        /// </param>
+        /// <param name="count">
+        /// <para>
+        /// The number of table entries to replace.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// The format of the pixel data in data. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_RGB, GL_BGR, GL_RGBA, and GL_BGRA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// The type of the pixel data in data. The allowable values are GL_UNSIGNED_BYTE, GL_BYTE, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Pointer to a one-dimensional array of pixel data that is processed to replace the specified region of the color table.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glColorSubTable")]
+        public static 
+        void ColorSubTable<T5>(OpenTK.Graphics.OpenGL.ColorTableTarget target, Int32 start, Int32 count, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[] data)
             where T5 : struct
         {
             #if DEBUG
@@ -31530,7 +31520,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glColorSubTable")]
         public static 
-        void ColorSubTable<T5>(OpenTK.Graphics.OpenGL.ColorTableTarget target, Int32 start, Int32 count, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[] data)
+        void ColorSubTable<T5>(OpenTK.Graphics.OpenGL.ColorTableTarget target, Int32 start, Int32 count, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[,,] data)
             where T5 : struct
         {
             #if DEBUG
@@ -31587,70 +31577,22 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glColorSubTable")]
         public static 
-        void ColorSubTable(OpenTK.Graphics.OpenGL.ColorTableTarget target, Int32 start, Int32 count, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr data)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glColorSubTable((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (Int32)start, (Int32)count, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)data);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Define a color lookup table
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Must be one of GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, GL_POST_COLOR_MATRIX_COLOR_TABLE, GL_PROXY_COLOR_TABLE, GL_PROXY_POST_CONVOLUTION_COLOR_TABLE, or GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE.
-        /// </para>
-        /// </param>
-        /// <param name="internalformat">
-        /// <para>
-        /// The internal format of the color table. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, and GL_RGBA16.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// The number of entries in the color lookup table specified by data.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// The format of the pixel data in data. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_RGB, GL_BGR, GL_RGBA, and GL_BGRA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// The type of the pixel data in data. The allowable values are GL_UNSIGNED_BYTE, GL_BYTE, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Pointer to a one-dimensional array of pixel data that is processed to build the color table.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glColorTable")]
-        public static 
-        void ColorTable<T5>(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T5 table)
+        void ColorSubTable<T5>(OpenTK.Graphics.OpenGL.ColorTableTarget target, Int32 start, Int32 count, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T5 data)
             where T5 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle table_ptr = GCHandle.Alloc(table, GCHandleType.Pinned);
+            GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
             try
             {
-                Delegates.glColorTable((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)table_ptr.AddrOfPinnedObject());
-                table = (T5)table_ptr.Target;
+                Delegates.glColorSubTable((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (Int32)start, (Int32)count, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)data_ptr.AddrOfPinnedObject());
+                data = (T5)data_ptr.Target;
             }
             finally
             {
-                table_ptr.Free();
+                data_ptr.Free();
             }
             #if DEBUG
             }
@@ -31693,7 +31635,55 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glColorTable")]
         public static 
-        void ColorTable<T5>(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[,,] table)
+        void ColorTable(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr table)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glColorTable((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)table);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Define a color lookup table
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be one of GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, GL_POST_COLOR_MATRIX_COLOR_TABLE, GL_PROXY_COLOR_TABLE, GL_PROXY_POST_CONVOLUTION_COLOR_TABLE, or GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE.
+        /// </para>
+        /// </param>
+        /// <param name="internalformat">
+        /// <para>
+        /// The internal format of the color table. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, and GL_RGBA16.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// The number of entries in the color lookup table specified by data.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// The format of the pixel data in data. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_RGB, GL_BGR, GL_RGBA, and GL_BGRA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// The type of the pixel data in data. The allowable values are GL_UNSIGNED_BYTE, GL_BYTE, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Pointer to a one-dimensional array of pixel data that is processed to build the color table.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glColorTable")]
+        public static 
+        void ColorTable<T5>(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[] table)
             where T5 : struct
         {
             #if DEBUG
@@ -31807,7 +31797,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glColorTable")]
         public static 
-        void ColorTable<T5>(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[] table)
+        void ColorTable<T5>(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[,,] table)
             where T5 : struct
         {
             #if DEBUG
@@ -31864,13 +31854,62 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glColorTable")]
         public static 
-        void ColorTable(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr table)
+        void ColorTable<T5>(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T5 table)
+            where T5 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glColorTable((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)table);
+            GCHandle table_ptr = GCHandle.Alloc(table, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glColorTable((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)table_ptr.AddrOfPinnedObject());
+                table = (T5)table_ptr.Target;
+            }
+            finally
+            {
+                table_ptr.Free();
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Set color lookup table parameters
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The target color table. Must be GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, or GL_POST_COLOR_MATRIX_COLOR_TABLE.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// The symbolic name of a texture color lookup table parameter. Must be one of GL_COLOR_TABLE_SCALE or GL_COLOR_TABLE_BIAS.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// A pointer to an array where the values of the parameters are stored.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glColorTableParameterfv")]
+        public static 
+        void ColorTableParameter(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.ColorTableParameterPName pname, Single[] @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* @params_ptr = @params)
+                {
+                    Delegates.glColorTableParameterfv((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (OpenTK.Graphics.OpenGL.ColorTableParameterPName)pname, (Single*)@params_ptr);
+                }
+            }
             #if DEBUG
             }
             #endif
@@ -31950,79 +31989,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set color lookup table parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The target color table. Must be GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, or GL_POST_COLOR_MATRIX_COLOR_TABLE.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// The symbolic name of a texture color lookup table parameter. Must be one of GL_COLOR_TABLE_SCALE or GL_COLOR_TABLE_BIAS.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// A pointer to an array where the values of the parameters are stored.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glColorTableParameterfv")]
-        public static 
-        void ColorTableParameter(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.ColorTableParameterPName pname, Single[] @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* @params_ptr = @params)
-                {
-                    Delegates.glColorTableParameterfv((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (OpenTK.Graphics.OpenGL.ColorTableParameterPName)pname, (Single*)@params_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Set color lookup table parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The target color table. Must be GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, or GL_POST_COLOR_MATRIX_COLOR_TABLE.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// The symbolic name of a texture color lookup table parameter. Must be one of GL_COLOR_TABLE_SCALE or GL_COLOR_TABLE_BIAS.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// A pointer to an array where the values of the parameters are stored.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glColorTableParameteriv")]
-        public static 
-        unsafe void ColorTableParameter(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.ColorTableParameterPName pname, Int32* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glColorTableParameteriv((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (OpenTK.Graphics.OpenGL.ColorTableParameterPName)pname, (Int32*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set color lookup table parameters
         /// </summary>
@@ -32101,6 +32067,40 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set color lookup table parameters
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The target color table. Must be GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, or GL_POST_COLOR_MATRIX_COLOR_TABLE.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// The symbolic name of a texture color lookup table parameter. Must be one of GL_COLOR_TABLE_SCALE or GL_COLOR_TABLE_BIAS.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// A pointer to an array where the values of the parameters are stored.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glColorTableParameteriv")]
+        public static 
+        unsafe void ColorTableParameter(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.ColorTableParameterPName pname, Int32* @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glColorTableParameteriv((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (OpenTK.Graphics.OpenGL.ColorTableParameterPName)pname, (Int32*)@params);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Compiles a shader object
         /// </summary>
@@ -32188,23 +32188,13 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glCompressedTexImage1D")]
         public static 
-        void CompressedTexImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T6 data)
-            where T6 : struct
+        void CompressedTexImage1D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 border, Int32 imageSize, IntPtr data)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glCompressedTexImage1D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
-                data = (T6)data_ptr.Target;
-            }
-            finally
-            {
-                data_ptr.Free();
-            }
+            Delegates.glCompressedTexImage1D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)border, (Int32)imageSize, (IntPtr)data);
             #if DEBUG
             }
             #endif
@@ -32251,7 +32241,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glCompressedTexImage1D")]
         public static 
-        void CompressedTexImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T6[,,] data)
+        void CompressedTexImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T6[] data)
             where T6 : struct
         {
             #if DEBUG
@@ -32375,7 +32365,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glCompressedTexImage1D")]
         public static 
-        void CompressedTexImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T6[] data)
+        void CompressedTexImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T6[,,] data)
             where T6 : struct
         {
             #if DEBUG
@@ -32437,66 +32427,8 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glCompressedTexImage1D")]
         public static 
-        void CompressedTexImage1D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 border, Int32 imageSize, IntPtr data)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glCompressedTexImage1D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)border, (Int32)imageSize, (IntPtr)data);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Specify a two-dimensional texture image in a compressed format
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target texture. Must be GL_TEXTURE_2D, GL_PROXY_TEXTURE_2D, GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, or GL_PROXY_TEXTURE_CUBE_MAP.
-        /// </para>
-        /// </param>
-        /// <param name="level">
-        /// <para>
-        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
-        /// </para>
-        /// </param>
-        /// <param name="internalformat">
-        /// <para>
-        /// Specifies the format of the compressed image data stored at address data.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// Specifies the width of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup n + 2 ( border ) for some integer . All implementations support 2D texture images that are at least 64 texels wide and cube-mapped texture images that are at least 16 texels wide.
-        /// </para>
-        /// </param>
-        /// <param name="height">
-        /// <para>
-        /// Specifies the height of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be Must be 2 sup n + 2 ( border ) for some integer . All implementations support 2D texture images that are at least 64 texels high and cube-mapped texture images that are at least 16 texels high.
-        /// </para>
-        /// </param>
-        /// <param name="border">
-        /// <para>
-        /// Specifies the width of the border. Must be either 0 or 1.
-        /// </para>
-        /// </param>
-        /// <param name="imageSize">
-        /// <para>
-        /// Specifies the number of unsigned bytes of image data starting at the address specified by data.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the compressed image data in memory.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glCompressedTexImage2D")]
-        public static 
-        void CompressedTexImage2D<T7>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T7 data)
-            where T7 : struct
+        void CompressedTexImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T6 data)
+            where T6 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -32505,8 +32437,8 @@ namespace OpenTK.Graphics.OpenGL
             GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
             try
             {
-                Delegates.glCompressedTexImage2D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
-                data = (T7)data_ptr.Target;
+                Delegates.glCompressedTexImage1D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                data = (T6)data_ptr.Target;
             }
             finally
             {
@@ -32563,7 +32495,65 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glCompressedTexImage2D")]
         public static 
-        void CompressedTexImage2D<T7>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[,,] data)
+        void CompressedTexImage2D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, IntPtr data)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glCompressedTexImage2D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)data);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Specify a two-dimensional texture image in a compressed format
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target texture. Must be GL_TEXTURE_2D, GL_PROXY_TEXTURE_2D, GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, or GL_PROXY_TEXTURE_CUBE_MAP.
+        /// </para>
+        /// </param>
+        /// <param name="level">
+        /// <para>
+        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
+        /// </para>
+        /// </param>
+        /// <param name="internalformat">
+        /// <para>
+        /// Specifies the format of the compressed image data stored at address data.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// Specifies the width of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup n + 2 ( border ) for some integer . All implementations support 2D texture images that are at least 64 texels wide and cube-mapped texture images that are at least 16 texels wide.
+        /// </para>
+        /// </param>
+        /// <param name="height">
+        /// <para>
+        /// Specifies the height of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be Must be 2 sup n + 2 ( border ) for some integer . All implementations support 2D texture images that are at least 64 texels high and cube-mapped texture images that are at least 16 texels high.
+        /// </para>
+        /// </param>
+        /// <param name="border">
+        /// <para>
+        /// Specifies the width of the border. Must be either 0 or 1.
+        /// </para>
+        /// </param>
+        /// <param name="imageSize">
+        /// <para>
+        /// Specifies the number of unsigned bytes of image data starting at the address specified by data.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the compressed image data in memory.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glCompressedTexImage2D")]
+        public static 
+        void CompressedTexImage2D<T7>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[] data)
             where T7 : struct
         {
             #if DEBUG
@@ -32697,7 +32687,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glCompressedTexImage2D")]
         public static 
-        void CompressedTexImage2D<T7>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[] data)
+        void CompressedTexImage2D<T7>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[,,] data)
             where T7 : struct
         {
             #if DEBUG
@@ -32764,71 +32754,8 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glCompressedTexImage2D")]
         public static 
-        void CompressedTexImage2D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, IntPtr data)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glCompressedTexImage2D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)data);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Specify a three-dimensional texture image in a compressed format
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target texture. Must be GL_TEXTURE_3D or GL_PROXY_TEXTURE_3D.
-        /// </para>
-        /// </param>
-        /// <param name="level">
-        /// <para>
-        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
-        /// </para>
-        /// </param>
-        /// <param name="internalformat">
-        /// <para>
-        /// Specifies the format of the compressed image data stored at address data.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// Specifies the width of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup n + 2 ( border ) for some integer . All implementations support 3D texture images that are at least 16 texels wide.
-        /// </para>
-        /// </param>
-        /// <param name="height">
-        /// <para>
-        /// Specifies the height of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup n + 2 ( border ) for some integer . All implementations support 3D texture images that are at least 16 texels high.
-        /// </para>
-        /// </param>
-        /// <param name="depth">
-        /// <para>
-        /// Specifies the depth of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup n + 2 ( border ) for some integer . All implementations support 3D texture images that are at least 16 texels deep.
-        /// </para>
-        /// </param>
-        /// <param name="border">
-        /// <para>
-        /// Specifies the width of the border. Must be either 0 or 1.
-        /// </para>
-        /// </param>
-        /// <param name="imageSize">
-        /// <para>
-        /// Specifies the number of unsigned bytes of image data starting at the address specified by data.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the compressed image data in memory.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glCompressedTexImage3D")]
-        public static 
-        void CompressedTexImage3D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T8 data)
-            where T8 : struct
+        void CompressedTexImage2D<T7>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T7 data)
+            where T7 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -32837,8 +32764,8 @@ namespace OpenTK.Graphics.OpenGL
             GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
             try
             {
-                Delegates.glCompressedTexImage3D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
-                data = (T8)data_ptr.Target;
+                Delegates.glCompressedTexImage2D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                data = (T7)data_ptr.Target;
             }
             finally
             {
@@ -32900,7 +32827,70 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glCompressedTexImage3D")]
         public static 
-        void CompressedTexImage3D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[,,] data)
+        void CompressedTexImage3D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, IntPtr data)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glCompressedTexImage3D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)data);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Specify a three-dimensional texture image in a compressed format
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target texture. Must be GL_TEXTURE_3D or GL_PROXY_TEXTURE_3D.
+        /// </para>
+        /// </param>
+        /// <param name="level">
+        /// <para>
+        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
+        /// </para>
+        /// </param>
+        /// <param name="internalformat">
+        /// <para>
+        /// Specifies the format of the compressed image data stored at address data.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// Specifies the width of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup n + 2 ( border ) for some integer . All implementations support 3D texture images that are at least 16 texels wide.
+        /// </para>
+        /// </param>
+        /// <param name="height">
+        /// <para>
+        /// Specifies the height of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup n + 2 ( border ) for some integer . All implementations support 3D texture images that are at least 16 texels high.
+        /// </para>
+        /// </param>
+        /// <param name="depth">
+        /// <para>
+        /// Specifies the depth of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup n + 2 ( border ) for some integer . All implementations support 3D texture images that are at least 16 texels deep.
+        /// </para>
+        /// </param>
+        /// <param name="border">
+        /// <para>
+        /// Specifies the width of the border. Must be either 0 or 1.
+        /// </para>
+        /// </param>
+        /// <param name="imageSize">
+        /// <para>
+        /// Specifies the number of unsigned bytes of image data starting at the address specified by data.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the compressed image data in memory.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glCompressedTexImage3D")]
+        public static 
+        void CompressedTexImage3D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[] data)
             where T8 : struct
         {
             #if DEBUG
@@ -33044,7 +33034,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glCompressedTexImage3D")]
         public static 
-        void CompressedTexImage3D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[] data)
+        void CompressedTexImage3D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[,,] data)
             where T8 : struct
         {
             #if DEBUG
@@ -33116,61 +33106,8 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glCompressedTexImage3D")]
         public static 
-        void CompressedTexImage3D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, IntPtr data)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glCompressedTexImage3D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)data);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Specify a one-dimensional texture subimage in a compressed format
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target texture. Must be GL_TEXTURE_1D.
-        /// </para>
-        /// </param>
-        /// <param name="level">
-        /// <para>
-        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
-        /// </para>
-        /// </param>
-        /// <param name="xoffset">
-        /// <para>
-        /// Specifies a texel offset in the x direction within the texture array.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// Specifies the width of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Specifies the format of the compressed image data stored at address data.
-        /// </para>
-        /// </param>
-        /// <param name="imageSize">
-        /// <para>
-        /// Specifies the number of unsigned bytes of image data starting at the address specified by data.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the compressed image data in memory.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glCompressedTexSubImage1D")]
-        public static 
-        void CompressedTexSubImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T6 data)
-            where T6 : struct
+        void CompressedTexImage3D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T8 data)
+            where T8 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -33179,8 +33116,8 @@ namespace OpenTK.Graphics.OpenGL
             GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
             try
             {
-                Delegates.glCompressedTexSubImage1D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
-                data = (T6)data_ptr.Target;
+                Delegates.glCompressedTexImage3D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                data = (T8)data_ptr.Target;
             }
             finally
             {
@@ -33232,7 +33169,60 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glCompressedTexSubImage1D")]
         public static 
-        void CompressedTexSubImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T6[,,] data)
+        void CompressedTexSubImage1D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr data)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glCompressedTexSubImage1D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)data);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Specify a one-dimensional texture subimage in a compressed format
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target texture. Must be GL_TEXTURE_1D.
+        /// </para>
+        /// </param>
+        /// <param name="level">
+        /// <para>
+        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
+        /// </para>
+        /// </param>
+        /// <param name="xoffset">
+        /// <para>
+        /// Specifies a texel offset in the x direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// Specifies the width of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Specifies the format of the compressed image data stored at address data.
+        /// </para>
+        /// </param>
+        /// <param name="imageSize">
+        /// <para>
+        /// Specifies the number of unsigned bytes of image data starting at the address specified by data.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the compressed image data in memory.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glCompressedTexSubImage1D")]
+        public static 
+        void CompressedTexSubImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T6[] data)
             where T6 : struct
         {
             #if DEBUG
@@ -33356,7 +33346,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glCompressedTexSubImage1D")]
         public static 
-        void CompressedTexSubImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T6[] data)
+        void CompressedTexSubImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T6[,,] data)
             where T6 : struct
         {
             #if DEBUG
@@ -33418,71 +33408,8 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glCompressedTexSubImage1D")]
         public static 
-        void CompressedTexSubImage1D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr data)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glCompressedTexSubImage1D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)data);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Specify a two-dimensional texture subimage in a compressed format
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target texture. Must be GL_TEXTURE_2D, GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, or GL_TEXTURE_CUBE_MAP_NEGATIVE_Z.
-        /// </para>
-        /// </param>
-        /// <param name="level">
-        /// <para>
-        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
-        /// </para>
-        /// </param>
-        /// <param name="xoffset">
-        /// <para>
-        /// Specifies a texel offset in the x direction within the texture array.
-        /// </para>
-        /// </param>
-        /// <param name="yoffset">
-        /// <para>
-        /// Specifies a texel offset in the y direction within the texture array.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// Specifies the width of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="height">
-        /// <para>
-        /// Specifies the height of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Specifies the format of the compressed image data stored at address data.
-        /// </para>
-        /// </param>
-        /// <param name="imageSize">
-        /// <para>
-        /// Specifies the number of unsigned bytes of image data starting at the address specified by data.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the compressed image data in memory.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glCompressedTexSubImage2D")]
-        public static 
-        void CompressedTexSubImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T8 data)
-            where T8 : struct
+        void CompressedTexSubImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T6 data)
+            where T6 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -33491,8 +33418,8 @@ namespace OpenTK.Graphics.OpenGL
             GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
             try
             {
-                Delegates.glCompressedTexSubImage2D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
-                data = (T8)data_ptr.Target;
+                Delegates.glCompressedTexSubImage1D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                data = (T6)data_ptr.Target;
             }
             finally
             {
@@ -33554,7 +33481,70 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glCompressedTexSubImage2D")]
         public static 
-        void CompressedTexSubImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T8[,,] data)
+        void CompressedTexSubImage2D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr data)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glCompressedTexSubImage2D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)data);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Specify a two-dimensional texture subimage in a compressed format
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target texture. Must be GL_TEXTURE_2D, GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, or GL_TEXTURE_CUBE_MAP_NEGATIVE_Z.
+        /// </para>
+        /// </param>
+        /// <param name="level">
+        /// <para>
+        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
+        /// </para>
+        /// </param>
+        /// <param name="xoffset">
+        /// <para>
+        /// Specifies a texel offset in the x direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="yoffset">
+        /// <para>
+        /// Specifies a texel offset in the y direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// Specifies the width of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="height">
+        /// <para>
+        /// Specifies the height of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Specifies the format of the compressed image data stored at address data.
+        /// </para>
+        /// </param>
+        /// <param name="imageSize">
+        /// <para>
+        /// Specifies the number of unsigned bytes of image data starting at the address specified by data.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the compressed image data in memory.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glCompressedTexSubImage2D")]
+        public static 
+        void CompressedTexSubImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T8[] data)
             where T8 : struct
         {
             #if DEBUG
@@ -33698,7 +33688,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glCompressedTexSubImage2D")]
         public static 
-        void CompressedTexSubImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T8[] data)
+        void CompressedTexSubImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T8[,,] data)
             where T8 : struct
         {
             #if DEBUG
@@ -33770,76 +33760,8 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glCompressedTexSubImage2D")]
         public static 
-        void CompressedTexSubImage2D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr data)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glCompressedTexSubImage2D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)data);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Specify a three-dimensional texture subimage in a compressed format
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target texture. Must be GL_TEXTURE_3D.
-        /// </para>
-        /// </param>
-        /// <param name="level">
-        /// <para>
-        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
-        /// </para>
-        /// </param>
-        /// <param name="xoffset">
-        /// <para>
-        /// Specifies a texel offset in the x direction within the texture array.
-        /// </para>
-        /// </param>
-        /// <param name="yoffset">
-        /// <para>
-        /// Specifies a texel offset in the y direction within the texture array.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// Specifies the width of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="height">
-        /// <para>
-        /// Specifies the height of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="depth">
-        /// <para>
-        /// Specifies the depth of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Specifies the format of the compressed image data stored at address data.
-        /// </para>
-        /// </param>
-        /// <param name="imageSize">
-        /// <para>
-        /// Specifies the number of unsigned bytes of image data starting at the address specified by data.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the compressed image data in memory.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glCompressedTexSubImage3D")]
-        public static 
-        void CompressedTexSubImage3D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T10 data)
-            where T10 : struct
+        void CompressedTexSubImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T8 data)
+            where T8 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -33848,8 +33770,8 @@ namespace OpenTK.Graphics.OpenGL
             GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
             try
             {
-                Delegates.glCompressedTexSubImage3D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
-                data = (T10)data_ptr.Target;
+                Delegates.glCompressedTexSubImage2D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                data = (T8)data_ptr.Target;
             }
             finally
             {
@@ -33916,7 +33838,75 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glCompressedTexSubImage3D")]
         public static 
-        void CompressedTexSubImage3D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T10[,,] data)
+        void CompressedTexSubImage3D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr data)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glCompressedTexSubImage3D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)data);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Specify a three-dimensional texture subimage in a compressed format
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target texture. Must be GL_TEXTURE_3D.
+        /// </para>
+        /// </param>
+        /// <param name="level">
+        /// <para>
+        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
+        /// </para>
+        /// </param>
+        /// <param name="xoffset">
+        /// <para>
+        /// Specifies a texel offset in the x direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="yoffset">
+        /// <para>
+        /// Specifies a texel offset in the y direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// Specifies the width of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="height">
+        /// <para>
+        /// Specifies the height of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="depth">
+        /// <para>
+        /// Specifies the depth of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Specifies the format of the compressed image data stored at address data.
+        /// </para>
+        /// </param>
+        /// <param name="imageSize">
+        /// <para>
+        /// Specifies the number of unsigned bytes of image data starting at the address specified by data.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the compressed image data in memory.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glCompressedTexSubImage3D")]
+        public static 
+        void CompressedTexSubImage3D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T10[] data)
             where T10 : struct
         {
             #if DEBUG
@@ -34070,7 +34060,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glCompressedTexSubImage3D")]
         public static 
-        void CompressedTexSubImage3D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T10[] data)
+        void CompressedTexSubImage3D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T10[,,] data)
             where T10 : struct
         {
             #if DEBUG
@@ -34147,70 +34137,22 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glCompressedTexSubImage3D")]
         public static 
-        void CompressedTexSubImage3D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr data)
+        void CompressedTexSubImage3D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T10 data)
+            where T10 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glCompressedTexSubImage3D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)data);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Define a one-dimensional convolution filter
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Must be GL_CONVOLUTION_1D.
-        /// </para>
-        /// </param>
-        /// <param name="internalformat">
-        /// <para>
-        /// The internal format of the convolution filter kernel. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, or GL_RGBA16.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// The width of the pixel array referenced by data.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// The format of the pixel data in data. The allowable values are GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_INTENSITY, GL_RGB, and GL_RGBA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// The type of the pixel data in data. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Pointer to a one-dimensional array of pixel data that is processed to build the convolution filter kernel.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glConvolutionFilter1D")]
-        public static 
-        void ConvolutionFilter1D<T5>(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T5 image)
-            where T5 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle image_ptr = GCHandle.Alloc(image, GCHandleType.Pinned);
+            GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
             try
             {
-                Delegates.glConvolutionFilter1D((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)image_ptr.AddrOfPinnedObject());
-                image = (T5)image_ptr.Target;
+                Delegates.glCompressedTexSubImage3D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)data_ptr.AddrOfPinnedObject());
+                data = (T10)data_ptr.Target;
             }
             finally
             {
-                image_ptr.Free();
+                data_ptr.Free();
             }
             #if DEBUG
             }
@@ -34253,7 +34195,55 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glConvolutionFilter1D")]
         public static 
-        void ConvolutionFilter1D<T5>(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[,,] image)
+        void ConvolutionFilter1D(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr image)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glConvolutionFilter1D((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)image);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Define a one-dimensional convolution filter
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be GL_CONVOLUTION_1D.
+        /// </para>
+        /// </param>
+        /// <param name="internalformat">
+        /// <para>
+        /// The internal format of the convolution filter kernel. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, or GL_RGBA16.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// The width of the pixel array referenced by data.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// The format of the pixel data in data. The allowable values are GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_INTENSITY, GL_RGB, and GL_RGBA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// The type of the pixel data in data. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Pointer to a one-dimensional array of pixel data that is processed to build the convolution filter kernel.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glConvolutionFilter1D")]
+        public static 
+        void ConvolutionFilter1D<T5>(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[] image)
             where T5 : struct
         {
             #if DEBUG
@@ -34367,7 +34357,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glConvolutionFilter1D")]
         public static 
-        void ConvolutionFilter1D<T5>(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[] image)
+        void ConvolutionFilter1D<T5>(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[,,] image)
             where T5 : struct
         {
             #if DEBUG
@@ -34424,61 +34414,8 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glConvolutionFilter1D")]
         public static 
-        void ConvolutionFilter1D(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr image)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glConvolutionFilter1D((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)image);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Define a two-dimensional convolution filter
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Must be GL_CONVOLUTION_2D.
-        /// </para>
-        /// </param>
-        /// <param name="internalformat">
-        /// <para>
-        /// The internal format of the convolution filter kernel. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, or GL_RGBA16.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// The width of the pixel array referenced by data.
-        /// </para>
-        /// </param>
-        /// <param name="height">
-        /// <para>
-        /// The height of the pixel array referenced by data.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// The format of the pixel data in data. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// The type of the pixel data in data. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Pointer to a two-dimensional array of pixel data that is processed to build the convolution filter kernel.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glConvolutionFilter2D")]
-        public static 
-        void ConvolutionFilter2D<T6>(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T6 image)
-            where T6 : struct
+        void ConvolutionFilter1D<T5>(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T5 image)
+            where T5 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -34487,8 +34424,8 @@ namespace OpenTK.Graphics.OpenGL
             GCHandle image_ptr = GCHandle.Alloc(image, GCHandleType.Pinned);
             try
             {
-                Delegates.glConvolutionFilter2D((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)image_ptr.AddrOfPinnedObject());
-                image = (T6)image_ptr.Target;
+                Delegates.glConvolutionFilter1D((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)image_ptr.AddrOfPinnedObject());
+                image = (T5)image_ptr.Target;
             }
             finally
             {
@@ -34540,7 +34477,60 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glConvolutionFilter2D")]
         public static 
-        void ConvolutionFilter2D<T6>(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[,,] image)
+        void ConvolutionFilter2D(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr image)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glConvolutionFilter2D((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)image);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Define a two-dimensional convolution filter
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be GL_CONVOLUTION_2D.
+        /// </para>
+        /// </param>
+        /// <param name="internalformat">
+        /// <para>
+        /// The internal format of the convolution filter kernel. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, or GL_RGBA16.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// The width of the pixel array referenced by data.
+        /// </para>
+        /// </param>
+        /// <param name="height">
+        /// <para>
+        /// The height of the pixel array referenced by data.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// The format of the pixel data in data. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// The type of the pixel data in data. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Pointer to a two-dimensional array of pixel data that is processed to build the convolution filter kernel.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glConvolutionFilter2D")]
+        public static 
+        void ConvolutionFilter2D<T6>(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[] image)
             where T6 : struct
         {
             #if DEBUG
@@ -34664,7 +34654,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glConvolutionFilter2D")]
         public static 
-        void ConvolutionFilter2D<T6>(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[] image)
+        void ConvolutionFilter2D<T6>(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[,,] image)
             where T6 : struct
         {
             #if DEBUG
@@ -34726,13 +34716,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glConvolutionFilter2D")]
         public static 
-        void ConvolutionFilter2D(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr image)
+        void ConvolutionFilter2D<T6>(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T6 image)
+            where T6 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glConvolutionFilter2D((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)image);
+            GCHandle image_ptr = GCHandle.Alloc(image, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glConvolutionFilter2D((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)image_ptr.AddrOfPinnedObject());
+                image = (T6)image_ptr.Target;
+            }
+            finally
+            {
+                image_ptr.Free();
+            }
             #if DEBUG
             }
             #endif
@@ -34775,43 +34775,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set convolution parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The target for the convolution parameter. Must be one of GL_CONVOLUTION_1D, GL_CONVOLUTION_2D, or GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// The parameter to be set. Must be GL_CONVOLUTION_BORDER_MODE.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// The parameter value. Must be one of GL_REDUCE, GL_CONSTANT_BORDER, GL_REPLICATE_BORDER.
-        /// </para>
-        /// <para>
-        /// 
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glConvolutionParameterfv")]
-        public static 
-        unsafe void ConvolutionParameter(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.ConvolutionParameter pname, Single* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glConvolutionParameterfv((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.ConvolutionParameter)pname, (Single*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set convolution parameters
         /// </summary>
@@ -34875,15 +34838,16 @@ namespace OpenTK.Graphics.OpenGL
         /// 
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glConvolutionParameteri")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glConvolutionParameterfv")]
         public static 
-        void ConvolutionParameter(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.ConvolutionParameter pname, Int32 @params)
+        unsafe void ConvolutionParameter(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.ConvolutionParameter pname, Single* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glConvolutionParameteri((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.ConvolutionParameter)pname, (Int32)@params);
+            Delegates.glConvolutionParameterfv((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.ConvolutionParameter)pname, (Single*)@params);
             #if DEBUG
             }
             #endif
@@ -34911,16 +34875,15 @@ namespace OpenTK.Graphics.OpenGL
         /// 
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glConvolutionParameteriv")]
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glConvolutionParameteri")]
         public static 
-        unsafe void ConvolutionParameter(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.ConvolutionParameter pname, Int32* @params)
+        void ConvolutionParameter(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.ConvolutionParameter pname, Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glConvolutionParameteriv((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.ConvolutionParameter)pname, (Int32*)@params);
+            Delegates.glConvolutionParameteri((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.ConvolutionParameter)pname, (Int32)@params);
             #if DEBUG
             }
             #endif
@@ -34968,6 +34931,43 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        
+        /// <summary>
+        /// Set convolution parameters
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The target for the convolution parameter. Must be one of GL_CONVOLUTION_1D, GL_CONVOLUTION_2D, or GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// The parameter to be set. Must be GL_CONVOLUTION_BORDER_MODE.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// The parameter value. Must be one of GL_REDUCE, GL_CONSTANT_BORDER, GL_REPLICATE_BORDER.
+        /// </para>
+        /// <para>
+        /// 
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glConvolutionParameteriv")]
+        public static 
+        unsafe void ConvolutionParameter(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.ConvolutionParameter pname, Int32* @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glConvolutionParameteriv((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.ConvolutionParameter)pname, (Int32*)@params);
+            #if DEBUG
+            }
+            #endif
+        }
+
         [AutoGenerated(Category = "ArbCopyBuffer", Version = "3.0", EntryPoint = "glCopyBufferSubData")]
         public static 
         void CopyBufferSubData(OpenTK.Graphics.OpenGL.BufferTarget readTarget, OpenTK.Graphics.OpenGL.BufferTarget writeTarget, IntPtr readOffset, IntPtr writeOffset, IntPtr size)
@@ -35497,35 +35497,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Delete named buffer objects
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of buffer objects to be deleted.
-        /// </para>
-        /// </param>
-        /// <param name="buffers">
-        /// <para>
-        /// Specifies an array of buffer objects to be deleted.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glDeleteBuffers")]
-        public static 
-        unsafe void DeleteBuffers(Int32 n, Int32* buffers)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glDeleteBuffers((Int32)n, (UInt32*)buffers);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Delete named buffer objects
         /// </summary>
@@ -35594,6 +35565,70 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Delete named buffer objects
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of buffer objects to be deleted.
+        /// </para>
+        /// </param>
+        /// <param name="buffers">
+        /// <para>
+        /// Specifies an array of buffer objects to be deleted.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glDeleteBuffers")]
+        public static 
+        unsafe void DeleteBuffers(Int32 n, Int32* buffers)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glDeleteBuffers((Int32)n, (UInt32*)buffers);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Delete named buffer objects
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of buffer objects to be deleted.
+        /// </para>
+        /// </param>
+        /// <param name="buffers">
+        /// <para>
+        /// Specifies an array of buffer objects to be deleted.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glDeleteBuffers")]
+        public static 
+        void DeleteBuffers(Int32 n, UInt32[] buffers)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* buffers_ptr = buffers)
+                {
+                    Delegates.glDeleteBuffers((Int32)n, (UInt32*)buffers_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Delete named buffer objects
         /// </summary>
@@ -35657,56 +35692,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        
-        /// <summary>
-        /// Delete named buffer objects
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of buffer objects to be deleted.
-        /// </para>
-        /// </param>
-        /// <param name="buffers">
-        /// <para>
-        /// Specifies an array of buffer objects to be deleted.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glDeleteBuffers")]
-        public static 
-        void DeleteBuffers(Int32 n, UInt32[] buffers)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* buffers_ptr = buffers)
-                {
-                    Delegates.glDeleteBuffers((Int32)n, (UInt32*)buffers_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glDeleteFramebuffers")]
-        public static 
-        unsafe void DeleteFramebuffers(Int32 n, Int32* framebuffers)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glDeleteFramebuffers((Int32)n, (UInt32*)framebuffers);
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glDeleteFramebuffers")]
         public static 
         void DeleteFramebuffers(Int32 n, Int32[] framebuffers)
@@ -35747,6 +35732,42 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glDeleteFramebuffers")]
+        public static 
+        unsafe void DeleteFramebuffers(Int32 n, Int32* framebuffers)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glDeleteFramebuffers((Int32)n, (UInt32*)framebuffers);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glDeleteFramebuffers")]
+        public static 
+        void DeleteFramebuffers(Int32 n, UInt32[] framebuffers)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* framebuffers_ptr = framebuffers)
+                {
+                    Delegates.glDeleteFramebuffers((Int32)n, (UInt32*)framebuffers_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glDeleteFramebuffers")]
         public static 
@@ -35783,27 +35804,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glDeleteFramebuffers")]
-        public static 
-        void DeleteFramebuffers(Int32 n, UInt32[] framebuffers)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* framebuffers_ptr = framebuffers)
-                {
-                    Delegates.glDeleteFramebuffers((Int32)n, (UInt32*)framebuffers_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
         
         /// <summary>
         /// Delete a contiguous group of display lists
@@ -35909,35 +35909,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Delete named query objects
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of query objects to be deleted.
-        /// </para>
-        /// </param>
-        /// <param name="ids">
-        /// <para>
-        /// Specifies an array of query objects to be deleted.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glDeleteQueries")]
-        public static 
-        unsafe void DeleteQueries(Int32 n, Int32* ids)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glDeleteQueries((Int32)n, (UInt32*)ids);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Delete named query objects
         /// </summary>
@@ -36006,6 +35977,70 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Delete named query objects
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of query objects to be deleted.
+        /// </para>
+        /// </param>
+        /// <param name="ids">
+        /// <para>
+        /// Specifies an array of query objects to be deleted.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glDeleteQueries")]
+        public static 
+        unsafe void DeleteQueries(Int32 n, Int32* ids)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glDeleteQueries((Int32)n, (UInt32*)ids);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Delete named query objects
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of query objects to be deleted.
+        /// </para>
+        /// </param>
+        /// <param name="ids">
+        /// <para>
+        /// Specifies an array of query objects to be deleted.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glDeleteQueries")]
+        public static 
+        void DeleteQueries(Int32 n, UInt32[] ids)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* ids_ptr = ids)
+                {
+                    Delegates.glDeleteQueries((Int32)n, (UInt32*)ids_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Delete named query objects
         /// </summary>
@@ -36069,56 +36104,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        
-        /// <summary>
-        /// Delete named query objects
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of query objects to be deleted.
-        /// </para>
-        /// </param>
-        /// <param name="ids">
-        /// <para>
-        /// Specifies an array of query objects to be deleted.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glDeleteQueries")]
-        public static 
-        void DeleteQueries(Int32 n, UInt32[] ids)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* ids_ptr = ids)
-                {
-                    Delegates.glDeleteQueries((Int32)n, (UInt32*)ids_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glDeleteRenderbuffers")]
-        public static 
-        unsafe void DeleteRenderbuffers(Int32 n, Int32* renderbuffers)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glDeleteRenderbuffers((Int32)n, (UInt32*)renderbuffers);
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glDeleteRenderbuffers")]
         public static 
         void DeleteRenderbuffers(Int32 n, Int32[] renderbuffers)
@@ -36159,6 +36144,42 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glDeleteRenderbuffers")]
+        public static 
+        unsafe void DeleteRenderbuffers(Int32 n, Int32* renderbuffers)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glDeleteRenderbuffers((Int32)n, (UInt32*)renderbuffers);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glDeleteRenderbuffers")]
+        public static 
+        void DeleteRenderbuffers(Int32 n, UInt32[] renderbuffers)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* renderbuffers_ptr = renderbuffers)
+                {
+                    Delegates.glDeleteRenderbuffers((Int32)n, (UInt32*)renderbuffers_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glDeleteRenderbuffers")]
         public static 
@@ -36195,27 +36216,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glDeleteRenderbuffers")]
-        public static 
-        void DeleteRenderbuffers(Int32 n, UInt32[] renderbuffers)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* renderbuffers_ptr = renderbuffers)
-                {
-                    Delegates.glDeleteRenderbuffers((Int32)n, (UInt32*)renderbuffers_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
         
         /// <summary>
         /// Deletes a shader object
@@ -36278,35 +36278,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Delete named textures
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of textures to be deleted.
-        /// </para>
-        /// </param>
-        /// <param name="textures">
-        /// <para>
-        /// Specifies an array of textures to be deleted.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glDeleteTextures")]
-        public static 
-        unsafe void DeleteTextures(Int32 n, Int32* textures)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glDeleteTextures((Int32)n, (UInt32*)textures);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Delete named textures
         /// </summary>
@@ -36391,42 +36362,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glDeleteTextures")]
         public static 
-        void DeleteTextures(Int32 n, ref UInt32 textures)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* textures_ptr = &textures)
-                {
-                    Delegates.glDeleteTextures((Int32)n, (UInt32*)textures_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Delete named textures
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of textures to be deleted.
-        /// </para>
-        /// </param>
-        /// <param name="textures">
-        /// <para>
-        /// Specifies an array of textures to be deleted.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glDeleteTextures")]
-        public static 
-        unsafe void DeleteTextures(Int32 n, UInt32* textures)
+        unsafe void DeleteTextures(Int32 n, Int32* textures)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -36473,16 +36409,65 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        
+        /// <summary>
+        /// Delete named textures
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of textures to be deleted.
+        /// </para>
+        /// </param>
+        /// <param name="textures">
+        /// <para>
+        /// Specifies an array of textures to be deleted.
+        /// </para>
+        /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ArbVertexArrayObject", Version = "3.0", EntryPoint = "glDeleteVertexArrays")]
+        [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glDeleteTextures")]
         public static 
-        unsafe void DeleteVertexArrays(Int32 n, Int32* arrays)
+        void DeleteTextures(Int32 n, ref UInt32 textures)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glDeleteVertexArrays((Int32)n, (UInt32*)arrays);
+            unsafe
+            {
+                fixed (UInt32* textures_ptr = &textures)
+                {
+                    Delegates.glDeleteTextures((Int32)n, (UInt32*)textures_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Delete named textures
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of textures to be deleted.
+        /// </para>
+        /// </param>
+        /// <param name="textures">
+        /// <para>
+        /// Specifies an array of textures to be deleted.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glDeleteTextures")]
+        public static 
+        unsafe void DeleteTextures(Int32 n, UInt32* textures)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glDeleteTextures((Int32)n, (UInt32*)textures);
             #if DEBUG
             }
             #endif
@@ -36528,6 +36513,42 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "ArbVertexArrayObject", Version = "3.0", EntryPoint = "glDeleteVertexArrays")]
+        public static 
+        unsafe void DeleteVertexArrays(Int32 n, Int32* arrays)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glDeleteVertexArrays((Int32)n, (UInt32*)arrays);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "ArbVertexArrayObject", Version = "3.0", EntryPoint = "glDeleteVertexArrays")]
+        public static 
+        void DeleteVertexArrays(Int32 n, UInt32[] arrays)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* arrays_ptr = arrays)
+                {
+                    Delegates.glDeleteVertexArrays((Int32)n, (UInt32*)arrays_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ArbVertexArrayObject", Version = "3.0", EntryPoint = "glDeleteVertexArrays")]
         public static 
@@ -36564,27 +36585,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ArbVertexArrayObject", Version = "3.0", EntryPoint = "glDeleteVertexArrays")]
-        public static 
-        void DeleteVertexArrays(Int32 n, UInt32[] arrays)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* arrays_ptr = arrays)
-                {
-                    Delegates.glDeleteVertexArrays((Int32)n, (UInt32*)arrays_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
         
         /// <summary>
         /// Specify the value used for depth buffer comparisons
@@ -36873,35 +36873,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specifies a list of color buffers to be drawn into
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of buffers in bufs.
-        /// </para>
-        /// </param>
-        /// <param name="bufs">
-        /// <para>
-        /// Points to an array of symbolic constants specifying the buffers into which fragment colors or data values will be written.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glDrawBuffers")]
-        public static 
-        unsafe void DrawBuffers(Int32 n, OpenTK.Graphics.OpenGL.DrawBuffersEnum* bufs)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glDrawBuffers((Int32)n, (OpenTK.Graphics.OpenGL.DrawBuffersEnum*)bufs);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specifies a list of color buffers to be drawn into
         /// </summary>
@@ -36971,47 +36942,28 @@ namespace OpenTK.Graphics.OpenGL
 
         
         /// <summary>
-        /// Render primitives from array data
+        /// Specifies a list of color buffers to be drawn into
         /// </summary>
-        /// <param name="mode">
+        /// <param name="n">
         /// <para>
-        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
+        /// Specifies the number of buffers in bufs.
         /// </para>
         /// </param>
-        /// <param name="count">
+        /// <param name="bufs">
         /// <para>
-        /// Specifies the number of elements to be rendered.
+        /// Points to an array of symbolic constants specifying the buffers into which fragment colors or data values will be written.
         /// </para>
         /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
-        /// </para>
-        /// </param>
-        /// <param name="indices">
-        /// <para>
-        /// Specifies a pointer to the location where the indices are stored.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glDrawElements")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glDrawBuffers")]
         public static 
-        void DrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices)
-            where T3 : struct
+        unsafe void DrawBuffers(Int32 n, OpenTK.Graphics.OpenGL.DrawBuffersEnum* bufs)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glDrawElements((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject());
-                indices = (T3)indices_ptr.Target;
-            }
-            finally
-            {
-                indices_ptr.Free();
-            }
+            Delegates.glDrawBuffers((Int32)n, (OpenTK.Graphics.OpenGL.DrawBuffersEnum*)bufs);
             #if DEBUG
             }
             #endif
@@ -37043,7 +36995,45 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glDrawElements")]
         public static 
-        void DrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices)
+        void DrawElements(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glDrawElements((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Render primitives from array data
+        /// </summary>
+        /// <param name="mode">
+        /// <para>
+        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="count">
+        /// <para>
+        /// Specifies the number of elements to be rendered.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
+        /// </para>
+        /// </param>
+        /// <param name="indices">
+        /// <para>
+        /// Specifies a pointer to the location where the indices are stored.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glDrawElements")]
+        public static 
+        void DrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices)
             where T3 : struct
         {
             #if DEBUG
@@ -37137,7 +37127,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glDrawElements")]
         public static 
-        void DrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices)
+        void DrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices)
             where T3 : struct
         {
             #if DEBUG
@@ -37184,21 +37174,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glDrawElements")]
         public static 
-        void DrawElements(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glDrawElements((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glDrawElementsBaseVertex")]
-        public static 
-        void DrawElementsBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 basevertex)
+        void DrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices)
             where T3 : struct
         {
             #if DEBUG
@@ -37208,7 +37184,7 @@ namespace OpenTK.Graphics.OpenGL
             GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
             try
             {
-                Delegates.glDrawElementsBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)basevertex);
+                Delegates.glDrawElements((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject());
                 indices = (T3)indices_ptr.Target;
             }
             finally
@@ -37222,7 +37198,21 @@ namespace OpenTK.Graphics.OpenGL
 
         [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glDrawElementsBaseVertex")]
         public static 
-        void DrawElementsBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 basevertex)
+        void DrawElementsBaseVertex(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 basevertex)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glDrawElementsBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)basevertex);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glDrawElementsBaseVertex")]
+        public static 
+        void DrawElementsBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 basevertex)
             where T3 : struct
         {
             #if DEBUG
@@ -37268,7 +37258,7 @@ namespace OpenTK.Graphics.OpenGL
 
         [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glDrawElementsBaseVertex")]
         public static 
-        void DrawElementsBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 basevertex)
+        void DrawElementsBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 basevertex)
             where T3 : struct
         {
             #if DEBUG
@@ -37291,21 +37281,7 @@ namespace OpenTK.Graphics.OpenGL
 
         [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glDrawElementsBaseVertex")]
         public static 
-        void DrawElementsBaseVertex(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 basevertex)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glDrawElementsBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)basevertex);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [AutoGenerated(Category = "Version31", Version = "3.1", EntryPoint = "glDrawElementsInstanced")]
-        public static 
-        void DrawElementsInstanced<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount)
+        void DrawElementsBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 basevertex)
             where T3 : struct
         {
             #if DEBUG
@@ -37315,7 +37291,7 @@ namespace OpenTK.Graphics.OpenGL
             GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
             try
             {
-                Delegates.glDrawElementsInstanced((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
+                Delegates.glDrawElementsBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)basevertex);
                 indices = (T3)indices_ptr.Target;
             }
             finally
@@ -37329,7 +37305,21 @@ namespace OpenTK.Graphics.OpenGL
 
         [AutoGenerated(Category = "Version31", Version = "3.1", EntryPoint = "glDrawElementsInstanced")]
         public static 
-        void DrawElementsInstanced<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount)
+        void DrawElementsInstanced(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glDrawElementsInstanced((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [AutoGenerated(Category = "Version31", Version = "3.1", EntryPoint = "glDrawElementsInstanced")]
+        public static 
+        void DrawElementsInstanced<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount)
             where T3 : struct
         {
             #if DEBUG
@@ -37375,7 +37365,7 @@ namespace OpenTK.Graphics.OpenGL
 
         [AutoGenerated(Category = "Version31", Version = "3.1", EntryPoint = "glDrawElementsInstanced")]
         public static 
-        void DrawElementsInstanced<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount)
+        void DrawElementsInstanced<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount)
             where T3 : struct
         {
             #if DEBUG
@@ -37398,21 +37388,7 @@ namespace OpenTK.Graphics.OpenGL
 
         [AutoGenerated(Category = "Version31", Version = "3.1", EntryPoint = "glDrawElementsInstanced")]
         public static 
-        void DrawElementsInstanced(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glDrawElementsInstanced((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glDrawElementsInstancedBaseVertex")]
-        public static 
-        void DrawElementsInstancedBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount, Int32 basevertex)
+        void DrawElementsInstanced<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount)
             where T3 : struct
         {
             #if DEBUG
@@ -37422,7 +37398,7 @@ namespace OpenTK.Graphics.OpenGL
             GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
             try
             {
-                Delegates.glDrawElementsInstancedBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount, (Int32)basevertex);
+                Delegates.glDrawElementsInstanced((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
                 indices = (T3)indices_ptr.Target;
             }
             finally
@@ -37436,7 +37412,21 @@ namespace OpenTK.Graphics.OpenGL
 
         [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glDrawElementsInstancedBaseVertex")]
         public static 
-        void DrawElementsInstancedBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount, Int32 basevertex)
+        void DrawElementsInstancedBaseVertex(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount, Int32 basevertex)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glDrawElementsInstancedBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount, (Int32)basevertex);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glDrawElementsInstancedBaseVertex")]
+        public static 
+        void DrawElementsInstancedBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount, Int32 basevertex)
             where T3 : struct
         {
             #if DEBUG
@@ -37482,7 +37472,7 @@ namespace OpenTK.Graphics.OpenGL
 
         [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glDrawElementsInstancedBaseVertex")]
         public static 
-        void DrawElementsInstancedBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount, Int32 basevertex)
+        void DrawElementsInstancedBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount, Int32 basevertex)
             where T3 : struct
         {
             #if DEBUG
@@ -37505,60 +37495,22 @@ namespace OpenTK.Graphics.OpenGL
 
         [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glDrawElementsInstancedBaseVertex")]
         public static 
-        void DrawElementsInstancedBaseVertex(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount, Int32 basevertex)
+        void DrawElementsInstancedBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount, Int32 basevertex)
+            where T3 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glDrawElementsInstancedBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount, (Int32)basevertex);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Write a block of pixels to the frame buffer
-        /// </summary>
-        /// <param name="width">
-        /// <para>
-        /// Specify the dimensions of the pixel rectangle to be written into the frame buffer.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Specifies the format of the pixel data. Symbolic constants GL_COLOR_INDEX, GL_STENCIL_INDEX, GL_DEPTH_COMPONENT, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the data type for data. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the pixel data.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glDrawPixels")]
-        public static 
-        void DrawPixels<T4>(Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T4 pixels)
-            where T4 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
+            GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
             try
             {
-                Delegates.glDrawPixels((Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                pixels = (T4)pixels_ptr.Target;
+                Delegates.glDrawElementsInstancedBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount, (Int32)basevertex);
+                indices = (T3)indices_ptr.Target;
             }
             finally
             {
-                pixels_ptr.Free();
+                indices_ptr.Free();
             }
             #if DEBUG
             }
@@ -37591,7 +37543,45 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glDrawPixels")]
         public static 
-        void DrawPixels<T4>(Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[,,] pixels)
+        void DrawPixels(Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glDrawPixels((Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Write a block of pixels to the frame buffer
+        /// </summary>
+        /// <param name="width">
+        /// <para>
+        /// Specify the dimensions of the pixel rectangle to be written into the frame buffer.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Specifies the format of the pixel data. Symbolic constants GL_COLOR_INDEX, GL_STENCIL_INDEX, GL_DEPTH_COMPONENT, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the data type for data. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the pixel data.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glDrawPixels")]
+        public static 
+        void DrawPixels<T4>(Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[] pixels)
             where T4 : struct
         {
             #if DEBUG
@@ -37685,7 +37675,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glDrawPixels")]
         public static 
-        void DrawPixels<T4>(Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[] pixels)
+        void DrawPixels<T4>(Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[,,] pixels)
             where T4 : struct
         {
             #if DEBUG
@@ -37732,70 +37722,22 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glDrawPixels")]
         public static 
-        void DrawPixels(Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+        void DrawPixels<T4>(Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T4 pixels)
+            where T4 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glDrawPixels((Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Render primitives from array data
-        /// </summary>
-        /// <param name="mode">
-        /// <para>
-        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="start">
-        /// <para>
-        /// Specifies the minimum array index contained in indices.
-        /// </para>
-        /// </param>
-        /// <param name="end">
-        /// <para>
-        /// Specifies the maximum array index contained in indices.
-        /// </para>
-        /// </param>
-        /// <param name="count">
-        /// <para>
-        /// Specifies the number of elements to be rendered.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
-        /// </para>
-        /// </param>
-        /// <param name="indices">
-        /// <para>
-        /// Specifies a pointer to the location where the indices are stored.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version12", Version = "1.2", EntryPoint = "glDrawRangeElements")]
-        public static 
-        void DrawRangeElements<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 start, Int32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T5 indices)
-            where T5 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
+            GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
             try
             {
-                Delegates.glDrawRangeElements((OpenTK.Graphics.OpenGL.BeginMode)mode, (UInt32)start, (UInt32)end, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject());
-                indices = (T5)indices_ptr.Target;
+                Delegates.glDrawPixels((Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                pixels = (T4)pixels_ptr.Target;
             }
             finally
             {
-                indices_ptr.Free();
+                pixels_ptr.Free();
             }
             #if DEBUG
             }
@@ -37838,7 +37780,55 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12", Version = "1.2", EntryPoint = "glDrawRangeElements")]
         public static 
-        void DrawRangeElements<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 start, Int32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T5[,,] indices)
+        void DrawRangeElements(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 start, Int32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glDrawRangeElements((OpenTK.Graphics.OpenGL.BeginMode)mode, (UInt32)start, (UInt32)end, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Render primitives from array data
+        /// </summary>
+        /// <param name="mode">
+        /// <para>
+        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="start">
+        /// <para>
+        /// Specifies the minimum array index contained in indices.
+        /// </para>
+        /// </param>
+        /// <param name="end">
+        /// <para>
+        /// Specifies the maximum array index contained in indices.
+        /// </para>
+        /// </param>
+        /// <param name="count">
+        /// <para>
+        /// Specifies the number of elements to be rendered.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
+        /// </para>
+        /// </param>
+        /// <param name="indices">
+        /// <para>
+        /// Specifies a pointer to the location where the indices are stored.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version12", Version = "1.2", EntryPoint = "glDrawRangeElements")]
+        public static 
+        void DrawRangeElements<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 start, Int32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T5[] indices)
             where T5 : struct
         {
             #if DEBUG
@@ -37952,7 +37942,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12", Version = "1.2", EntryPoint = "glDrawRangeElements")]
         public static 
-        void DrawRangeElements<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 start, Int32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T5[] indices)
+        void DrawRangeElements<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 start, Int32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T5[,,] indices)
             where T5 : struct
         {
             #if DEBUG
@@ -38009,56 +37999,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12", Version = "1.2", EntryPoint = "glDrawRangeElements")]
         public static 
-        void DrawRangeElements(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 start, Int32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glDrawRangeElements((OpenTK.Graphics.OpenGL.BeginMode)mode, (UInt32)start, (UInt32)end, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Render primitives from array data
-        /// </summary>
-        /// <param name="mode">
-        /// <para>
-        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="start">
-        /// <para>
-        /// Specifies the minimum array index contained in indices.
-        /// </para>
-        /// </param>
-        /// <param name="end">
-        /// <para>
-        /// Specifies the maximum array index contained in indices.
-        /// </para>
-        /// </param>
-        /// <param name="count">
-        /// <para>
-        /// Specifies the number of elements to be rendered.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
-        /// </para>
-        /// </param>
-        /// <param name="indices">
-        /// <para>
-        /// Specifies a pointer to the location where the indices are stored.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version12", Version = "1.2", EntryPoint = "glDrawRangeElements")]
-        public static 
-        void DrawRangeElements<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, UInt32 start, UInt32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T5 indices)
+        void DrawRangeElements<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 start, Int32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T5 indices)
             where T5 : struct
         {
             #if DEBUG
@@ -38117,7 +38058,56 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version12", Version = "1.2", EntryPoint = "glDrawRangeElements")]
         public static 
-        void DrawRangeElements<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, UInt32 start, UInt32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T5[,,] indices)
+        void DrawRangeElements(OpenTK.Graphics.OpenGL.BeginMode mode, UInt32 start, UInt32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glDrawRangeElements((OpenTK.Graphics.OpenGL.BeginMode)mode, (UInt32)start, (UInt32)end, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Render primitives from array data
+        /// </summary>
+        /// <param name="mode">
+        /// <para>
+        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="start">
+        /// <para>
+        /// Specifies the minimum array index contained in indices.
+        /// </para>
+        /// </param>
+        /// <param name="end">
+        /// <para>
+        /// Specifies the maximum array index contained in indices.
+        /// </para>
+        /// </param>
+        /// <param name="count">
+        /// <para>
+        /// Specifies the number of elements to be rendered.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
+        /// </para>
+        /// </param>
+        /// <param name="indices">
+        /// <para>
+        /// Specifies a pointer to the location where the indices are stored.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version12", Version = "1.2", EntryPoint = "glDrawRangeElements")]
+        public static 
+        void DrawRangeElements<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, UInt32 start, UInt32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T5[] indices)
             where T5 : struct
         {
             #if DEBUG
@@ -38233,7 +38223,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version12", Version = "1.2", EntryPoint = "glDrawRangeElements")]
         public static 
-        void DrawRangeElements<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, UInt32 start, UInt32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T5[] indices)
+        void DrawRangeElements<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, UInt32 start, UInt32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T5[,,] indices)
             where T5 : struct
         {
             #if DEBUG
@@ -38291,21 +38281,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version12", Version = "1.2", EntryPoint = "glDrawRangeElements")]
         public static 
-        void DrawRangeElements(OpenTK.Graphics.OpenGL.BeginMode mode, UInt32 start, UInt32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glDrawRangeElements((OpenTK.Graphics.OpenGL.BeginMode)mode, (UInt32)start, (UInt32)end, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glDrawRangeElementsBaseVertex")]
-        public static 
-        void DrawRangeElementsBaseVertex<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 start, Int32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T5 indices, Int32 basevertex)
+        void DrawRangeElements<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, UInt32 start, UInt32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T5 indices)
             where T5 : struct
         {
             #if DEBUG
@@ -38315,7 +38291,7 @@ namespace OpenTK.Graphics.OpenGL
             GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
             try
             {
-                Delegates.glDrawRangeElementsBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (UInt32)start, (UInt32)end, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)basevertex);
+                Delegates.glDrawRangeElements((OpenTK.Graphics.OpenGL.BeginMode)mode, (UInt32)start, (UInt32)end, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject());
                 indices = (T5)indices_ptr.Target;
             }
             finally
@@ -38329,7 +38305,21 @@ namespace OpenTK.Graphics.OpenGL
 
         [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glDrawRangeElementsBaseVertex")]
         public static 
-        void DrawRangeElementsBaseVertex<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 start, Int32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T5[,,] indices, Int32 basevertex)
+        void DrawRangeElementsBaseVertex(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 start, Int32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 basevertex)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glDrawRangeElementsBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (UInt32)start, (UInt32)end, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)basevertex);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glDrawRangeElementsBaseVertex")]
+        public static 
+        void DrawRangeElementsBaseVertex<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 start, Int32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T5[] indices, Int32 basevertex)
             where T5 : struct
         {
             #if DEBUG
@@ -38375,7 +38365,7 @@ namespace OpenTK.Graphics.OpenGL
 
         [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glDrawRangeElementsBaseVertex")]
         public static 
-        void DrawRangeElementsBaseVertex<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 start, Int32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T5[] indices, Int32 basevertex)
+        void DrawRangeElementsBaseVertex<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 start, Int32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T5[,,] indices, Int32 basevertex)
             where T5 : struct
         {
             #if DEBUG
@@ -38398,22 +38388,7 @@ namespace OpenTK.Graphics.OpenGL
 
         [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glDrawRangeElementsBaseVertex")]
         public static 
-        void DrawRangeElementsBaseVertex(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 start, Int32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 basevertex)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glDrawRangeElementsBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (UInt32)start, (UInt32)end, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)basevertex);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glDrawRangeElementsBaseVertex")]
-        public static 
-        void DrawRangeElementsBaseVertex<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, UInt32 start, UInt32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T5 indices, Int32 basevertex)
+        void DrawRangeElementsBaseVertex<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 start, Int32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T5 indices, Int32 basevertex)
             where T5 : struct
         {
             #if DEBUG
@@ -38438,7 +38413,22 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glDrawRangeElementsBaseVertex")]
         public static 
-        void DrawRangeElementsBaseVertex<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, UInt32 start, UInt32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T5[,,] indices, Int32 basevertex)
+        void DrawRangeElementsBaseVertex(OpenTK.Graphics.OpenGL.BeginMode mode, UInt32 start, UInt32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 basevertex)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glDrawRangeElementsBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (UInt32)start, (UInt32)end, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)basevertex);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glDrawRangeElementsBaseVertex")]
+        public static 
+        void DrawRangeElementsBaseVertex<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, UInt32 start, UInt32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T5[] indices, Int32 basevertex)
             where T5 : struct
         {
             #if DEBUG
@@ -38486,7 +38476,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glDrawRangeElementsBaseVertex")]
         public static 
-        void DrawRangeElementsBaseVertex<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, UInt32 start, UInt32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T5[] indices, Int32 basevertex)
+        void DrawRangeElementsBaseVertex<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, UInt32 start, UInt32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T5[,,] indices, Int32 basevertex)
             where T5 : struct
         {
             #if DEBUG
@@ -38510,13 +38500,23 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glDrawRangeElementsBaseVertex")]
         public static 
-        void DrawRangeElementsBaseVertex(OpenTK.Graphics.OpenGL.BeginMode mode, UInt32 start, UInt32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 basevertex)
+        void DrawRangeElementsBaseVertex<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, UInt32 start, UInt32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T5 indices, Int32 basevertex)
+            where T5 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glDrawRangeElementsBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (UInt32)start, (UInt32)end, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)basevertex);
+            GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glDrawRangeElementsBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (UInt32)start, (UInt32)end, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)basevertex);
+                indices = (T5)indices_ptr.Target;
+            }
+            finally
+            {
+                indices_ptr.Free();
+            }
             #if DEBUG
             }
             #endif
@@ -38561,23 +38561,13 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glEdgeFlagPointer")]
         public static 
-        void EdgeFlagPointer<T1>(Int32 stride, [InAttribute, OutAttribute] ref T1 pointer)
-            where T1 : struct
+        void EdgeFlagPointer(Int32 stride, IntPtr pointer)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glEdgeFlagPointer((Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                pointer = (T1)pointer_ptr.Target;
-            }
-            finally
-            {
-                pointer_ptr.Free();
-            }
+            Delegates.glEdgeFlagPointer((Int32)stride, (IntPtr)pointer);
             #if DEBUG
             }
             #endif
@@ -38599,7 +38589,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glEdgeFlagPointer")]
         public static 
-        void EdgeFlagPointer<T1>(Int32 stride, [InAttribute, OutAttribute] T1[,,] pointer)
+        void EdgeFlagPointer<T1>(Int32 stride, [InAttribute, OutAttribute] T1[] pointer)
             where T1 : struct
         {
             #if DEBUG
@@ -38673,7 +38663,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glEdgeFlagPointer")]
         public static 
-        void EdgeFlagPointer<T1>(Int32 stride, [InAttribute, OutAttribute] T1[] pointer)
+        void EdgeFlagPointer<T1>(Int32 stride, [InAttribute, OutAttribute] T1[,,] pointer)
             where T1 : struct
         {
             #if DEBUG
@@ -38710,13 +38700,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glEdgeFlagPointer")]
         public static 
-        void EdgeFlagPointer(Int32 stride, IntPtr pointer)
+        void EdgeFlagPointer<T1>(Int32 stride, [InAttribute, OutAttribute] ref T1 pointer)
+            where T1 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glEdgeFlagPointer((Int32)stride, (IntPtr)pointer);
+            GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glEdgeFlagPointer((Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                pointer = (T1)pointer_ptr.Target;
+            }
+            finally
+            {
+                pointer_ptr.Free();
+            }
             #if DEBUG
             }
             #endif
@@ -39100,35 +39100,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Evaluate enabled one- and two-dimensional maps
-        /// </summary>
-        /// <param name="u">
-        /// <para>
-        /// Specifies a value that is the domain coordinate to the basis function defined in a previous glMap1 or glMap2 command.
-        /// </para>
-        /// </param>
-        /// <param name="v">
-        /// <para>
-        /// Specifies a value that is the domain coordinate to the basis function defined in a previous glMap2 command. This argument is not present in a glEvalCoord1 command.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glEvalCoord2dv")]
-        public static 
-        unsafe void EvalCoord2(Double* u)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glEvalCoord2dv((Double*)u);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Evaluate enabled one- and two-dimensional maps
         /// </summary>
@@ -39197,6 +39168,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Evaluate enabled one- and two-dimensional maps
+        /// </summary>
+        /// <param name="u">
+        /// <para>
+        /// Specifies a value that is the domain coordinate to the basis function defined in a previous glMap1 or glMap2 command.
+        /// </para>
+        /// </param>
+        /// <param name="v">
+        /// <para>
+        /// Specifies a value that is the domain coordinate to the basis function defined in a previous glMap2 command. This argument is not present in a glEvalCoord1 command.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glEvalCoord2dv")]
+        public static 
+        unsafe void EvalCoord2(Double* u)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glEvalCoord2dv((Double*)u);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Evaluate enabled one- and two-dimensional maps
         /// </summary>
@@ -39225,6 +39225,40 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Evaluate enabled one- and two-dimensional maps
+        /// </summary>
+        /// <param name="u">
+        /// <para>
+        /// Specifies a value that is the domain coordinate to the basis function defined in a previous glMap1 or glMap2 command.
+        /// </para>
+        /// </param>
+        /// <param name="v">
+        /// <para>
+        /// Specifies a value that is the domain coordinate to the basis function defined in a previous glMap2 command. This argument is not present in a glEvalCoord1 command.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glEvalCoord2fv")]
+        public static 
+        void EvalCoord2(Single[] u)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* u_ptr = u)
+                {
+                    Delegates.glEvalCoord2fv((Single*)u_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Evaluate enabled one- and two-dimensional maps
         /// </summary>
@@ -39288,40 +39322,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Evaluate enabled one- and two-dimensional maps
-        /// </summary>
-        /// <param name="u">
-        /// <para>
-        /// Specifies a value that is the domain coordinate to the basis function defined in a previous glMap1 or glMap2 command.
-        /// </para>
-        /// </param>
-        /// <param name="v">
-        /// <para>
-        /// Specifies a value that is the domain coordinate to the basis function defined in a previous glMap2 command. This argument is not present in a glEvalCoord1 command.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glEvalCoord2fv")]
-        public static 
-        void EvalCoord2(Single[] u)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* u_ptr = u)
-                {
-                    Delegates.glEvalCoord2fv((Single*)u_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Compute a one- or two-dimensional grid of points or lines
         /// </summary>
@@ -39434,6 +39434,45 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Controls feedback mode
+        /// </summary>
+        /// <param name="size">
+        /// <para>
+        /// Specifies the maximum number of values that can be written into buffer.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies a symbolic constant that describes the information that will be returned for each vertex. GL_2D, GL_3D, GL_3D_COLOR, GL_3D_COLOR_TEXTURE, and GL_4D_COLOR_TEXTURE are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="buffer">
+        /// <para>
+        /// Returns the feedback data.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glFeedbackBuffer")]
+        public static 
+        void FeedbackBuffer(Int32 size, OpenTK.Graphics.OpenGL.FeedbackType type, [OutAttribute] Single[] buffer)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* buffer_ptr = buffer)
+                {
+                    Delegates.glFeedbackBuffer((Int32)size, (OpenTK.Graphics.OpenGL.FeedbackType)type, (Single*)buffer_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Controls feedback mode
         /// </summary>
@@ -39507,45 +39546,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        
-        /// <summary>
-        /// Controls feedback mode
-        /// </summary>
-        /// <param name="size">
-        /// <para>
-        /// Specifies the maximum number of values that can be written into buffer.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies a symbolic constant that describes the information that will be returned for each vertex. GL_2D, GL_3D, GL_3D_COLOR, GL_3D_COLOR_TEXTURE, and GL_4D_COLOR_TEXTURE are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="buffer">
-        /// <para>
-        /// Returns the feedback data.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glFeedbackBuffer")]
-        public static 
-        void FeedbackBuffer(Int32 size, OpenTK.Graphics.OpenGL.FeedbackType type, [OutAttribute] Single[] buffer)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* buffer_ptr = buffer)
-                {
-                    Delegates.glFeedbackBuffer((Int32)size, (OpenTK.Graphics.OpenGL.FeedbackType)type, (Single*)buffer_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "ArbSync", Version = "1.2", EntryPoint = "glFenceSync")]
         public static 
         IntPtr FenceSync(OpenTK.Graphics.OpenGL.ArbSync condition, Int32 flags)
@@ -39740,23 +39740,13 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glFogCoordPointer")]
         public static 
-        void FogCoordPointer<T2>(OpenTK.Graphics.OpenGL.FogPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T2 pointer)
-            where T2 : struct
+        void FogCoordPointer(OpenTK.Graphics.OpenGL.FogPointerType type, Int32 stride, IntPtr pointer)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glFogCoordPointer((OpenTK.Graphics.OpenGL.FogPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                pointer = (T2)pointer_ptr.Target;
-            }
-            finally
-            {
-                pointer_ptr.Free();
-            }
+            Delegates.glFogCoordPointer((OpenTK.Graphics.OpenGL.FogPointerType)type, (Int32)stride, (IntPtr)pointer);
             #if DEBUG
             }
             #endif
@@ -39783,7 +39773,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glFogCoordPointer")]
         public static 
-        void FogCoordPointer<T2>(OpenTK.Graphics.OpenGL.FogPointerType type, Int32 stride, [InAttribute, OutAttribute] T2[,,] pointer)
+        void FogCoordPointer<T2>(OpenTK.Graphics.OpenGL.FogPointerType type, Int32 stride, [InAttribute, OutAttribute] T2[] pointer)
             where T2 : struct
         {
             #if DEBUG
@@ -39867,7 +39857,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glFogCoordPointer")]
         public static 
-        void FogCoordPointer<T2>(OpenTK.Graphics.OpenGL.FogPointerType type, Int32 stride, [InAttribute, OutAttribute] T2[] pointer)
+        void FogCoordPointer<T2>(OpenTK.Graphics.OpenGL.FogPointerType type, Int32 stride, [InAttribute, OutAttribute] T2[,,] pointer)
             where T2 : struct
         {
             #if DEBUG
@@ -39909,13 +39899,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glFogCoordPointer")]
         public static 
-        void FogCoordPointer(OpenTK.Graphics.OpenGL.FogPointerType type, Int32 stride, IntPtr pointer)
+        void FogCoordPointer<T2>(OpenTK.Graphics.OpenGL.FogPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T2 pointer)
+            where T2 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glFogCoordPointer((OpenTK.Graphics.OpenGL.FogPointerType)type, (Int32)stride, (IntPtr)pointer);
+            GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glFogCoordPointer((OpenTK.Graphics.OpenGL.FogPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                pointer = (T2)pointer_ptr.Target;
+            }
+            finally
+            {
+                pointer_ptr.Free();
+            }
             #if DEBUG
             }
             #endif
@@ -39950,35 +39950,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specify fog parameters
-        /// </summary>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies a single-valued fog parameter. GL_FOG_MODE, GL_FOG_DENSITY, GL_FOG_START, GL_FOG_END, GL_FOG_INDEX, and GL_FOG_COORD_SRC are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="param">
-        /// <para>
-        /// Specifies the value that pname will be set to.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glFogfv")]
-        public static 
-        unsafe void Fog(OpenTK.Graphics.OpenGL.FogParameter pname, Single* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glFogfv((OpenTK.Graphics.OpenGL.FogParameter)pname, (Single*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify fog parameters
         /// </summary>
@@ -40026,15 +39997,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the value that pname will be set to.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glFogi")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glFogfv")]
         public static 
-        void Fog(OpenTK.Graphics.OpenGL.FogParameter pname, Int32 param)
+        unsafe void Fog(OpenTK.Graphics.OpenGL.FogParameter pname, Single* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glFogi((OpenTK.Graphics.OpenGL.FogParameter)pname, (Int32)param);
+            Delegates.glFogfv((OpenTK.Graphics.OpenGL.FogParameter)pname, (Single*)@params);
             #if DEBUG
             }
             #endif
@@ -40054,16 +40026,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the value that pname will be set to.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glFogiv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glFogi")]
         public static 
-        unsafe void Fog(OpenTK.Graphics.OpenGL.FogParameter pname, Int32* @params)
+        void Fog(OpenTK.Graphics.OpenGL.FogParameter pname, Int32 param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glFogiv((OpenTK.Graphics.OpenGL.FogParameter)pname, (Int32*)@params);
+            Delegates.glFogi((OpenTK.Graphics.OpenGL.FogParameter)pname, (Int32)param);
             #if DEBUG
             }
             #endif
@@ -40103,6 +40074,35 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        
+        /// <summary>
+        /// Specify fog parameters
+        /// </summary>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies a single-valued fog parameter. GL_FOG_MODE, GL_FOG_DENSITY, GL_FOG_START, GL_FOG_END, GL_FOG_INDEX, and GL_FOG_COORD_SRC are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="param">
+        /// <para>
+        /// Specifies the value that pname will be set to.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glFogiv")]
+        public static 
+        unsafe void Fog(OpenTK.Graphics.OpenGL.FogParameter pname, Int32* @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glFogiv((OpenTK.Graphics.OpenGL.FogParameter)pname, (Int32*)@params);
+            #if DEBUG
+            }
+            #endif
+        }
+
         [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glFramebufferRenderbuffer")]
         public static 
         void FramebufferRenderbuffer(OpenTK.Graphics.OpenGL.FramebufferTarget target, OpenTK.Graphics.OpenGL.FramebufferAttachment attachment, OpenTK.Graphics.OpenGL.RenderbufferTarget renderbuffertarget, Int32 renderbuffer)
@@ -40363,35 +40363,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Generate buffer object names
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of buffer object names to be generated.
-        /// </para>
-        /// </param>
-        /// <param name="buffers">
-        /// <para>
-        /// Specifies an array in which the generated buffer object names are stored.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glGenBuffers")]
-        public static 
-        unsafe void GenBuffers(Int32 n, [OutAttribute] Int32* buffers)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGenBuffers((Int32)n, (UInt32*)buffers);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Generate buffer object names
         /// </summary>
@@ -40461,6 +40432,70 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Generate buffer object names
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of buffer object names to be generated.
+        /// </para>
+        /// </param>
+        /// <param name="buffers">
+        /// <para>
+        /// Specifies an array in which the generated buffer object names are stored.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glGenBuffers")]
+        public static 
+        unsafe void GenBuffers(Int32 n, [OutAttribute] Int32* buffers)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGenBuffers((Int32)n, (UInt32*)buffers);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Generate buffer object names
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of buffer object names to be generated.
+        /// </para>
+        /// </param>
+        /// <param name="buffers">
+        /// <para>
+        /// Specifies an array in which the generated buffer object names are stored.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glGenBuffers")]
+        public static 
+        void GenBuffers(Int32 n, [OutAttribute] UInt32[] buffers)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* buffers_ptr = buffers)
+                {
+                    Delegates.glGenBuffers((Int32)n, (UInt32*)buffers_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Generate buffer object names
         /// </summary>
@@ -40525,41 +40560,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        
-        /// <summary>
-        /// Generate buffer object names
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of buffer object names to be generated.
-        /// </para>
-        /// </param>
-        /// <param name="buffers">
-        /// <para>
-        /// Specifies an array in which the generated buffer object names are stored.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glGenBuffers")]
-        public static 
-        void GenBuffers(Int32 n, [OutAttribute] UInt32[] buffers)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* buffers_ptr = buffers)
-                {
-                    Delegates.glGenBuffers((Int32)n, (UInt32*)buffers_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glGenerateMipmap")]
         public static 
         void GenerateMipmap(OpenTK.Graphics.OpenGL.GenerateMipmapTarget target)
@@ -40574,21 +40574,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glGenFramebuffers")]
-        public static 
-        unsafe void GenFramebuffers(Int32 n, [OutAttribute] Int32* framebuffers)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGenFramebuffers((Int32)n, (UInt32*)framebuffers);
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glGenFramebuffers")]
         public static 
         void GenFramebuffers(Int32 n, [OutAttribute] Int32[] framebuffers)
@@ -40630,6 +40615,42 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glGenFramebuffers")]
+        public static 
+        unsafe void GenFramebuffers(Int32 n, [OutAttribute] Int32* framebuffers)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGenFramebuffers((Int32)n, (UInt32*)framebuffers);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glGenFramebuffers")]
+        public static 
+        void GenFramebuffers(Int32 n, [OutAttribute] UInt32[] framebuffers)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* framebuffers_ptr = framebuffers)
+                {
+                    Delegates.glGenFramebuffers((Int32)n, (UInt32*)framebuffers_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glGenFramebuffers")]
         public static 
@@ -40667,27 +40688,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glGenFramebuffers")]
-        public static 
-        void GenFramebuffers(Int32 n, [OutAttribute] UInt32[] framebuffers)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* framebuffers_ptr = framebuffers)
-                {
-                    Delegates.glGenFramebuffers((Int32)n, (UInt32*)framebuffers_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
         
         /// <summary>
         /// Generate a contiguous set of empty display lists
@@ -40712,35 +40712,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Generate query object names
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of query object names to be generated.
-        /// </para>
-        /// </param>
-        /// <param name="ids">
-        /// <para>
-        /// Specifies an array in which the generated query object names are stored.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glGenQueries")]
-        public static 
-        unsafe void GenQueries(Int32 n, [OutAttribute] Int32* ids)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGenQueries((Int32)n, (UInt32*)ids);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Generate query object names
         /// </summary>
@@ -40826,43 +40797,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glGenQueries")]
         public static 
-        void GenQueries(Int32 n, [OutAttribute] out UInt32 ids)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* ids_ptr = &ids)
-                {
-                    Delegates.glGenQueries((Int32)n, (UInt32*)ids_ptr);
-                    ids = *ids_ptr;
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Generate query object names
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of query object names to be generated.
-        /// </para>
-        /// </param>
-        /// <param name="ids">
-        /// <para>
-        /// Specifies an array in which the generated query object names are stored.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glGenQueries")]
-        public static 
-        unsafe void GenQueries(Int32 n, [OutAttribute] UInt32* ids)
+        unsafe void GenQueries(Int32 n, [OutAttribute] Int32* ids)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -40909,16 +40844,66 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        
+        /// <summary>
+        /// Generate query object names
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of query object names to be generated.
+        /// </para>
+        /// </param>
+        /// <param name="ids">
+        /// <para>
+        /// Specifies an array in which the generated query object names are stored.
+        /// </para>
+        /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glGenRenderbuffers")]
+        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glGenQueries")]
         public static 
-        unsafe void GenRenderbuffers(Int32 n, [OutAttribute] Int32* renderbuffers)
+        void GenQueries(Int32 n, [OutAttribute] out UInt32 ids)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGenRenderbuffers((Int32)n, (UInt32*)renderbuffers);
+            unsafe
+            {
+                fixed (UInt32* ids_ptr = &ids)
+                {
+                    Delegates.glGenQueries((Int32)n, (UInt32*)ids_ptr);
+                    ids = *ids_ptr;
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Generate query object names
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of query object names to be generated.
+        /// </para>
+        /// </param>
+        /// <param name="ids">
+        /// <para>
+        /// Specifies an array in which the generated query object names are stored.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glGenQueries")]
+        public static 
+        unsafe void GenQueries(Int32 n, [OutAttribute] UInt32* ids)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGenQueries((Int32)n, (UInt32*)ids);
             #if DEBUG
             }
             #endif
@@ -40968,29 +40953,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glGenRenderbuffers")]
         public static 
-        void GenRenderbuffers(Int32 n, [OutAttribute] out UInt32 renderbuffers)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* renderbuffers_ptr = &renderbuffers)
-                {
-                    Delegates.glGenRenderbuffers((Int32)n, (UInt32*)renderbuffers_ptr);
-                    renderbuffers = *renderbuffers_ptr;
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glGenRenderbuffers")]
-        public static 
-        unsafe void GenRenderbuffers(Int32 n, [OutAttribute] UInt32* renderbuffers)
+        unsafe void GenRenderbuffers(Int32 n, [OutAttribute] Int32* renderbuffers)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -41023,30 +40986,38 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        
-        /// <summary>
-        /// Generate texture names
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of texture names to be generated.
-        /// </para>
-        /// </param>
-        /// <param name="textures">
-        /// <para>
-        /// Specifies an array in which the generated texture names are stored.
-        /// </para>
-        /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glGenTextures")]
+        [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glGenRenderbuffers")]
         public static 
-        unsafe void GenTextures(Int32 n, [OutAttribute] Int32* textures)
+        void GenRenderbuffers(Int32 n, [OutAttribute] out UInt32 renderbuffers)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGenTextures((Int32)n, (UInt32*)textures);
+            unsafe
+            {
+                fixed (UInt32* renderbuffers_ptr = &renderbuffers)
+                {
+                    Delegates.glGenRenderbuffers((Int32)n, (UInt32*)renderbuffers_ptr);
+                    renderbuffers = *renderbuffers_ptr;
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glGenRenderbuffers")]
+        public static 
+        unsafe void GenRenderbuffers(Int32 n, [OutAttribute] UInt32* renderbuffers)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGenRenderbuffers((Int32)n, (UInt32*)renderbuffers);
             #if DEBUG
             }
             #endif
@@ -41138,43 +41109,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glGenTextures")]
         public static 
-        void GenTextures(Int32 n, [OutAttribute] out UInt32 textures)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* textures_ptr = &textures)
-                {
-                    Delegates.glGenTextures((Int32)n, (UInt32*)textures_ptr);
-                    textures = *textures_ptr;
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Generate texture names
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of texture names to be generated.
-        /// </para>
-        /// </param>
-        /// <param name="textures">
-        /// <para>
-        /// Specifies an array in which the generated texture names are stored.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glGenTextures")]
-        public static 
-        unsafe void GenTextures(Int32 n, [OutAttribute] UInt32* textures)
+        unsafe void GenTextures(Int32 n, [OutAttribute] Int32* textures)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -41221,16 +41156,66 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        
+        /// <summary>
+        /// Generate texture names
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of texture names to be generated.
+        /// </para>
+        /// </param>
+        /// <param name="textures">
+        /// <para>
+        /// Specifies an array in which the generated texture names are stored.
+        /// </para>
+        /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ArbVertexArrayObject", Version = "3.0", EntryPoint = "glGenVertexArrays")]
+        [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glGenTextures")]
         public static 
-        unsafe void GenVertexArrays(Int32 n, [OutAttribute] Int32* arrays)
+        void GenTextures(Int32 n, [OutAttribute] out UInt32 textures)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGenVertexArrays((Int32)n, (UInt32*)arrays);
+            unsafe
+            {
+                fixed (UInt32* textures_ptr = &textures)
+                {
+                    Delegates.glGenTextures((Int32)n, (UInt32*)textures_ptr);
+                    textures = *textures_ptr;
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Generate texture names
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of texture names to be generated.
+        /// </para>
+        /// </param>
+        /// <param name="textures">
+        /// <para>
+        /// Specifies an array in which the generated texture names are stored.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glGenTextures")]
+        public static 
+        unsafe void GenTextures(Int32 n, [OutAttribute] UInt32* textures)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGenTextures((Int32)n, (UInt32*)textures);
             #if DEBUG
             }
             #endif
@@ -41280,29 +41265,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ArbVertexArrayObject", Version = "3.0", EntryPoint = "glGenVertexArrays")]
         public static 
-        void GenVertexArrays(Int32 n, [OutAttribute] out UInt32 arrays)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* arrays_ptr = &arrays)
-                {
-                    Delegates.glGenVertexArrays((Int32)n, (UInt32*)arrays_ptr);
-                    arrays = *arrays_ptr;
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ArbVertexArrayObject", Version = "3.0", EntryPoint = "glGenVertexArrays")]
-        public static 
-        unsafe void GenVertexArrays(Int32 n, [OutAttribute] UInt32* arrays)
+        unsafe void GenVertexArrays(Int32 n, [OutAttribute] Int32* arrays)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -41335,55 +41298,38 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        
-        /// <summary>
-        /// Returns information about an active attribute variable for the specified program object
-        /// </summary>
-        /// <param name="program">
-        /// <para>
-        /// Specifies the program object to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the attribute variable to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="bufSize">
-        /// <para>
-        /// Specifies the maximum number of characters OpenGL is allowed to write in the character buffer indicated by name.
-        /// </para>
-        /// </param>
-        /// <param name="length">
-        /// <para>
-        /// Returns the number of characters actually written by OpenGL in the string indicated by name (excluding the null terminator) if a value other than NULL is passed.
-        /// </para>
-        /// </param>
-        /// <param name="size">
-        /// <para>
-        /// Returns the size of the attribute variable.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Returns the data type of the attribute variable.
-        /// </para>
-        /// </param>
-        /// <param name="name">
-        /// <para>
-        /// Returns a null terminated string containing the name of the attribute variable.
-        /// </para>
-        /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetActiveAttrib")]
+        [AutoGenerated(Category = "ArbVertexArrayObject", Version = "3.0", EntryPoint = "glGenVertexArrays")]
         public static 
-        unsafe void GetActiveAttrib(Int32 program, Int32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ActiveAttribType* type, [OutAttribute] StringBuilder name)
+        void GenVertexArrays(Int32 n, [OutAttribute] out UInt32 arrays)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetActiveAttrib((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length, (Int32*)size, (OpenTK.Graphics.OpenGL.ActiveAttribType*)type, (StringBuilder)name);
+            unsafe
+            {
+                fixed (UInt32* arrays_ptr = &arrays)
+                {
+                    Delegates.glGenVertexArrays((Int32)n, (UInt32*)arrays_ptr);
+                    arrays = *arrays_ptr;
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "ArbVertexArrayObject", Version = "3.0", EntryPoint = "glGenVertexArrays")]
+        public static 
+        unsafe void GenVertexArrays(Int32 n, [OutAttribute] UInt32* arrays)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGenVertexArrays((Int32)n, (UInt32*)arrays);
             #if DEBUG
             }
             #endif
@@ -41495,7 +41441,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetActiveAttrib")]
         public static 
-        unsafe void GetActiveAttrib(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ActiveAttribType* type, [OutAttribute] StringBuilder name)
+        unsafe void GetActiveAttrib(Int32 program, Int32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ActiveAttribType* type, [OutAttribute] StringBuilder name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -41574,7 +41520,7 @@ namespace OpenTK.Graphics.OpenGL
 
         
         /// <summary>
-        /// Returns information about an active uniform variable for the specified program object
+        /// Returns information about an active attribute variable for the specified program object
         /// </summary>
         /// <param name="program">
         /// <para>
@@ -41583,7 +41529,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         /// <param name="index">
         /// <para>
-        /// Specifies the index of the uniform variable to be queried.
+        /// Specifies the index of the attribute variable to be queried.
         /// </para>
         /// </param>
         /// <param name="bufSize">
@@ -41598,29 +41544,29 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         /// <param name="size">
         /// <para>
-        /// Returns the size of the uniform variable.
+        /// Returns the size of the attribute variable.
         /// </para>
         /// </param>
         /// <param name="type">
         /// <para>
-        /// Returns the data type of the uniform variable.
+        /// Returns the data type of the attribute variable.
         /// </para>
         /// </param>
         /// <param name="name">
         /// <para>
-        /// Returns a null terminated string containing the name of the uniform variable.
+        /// Returns a null terminated string containing the name of the attribute variable.
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetActiveUniform")]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetActiveAttrib")]
         public static 
-        unsafe void GetActiveUniform(Int32 program, Int32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ActiveUniformType* type, [OutAttribute] StringBuilder name)
+        unsafe void GetActiveAttrib(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ActiveAttribType* type, [OutAttribute] StringBuilder name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetActiveUniform((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length, (Int32*)size, (OpenTK.Graphics.OpenGL.ActiveUniformType*)type, (StringBuilder)name);
+            Delegates.glGetActiveAttrib((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length, (Int32*)size, (OpenTK.Graphics.OpenGL.ActiveAttribType*)type, (StringBuilder)name);
             #if DEBUG
             }
             #endif
@@ -41732,7 +41678,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetActiveUniform")]
         public static 
-        unsafe void GetActiveUniform(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ActiveUniformType* type, [OutAttribute] StringBuilder name)
+        unsafe void GetActiveUniform(Int32 program, Int32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ActiveUniformType* type, [OutAttribute] StringBuilder name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -41809,16 +41755,55 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        
+        /// <summary>
+        /// Returns information about an active uniform variable for the specified program object
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// Specifies the program object to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the uniform variable to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="bufSize">
+        /// <para>
+        /// Specifies the maximum number of characters OpenGL is allowed to write in the character buffer indicated by name.
+        /// </para>
+        /// </param>
+        /// <param name="length">
+        /// <para>
+        /// Returns the number of characters actually written by OpenGL in the string indicated by name (excluding the null terminator) if a value other than NULL is passed.
+        /// </para>
+        /// </param>
+        /// <param name="size">
+        /// <para>
+        /// Returns the size of the uniform variable.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Returns the data type of the uniform variable.
+        /// </para>
+        /// </param>
+        /// <param name="name">
+        /// <para>
+        /// Returns a null terminated string containing the name of the uniform variable.
+        /// </para>
+        /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ArbUniformBufferObject", Version = "2.0", EntryPoint = "glGetActiveUniformBlockiv")]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetActiveUniform")]
         public static 
-        unsafe void GetActiveUniformBlock(Int32 program, Int32 uniformBlockIndex, OpenTK.Graphics.OpenGL.ActiveUniformBlockParameter pname, [OutAttribute] Int32* @params)
+        unsafe void GetActiveUniform(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ActiveUniformType* type, [OutAttribute] StringBuilder name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetActiveUniformBlockiv((UInt32)program, (UInt32)uniformBlockIndex, (OpenTK.Graphics.OpenGL.ActiveUniformBlockParameter)pname, (Int32*)@params);
+            Delegates.glGetActiveUniform((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length, (Int32*)size, (OpenTK.Graphics.OpenGL.ActiveUniformType*)type, (StringBuilder)name);
             #if DEBUG
             }
             #endif
@@ -41868,7 +41853,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ArbUniformBufferObject", Version = "2.0", EntryPoint = "glGetActiveUniformBlockiv")]
         public static 
-        unsafe void GetActiveUniformBlock(UInt32 program, UInt32 uniformBlockIndex, OpenTK.Graphics.OpenGL.ActiveUniformBlockParameter pname, [OutAttribute] Int32* @params)
+        unsafe void GetActiveUniformBlock(Int32 program, Int32 uniformBlockIndex, OpenTK.Graphics.OpenGL.ActiveUniformBlockParameter pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -41924,15 +41909,15 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ArbUniformBufferObject", Version = "2.0", EntryPoint = "glGetActiveUniformBlockName")]
+        [AutoGenerated(Category = "ArbUniformBufferObject", Version = "2.0", EntryPoint = "glGetActiveUniformBlockiv")]
         public static 
-        unsafe void GetActiveUniformBlockName(Int32 program, Int32 uniformBlockIndex, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder uniformBlockName)
+        unsafe void GetActiveUniformBlock(UInt32 program, UInt32 uniformBlockIndex, OpenTK.Graphics.OpenGL.ActiveUniformBlockParameter pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetActiveUniformBlockName((UInt32)program, (UInt32)uniformBlockIndex, (Int32)bufSize, (Int32*)length, (StringBuilder)uniformBlockName);
+            Delegates.glGetActiveUniformBlockiv((UInt32)program, (UInt32)uniformBlockIndex, (OpenTK.Graphics.OpenGL.ActiveUniformBlockParameter)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -41962,7 +41947,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ArbUniformBufferObject", Version = "2.0", EntryPoint = "glGetActiveUniformBlockName")]
         public static 
-        unsafe void GetActiveUniformBlockName(UInt32 program, UInt32 uniformBlockIndex, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder uniformBlockName)
+        unsafe void GetActiveUniformBlockName(Int32 program, Int32 uniformBlockIndex, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder uniformBlockName)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -41997,15 +41982,15 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ArbUniformBufferObject", Version = "2.0", EntryPoint = "glGetActiveUniformName")]
+        [AutoGenerated(Category = "ArbUniformBufferObject", Version = "2.0", EntryPoint = "glGetActiveUniformBlockName")]
         public static 
-        unsafe void GetActiveUniformName(Int32 program, Int32 uniformIndex, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder uniformName)
+        unsafe void GetActiveUniformBlockName(UInt32 program, UInt32 uniformBlockIndex, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder uniformBlockName)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetActiveUniformName((UInt32)program, (UInt32)uniformIndex, (Int32)bufSize, (Int32*)length, (StringBuilder)uniformName);
+            Delegates.glGetActiveUniformBlockName((UInt32)program, (UInt32)uniformBlockIndex, (Int32)bufSize, (Int32*)length, (StringBuilder)uniformBlockName);
             #if DEBUG
             }
             #endif
@@ -42035,7 +42020,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ArbUniformBufferObject", Version = "2.0", EntryPoint = "glGetActiveUniformName")]
         public static 
-        unsafe void GetActiveUniformName(UInt32 program, UInt32 uniformIndex, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder uniformName)
+        unsafe void GetActiveUniformName(Int32 program, Int32 uniformIndex, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder uniformName)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -42070,15 +42055,15 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ArbUniformBufferObject", Version = "2.0", EntryPoint = "glGetActiveUniformsiv")]
+        [AutoGenerated(Category = "ArbUniformBufferObject", Version = "2.0", EntryPoint = "glGetActiveUniformName")]
         public static 
-        unsafe void GetActiveUniforms(Int32 program, Int32 uniformCount, Int32* uniformIndices, OpenTK.Graphics.OpenGL.ArbUniformBufferObject pname, [OutAttribute] Int32* @params)
+        unsafe void GetActiveUniformName(UInt32 program, UInt32 uniformIndex, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder uniformName)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetActiveUniformsiv((UInt32)program, (Int32)uniformCount, (UInt32*)uniformIndices, (OpenTK.Graphics.OpenGL.ArbUniformBufferObject)pname, (Int32*)@params);
+            Delegates.glGetActiveUniformName((UInt32)program, (UInt32)uniformIndex, (Int32)bufSize, (Int32*)length, (StringBuilder)uniformName);
             #if DEBUG
             }
             #endif
@@ -42130,30 +42115,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ArbUniformBufferObject", Version = "2.0", EntryPoint = "glGetActiveUniformsiv")]
         public static 
-        void GetActiveUniforms(UInt32 program, Int32 uniformCount, ref UInt32 uniformIndices, OpenTK.Graphics.OpenGL.ArbUniformBufferObject pname, [OutAttribute] out Int32 @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* uniformIndices_ptr = &uniformIndices)
-                fixed (Int32* @params_ptr = &@params)
-                {
-                    Delegates.glGetActiveUniformsiv((UInt32)program, (Int32)uniformCount, (UInt32*)uniformIndices_ptr, (OpenTK.Graphics.OpenGL.ArbUniformBufferObject)pname, (Int32*)@params_ptr);
-                    @params = *@params_ptr;
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ArbUniformBufferObject", Version = "2.0", EntryPoint = "glGetActiveUniformsiv")]
-        public static 
-        unsafe void GetActiveUniforms(UInt32 program, Int32 uniformCount, UInt32* uniformIndices, OpenTK.Graphics.OpenGL.ArbUniformBufferObject pname, [OutAttribute] Int32* @params)
+        unsafe void GetActiveUniforms(Int32 program, Int32 uniformCount, Int32* uniformIndices, OpenTK.Graphics.OpenGL.ArbUniformBufferObject pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -42187,82 +42149,39 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        
-        /// <summary>
-        /// Returns the handles of the shader objects attached to a program object
-        /// </summary>
-        /// <param name="program">
-        /// <para>
-        /// Specifies the program object to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="maxCount">
-        /// <para>
-        /// Specifies the size of the array for storing the returned object names.
-        /// </para>
-        /// </param>
-        /// <param name="count">
-        /// <para>
-        /// Returns the number of names actually returned in objects.
-        /// </para>
-        /// </param>
-        /// <param name="shaders">
-        /// <para>
-        /// Specifies an array that is used to return the names of attached shader objects.
-        /// </para>
-        /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetAttachedShaders")]
+        [AutoGenerated(Category = "ArbUniformBufferObject", Version = "2.0", EntryPoint = "glGetActiveUniformsiv")]
         public static 
-        unsafe void GetAttachedShaders(Int32 program, Int32 maxCount, [OutAttribute] Int32* count, [OutAttribute] Int32* obj)
+        void GetActiveUniforms(UInt32 program, Int32 uniformCount, ref UInt32 uniformIndices, OpenTK.Graphics.OpenGL.ArbUniformBufferObject pname, [OutAttribute] out Int32 @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetAttachedShaders((UInt32)program, (Int32)maxCount, (Int32*)count, (UInt32*)obj);
+            unsafe
+            {
+                fixed (UInt32* uniformIndices_ptr = &uniformIndices)
+                fixed (Int32* @params_ptr = &@params)
+                {
+                    Delegates.glGetActiveUniformsiv((UInt32)program, (Int32)uniformCount, (UInt32*)uniformIndices_ptr, (OpenTK.Graphics.OpenGL.ArbUniformBufferObject)pname, (Int32*)@params_ptr);
+                    @params = *@params_ptr;
+                }
+            }
             #if DEBUG
             }
             #endif
         }
 
-        
-        /// <summary>
-        /// Returns the handles of the shader objects attached to a program object
-        /// </summary>
-        /// <param name="program">
-        /// <para>
-        /// Specifies the program object to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="maxCount">
-        /// <para>
-        /// Specifies the size of the array for storing the returned object names.
-        /// </para>
-        /// </param>
-        /// <param name="count">
-        /// <para>
-        /// Returns the number of names actually returned in objects.
-        /// </para>
-        /// </param>
-        /// <param name="shaders">
-        /// <para>
-        /// Specifies an array that is used to return the names of attached shader objects.
-        /// </para>
-        /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetAttachedShaders")]
+        [AutoGenerated(Category = "ArbUniformBufferObject", Version = "2.0", EntryPoint = "glGetActiveUniformsiv")]
         public static 
-        unsafe void GetAttachedShaders(Int32 program, Int32 maxCount, [OutAttribute] Int32* count, [OutAttribute] Int32[] obj)
+        unsafe void GetActiveUniforms(UInt32 program, Int32 uniformCount, UInt32* uniformIndices, OpenTK.Graphics.OpenGL.ArbUniformBufferObject pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            fixed (Int32* obj_ptr = obj)
-            {
-                Delegates.glGetAttachedShaders((UInt32)program, (Int32)maxCount, (Int32*)count, (UInt32*)obj_ptr);
-            }
+            Delegates.glGetActiveUniformsiv((UInt32)program, (Int32)uniformCount, (UInt32*)uniformIndices, (OpenTK.Graphics.OpenGL.ArbUniformBufferObject)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -42342,7 +42261,49 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetAttachedShaders")]
         public static 
-        unsafe void GetAttachedShaders(UInt32 program, Int32 maxCount, [OutAttribute] Int32* count, [OutAttribute] UInt32* obj)
+        unsafe void GetAttachedShaders(Int32 program, Int32 maxCount, [OutAttribute] Int32* count, [OutAttribute] Int32[] obj)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            fixed (Int32* obj_ptr = obj)
+            {
+                Delegates.glGetAttachedShaders((UInt32)program, (Int32)maxCount, (Int32*)count, (UInt32*)obj_ptr);
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Returns the handles of the shader objects attached to a program object
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// Specifies the program object to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="maxCount">
+        /// <para>
+        /// Specifies the size of the array for storing the returned object names.
+        /// </para>
+        /// </param>
+        /// <param name="count">
+        /// <para>
+        /// Returns the number of names actually returned in objects.
+        /// </para>
+        /// </param>
+        /// <param name="shaders">
+        /// <para>
+        /// Specifies an array that is used to return the names of attached shader objects.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetAttachedShaders")]
+        public static 
+        unsafe void GetAttachedShaders(Int32 program, Int32 maxCount, [OutAttribute] Int32* count, [OutAttribute] Int32* obj)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -42355,6 +42316,54 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Returns the handles of the shader objects attached to a program object
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// Specifies the program object to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="maxCount">
+        /// <para>
+        /// Specifies the size of the array for storing the returned object names.
+        /// </para>
+        /// </param>
+        /// <param name="count">
+        /// <para>
+        /// Returns the number of names actually returned in objects.
+        /// </para>
+        /// </param>
+        /// <param name="shaders">
+        /// <para>
+        /// Specifies an array that is used to return the names of attached shader objects.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetAttachedShaders")]
+        public static 
+        void GetAttachedShaders(UInt32 program, Int32 maxCount, [OutAttribute] out Int32 count, [OutAttribute] out UInt32 obj)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Int32* count_ptr = &count)
+                fixed (UInt32* obj_ptr = &obj)
+                {
+                    Delegates.glGetAttachedShaders((UInt32)program, (Int32)maxCount, (Int32*)count_ptr, (UInt32*)obj_ptr);
+                    count = *count_ptr;
+                    obj = *obj_ptr;
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Returns the handles of the shader objects attached to a program object
         /// </summary>
@@ -42423,22 +42432,13 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetAttachedShaders")]
         public static 
-        void GetAttachedShaders(UInt32 program, Int32 maxCount, [OutAttribute] out Int32 count, [OutAttribute] out UInt32 obj)
+        unsafe void GetAttachedShaders(UInt32 program, Int32 maxCount, [OutAttribute] Int32* count, [OutAttribute] UInt32* obj)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            unsafe
-            {
-                fixed (Int32* count_ptr = &count)
-                fixed (UInt32* obj_ptr = &obj)
-                {
-                    Delegates.glGetAttachedShaders((UInt32)program, (Int32)maxCount, (Int32*)count_ptr, (UInt32*)obj_ptr);
-                    count = *count_ptr;
-                    obj = *obj_ptr;
-                }
-            }
+            Delegates.glGetAttachedShaders((UInt32)program, (Int32)maxCount, (Int32*)count, (UInt32*)obj);
             #if DEBUG
             }
             #endif
@@ -42501,21 +42501,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetBooleani_v")]
-        public static 
-        unsafe void GetBoolean(OpenTK.Graphics.OpenGL.GetIndexedPName target, Int32 index, [OutAttribute] bool* data)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGetBooleani_v((OpenTK.Graphics.OpenGL.GetIndexedPName)target, (UInt32)index, (bool*)data);
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetBooleani_v")]
         public static 
         void GetBoolean(OpenTK.Graphics.OpenGL.GetIndexedPName target, Int32 index, [OutAttribute] bool[] data)
@@ -42560,7 +42545,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetBooleani_v")]
         public static 
-        unsafe void GetBoolean(OpenTK.Graphics.OpenGL.GetIndexedPName target, UInt32 index, [OutAttribute] bool* data)
+        unsafe void GetBoolean(OpenTK.Graphics.OpenGL.GetIndexedPName target, Int32 index, [OutAttribute] bool* data)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -42616,15 +42601,15 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glGetBooleanv")]
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetBooleani_v")]
         public static 
-        unsafe void GetBoolean(OpenTK.Graphics.OpenGL.GetPName pname, [OutAttribute] bool* @params)
+        unsafe void GetBoolean(OpenTK.Graphics.OpenGL.GetIndexedPName target, UInt32 index, [OutAttribute] bool* data)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetBooleanv((OpenTK.Graphics.OpenGL.GetPName)pname, (bool*)@params);
+            Delegates.glGetBooleani_v((OpenTK.Graphics.OpenGL.GetIndexedPName)target, (UInt32)index, (bool*)data);
             #if DEBUG
             }
             #endif
@@ -42672,15 +42657,15 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version32", Version = "3.2", EntryPoint = "glGetBufferParameteri64v")]
+        [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glGetBooleanv")]
         public static 
-        unsafe void GetBufferParameteri64(OpenTK.Graphics.OpenGL.Version32 target, OpenTK.Graphics.OpenGL.Version32 pname, [OutAttribute] Int64* @params)
+        unsafe void GetBoolean(OpenTK.Graphics.OpenGL.GetPName pname, [OutAttribute] bool* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetBufferParameteri64v((OpenTK.Graphics.OpenGL.Version32)target, (OpenTK.Graphics.OpenGL.Version32)pname, (Int64*)@params);
+            Delegates.glGetBooleanv((OpenTK.Graphics.OpenGL.GetPName)pname, (bool*)@params);
             #if DEBUG
             }
             #endif
@@ -42727,35 +42712,16 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        
-        /// <summary>
-        /// Return parameters of a buffer object
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target buffer object. The symbolic constant must be GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, or GL_PIXEL_UNPACK_BUFFER.
-        /// </para>
-        /// </param>
-        /// <param name="value">
-        /// <para>
-        /// Specifies the symbolic name of a buffer object parameter. Accepted values are GL_BUFFER_ACCESS, GL_BUFFER_MAPPED, GL_BUFFER_SIZE, or GL_BUFFER_USAGE.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Returns the requested parameter.
-        /// </para>
-        /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glGetBufferParameteriv")]
+        [AutoGenerated(Category = "Version32", Version = "3.2", EntryPoint = "glGetBufferParameteri64v")]
         public static 
-        unsafe void GetBufferParameter(OpenTK.Graphics.OpenGL.BufferTarget target, OpenTK.Graphics.OpenGL.BufferParameterName pname, [OutAttribute] Int32* @params)
+        unsafe void GetBufferParameteri64(OpenTK.Graphics.OpenGL.Version32 target, OpenTK.Graphics.OpenGL.Version32 pname, [OutAttribute] Int64* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetBufferParameteriv((OpenTK.Graphics.OpenGL.BufferTarget)target, (OpenTK.Graphics.OpenGL.BufferParameterName)pname, (Int32*)@params);
+            Delegates.glGetBufferParameteri64v((OpenTK.Graphics.OpenGL.Version32)target, (OpenTK.Graphics.OpenGL.Version32)pname, (Int64*)@params);
             #if DEBUG
             }
             #endif
@@ -42842,42 +42808,33 @@ namespace OpenTK.Graphics.OpenGL
 
         
         /// <summary>
-        /// Return the pointer to a mapped buffer object's data store
+        /// Return parameters of a buffer object
         /// </summary>
         /// <param name="target">
         /// <para>
         /// Specifies the target buffer object. The symbolic constant must be GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, or GL_PIXEL_UNPACK_BUFFER.
         /// </para>
         /// </param>
-        /// <param name="pname">
+        /// <param name="value">
         /// <para>
-        /// Specifies the pointer to be returned. The symbolic constant must be GL_BUFFER_MAP_POINTER.
+        /// Specifies the symbolic name of a buffer object parameter. Accepted values are GL_BUFFER_ACCESS, GL_BUFFER_MAPPED, GL_BUFFER_SIZE, or GL_BUFFER_USAGE.
         /// </para>
         /// </param>
-        /// <param name="params">
+        /// <param name="data">
         /// <para>
-        /// Returns the pointer value specified by pname.
+        /// Returns the requested parameter.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glGetBufferPointerv")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glGetBufferParameteriv")]
         public static 
-        void GetBufferPointer<T2>(OpenTK.Graphics.OpenGL.BufferTarget target, OpenTK.Graphics.OpenGL.BufferPointer pname, [InAttribute, OutAttribute] ref T2 @params)
-            where T2 : struct
+        unsafe void GetBufferParameter(OpenTK.Graphics.OpenGL.BufferTarget target, OpenTK.Graphics.OpenGL.BufferParameterName pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle @params_ptr = GCHandle.Alloc(@params, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glGetBufferPointerv((OpenTK.Graphics.OpenGL.BufferTarget)target, (OpenTK.Graphics.OpenGL.BufferPointer)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
-                @params = (T2)@params_ptr.Target;
-            }
-            finally
-            {
-                @params_ptr.Free();
-            }
+            Delegates.glGetBufferParameteriv((OpenTK.Graphics.OpenGL.BufferTarget)target, (OpenTK.Graphics.OpenGL.BufferParameterName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -42904,7 +42861,40 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glGetBufferPointerv")]
         public static 
-        void GetBufferPointer<T2>(OpenTK.Graphics.OpenGL.BufferTarget target, OpenTK.Graphics.OpenGL.BufferPointer pname, [InAttribute, OutAttribute] T2[,,] @params)
+        void GetBufferPointer(OpenTK.Graphics.OpenGL.BufferTarget target, OpenTK.Graphics.OpenGL.BufferPointer pname, [OutAttribute] IntPtr @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetBufferPointerv((OpenTK.Graphics.OpenGL.BufferTarget)target, (OpenTK.Graphics.OpenGL.BufferPointer)pname, (IntPtr)@params);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Return the pointer to a mapped buffer object's data store
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target buffer object. The symbolic constant must be GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, or GL_PIXEL_UNPACK_BUFFER.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the pointer to be returned. The symbolic constant must be GL_BUFFER_MAP_POINTER.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the pointer value specified by pname.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glGetBufferPointerv")]
+        public static 
+        void GetBufferPointer<T2>(OpenTK.Graphics.OpenGL.BufferTarget target, OpenTK.Graphics.OpenGL.BufferPointer pname, [InAttribute, OutAttribute] T2[] @params)
             where T2 : struct
         {
             #if DEBUG
@@ -42988,7 +42978,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glGetBufferPointerv")]
         public static 
-        void GetBufferPointer<T2>(OpenTK.Graphics.OpenGL.BufferTarget target, OpenTK.Graphics.OpenGL.BufferPointer pname, [InAttribute, OutAttribute] T2[] @params)
+        void GetBufferPointer<T2>(OpenTK.Graphics.OpenGL.BufferTarget target, OpenTK.Graphics.OpenGL.BufferPointer pname, [InAttribute, OutAttribute] T2[,,] @params)
             where T2 : struct
         {
             #if DEBUG
@@ -43030,60 +43020,22 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glGetBufferPointerv")]
         public static 
-        void GetBufferPointer(OpenTK.Graphics.OpenGL.BufferTarget target, OpenTK.Graphics.OpenGL.BufferPointer pname, [OutAttribute] IntPtr @params)
+        void GetBufferPointer<T2>(OpenTK.Graphics.OpenGL.BufferTarget target, OpenTK.Graphics.OpenGL.BufferPointer pname, [InAttribute, OutAttribute] ref T2 @params)
+            where T2 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetBufferPointerv((OpenTK.Graphics.OpenGL.BufferTarget)target, (OpenTK.Graphics.OpenGL.BufferPointer)pname, (IntPtr)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Returns a subset of a buffer object's data store
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target buffer object. The symbolic constant must be GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, or GL_PIXEL_UNPACK_BUFFER.
-        /// </para>
-        /// </param>
-        /// <param name="offset">
-        /// <para>
-        /// Specifies the offset into the buffer object's data store from which data will be returned, measured in bytes.
-        /// </para>
-        /// </param>
-        /// <param name="size">
-        /// <para>
-        /// Specifies the size in bytes of the data store region being returned.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the location where buffer object data is returned.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glGetBufferSubData")]
-        public static 
-        void GetBufferSubData<T3>(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] ref T3 data)
-            where T3 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
+            GCHandle @params_ptr = GCHandle.Alloc(@params, GCHandleType.Pinned);
             try
             {
-                Delegates.glGetBufferSubData((OpenTK.Graphics.OpenGL.BufferTarget)target, (IntPtr)offset, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject());
-                data = (T3)data_ptr.Target;
+                Delegates.glGetBufferPointerv((OpenTK.Graphics.OpenGL.BufferTarget)target, (OpenTK.Graphics.OpenGL.BufferPointer)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
+                @params = (T2)@params_ptr.Target;
             }
             finally
             {
-                data_ptr.Free();
+                @params_ptr.Free();
             }
             #if DEBUG
             }
@@ -43116,7 +43068,45 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glGetBufferSubData")]
         public static 
-        void GetBufferSubData<T3>(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[,,] data)
+        void GetBufferSubData(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr offset, IntPtr size, [OutAttribute] IntPtr data)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetBufferSubData((OpenTK.Graphics.OpenGL.BufferTarget)target, (IntPtr)offset, (IntPtr)size, (IntPtr)data);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Returns a subset of a buffer object's data store
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target buffer object. The symbolic constant must be GL_ARRAY_BUFFER, GL_ELEMENT_ARRAY_BUFFER, GL_PIXEL_PACK_BUFFER, or GL_PIXEL_UNPACK_BUFFER.
+        /// </para>
+        /// </param>
+        /// <param name="offset">
+        /// <para>
+        /// Specifies the offset into the buffer object's data store from which data will be returned, measured in bytes.
+        /// </para>
+        /// </param>
+        /// <param name="size">
+        /// <para>
+        /// Specifies the size in bytes of the data store region being returned.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the location where buffer object data is returned.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glGetBufferSubData")]
+        public static 
+        void GetBufferSubData<T3>(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[] data)
             where T3 : struct
         {
             #if DEBUG
@@ -43210,7 +43200,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glGetBufferSubData")]
         public static 
-        void GetBufferSubData<T3>(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[] data)
+        void GetBufferSubData<T3>(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[,,] data)
             where T3 : struct
         {
             #if DEBUG
@@ -43257,42 +43247,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glGetBufferSubData")]
         public static 
-        void GetBufferSubData(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr offset, IntPtr size, [OutAttribute] IntPtr data)
+        void GetBufferSubData<T3>(OpenTK.Graphics.OpenGL.BufferTarget target, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] ref T3 data)
+            where T3 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetBufferSubData((OpenTK.Graphics.OpenGL.BufferTarget)target, (IntPtr)offset, (IntPtr)size, (IntPtr)data);
-            #if DEBUG
+            GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glGetBufferSubData((OpenTK.Graphics.OpenGL.BufferTarget)target, (IntPtr)offset, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject());
+                data = (T3)data_ptr.Target;
             }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Return the coefficients of the specified clipping plane
-        /// </summary>
-        /// <param name="plane">
-        /// <para>
-        /// Specifies a clipping plane. The number of clipping planes depends on the implementation, but at least six clipping planes are supported. They are identified by symbolic names of the form GL_CLIP_PLANE where i ranges from 0 to the value of GL_MAX_CLIP_PLANES - 1.
-        /// </para>
-        /// </param>
-        /// <param name="equation">
-        /// <para>
-        /// Returns four double-precision values that are the coefficients of the plane equation of plane in eye coordinates. The initial value is (0, 0, 0, 0).
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetClipPlane")]
-        public static 
-        unsafe void GetClipPlane(OpenTK.Graphics.OpenGL.ClipPlaneName plane, [OutAttribute] Double* equation)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            finally
             {
-            #endif
-            Delegates.glGetClipPlane((OpenTK.Graphics.OpenGL.ClipPlaneName)plane, (Double*)equation);
+                data_ptr.Free();
+            }
             #if DEBUG
             }
             #endif
@@ -43369,47 +43340,28 @@ namespace OpenTK.Graphics.OpenGL
 
         
         /// <summary>
-        /// Retrieve contents of a color lookup table
+        /// Return the coefficients of the specified clipping plane
         /// </summary>
-        /// <param name="target">
+        /// <param name="plane">
         /// <para>
-        /// Must be GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, or GL_POST_COLOR_MATRIX_COLOR_TABLE.
+        /// Specifies a clipping plane. The number of clipping planes depends on the implementation, but at least six clipping planes are supported. They are identified by symbolic names of the form GL_CLIP_PLANE where i ranges from 0 to the value of GL_MAX_CLIP_PLANES - 1.
         /// </para>
         /// </param>
-        /// <param name="format">
+        /// <param name="equation">
         /// <para>
-        /// The format of the pixel data in table. The possible values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_RGB, GL_BGR, GL_RGBA, and GL_BGRA.
+        /// Returns four double-precision values that are the coefficients of the plane equation of plane in eye coordinates. The initial value is (0, 0, 0, 0).
         /// </para>
         /// </param>
-        /// <param name="type">
-        /// <para>
-        /// The type of the pixel data in table. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="table">
-        /// <para>
-        /// Pointer to a one-dimensional array of pixel data containing the contents of the color table.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetColorTable")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetClipPlane")]
         public static 
-        void GetColorTable<T3>(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T3 table)
-            where T3 : struct
+        unsafe void GetClipPlane(OpenTK.Graphics.OpenGL.ClipPlaneName plane, [OutAttribute] Double* equation)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle table_ptr = GCHandle.Alloc(table, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glGetColorTable((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)table_ptr.AddrOfPinnedObject());
-                table = (T3)table_ptr.Target;
-            }
-            finally
-            {
-                table_ptr.Free();
-            }
+            Delegates.glGetClipPlane((OpenTK.Graphics.OpenGL.ClipPlaneName)plane, (Double*)equation);
             #if DEBUG
             }
             #endif
@@ -43441,7 +43393,45 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetColorTable")]
         public static 
-        void GetColorTable<T3>(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[,,] table)
+        void GetColorTable(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr table)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetColorTable((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)table);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Retrieve contents of a color lookup table
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, or GL_POST_COLOR_MATRIX_COLOR_TABLE.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// The format of the pixel data in table. The possible values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_RGB, GL_BGR, GL_RGBA, and GL_BGRA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// The type of the pixel data in table. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="table">
+        /// <para>
+        /// Pointer to a one-dimensional array of pixel data containing the contents of the color table.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetColorTable")]
+        public static 
+        void GetColorTable<T3>(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[] table)
             where T3 : struct
         {
             #if DEBUG
@@ -43535,7 +43525,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetColorTable")]
         public static 
-        void GetColorTable<T3>(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[] table)
+        void GetColorTable<T3>(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[,,] table)
             where T3 : struct
         {
             #if DEBUG
@@ -43582,13 +43572,62 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetColorTable")]
         public static 
-        void GetColorTable(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr table)
+        void GetColorTable<T3>(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T3 table)
+            where T3 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetColorTable((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)table);
+            GCHandle table_ptr = GCHandle.Alloc(table, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glGetColorTable((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)table_ptr.AddrOfPinnedObject());
+                table = (T3)table_ptr.Target;
+            }
+            finally
+            {
+                table_ptr.Free();
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Get color lookup table parameters
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The target color table. Must be GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, GL_POST_COLOR_MATRIX_COLOR_TABLE, GL_PROXY_COLOR_TABLE, GL_PROXY_POST_CONVOLUTION_COLOR_TABLE, or GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// The symbolic name of a color lookup table parameter. Must be one of GL_COLOR_TABLE_BIAS, GL_COLOR_TABLE_SCALE, GL_COLOR_TABLE_FORMAT, GL_COLOR_TABLE_WIDTH, GL_COLOR_TABLE_RED_SIZE, GL_COLOR_TABLE_GREEN_SIZE, GL_COLOR_TABLE_BLUE_SIZE, GL_COLOR_TABLE_ALPHA_SIZE, GL_COLOR_TABLE_LUMINANCE_SIZE, or GL_COLOR_TABLE_INTENSITY_SIZE.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// A pointer to an array where the values of the parameter will be stored.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetColorTableParameterfv")]
+        public static 
+        void GetColorTableParameter(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.GetColorTableParameterPName pname, [OutAttribute] Single[] @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* @params_ptr = @params)
+                {
+                    Delegates.glGetColorTableParameterfv((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (OpenTK.Graphics.OpenGL.GetColorTableParameterPName)pname, (Single*)@params_ptr);
+                }
+            }
             #if DEBUG
             }
             #endif
@@ -43669,79 +43708,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Get color lookup table parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The target color table. Must be GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, GL_POST_COLOR_MATRIX_COLOR_TABLE, GL_PROXY_COLOR_TABLE, GL_PROXY_POST_CONVOLUTION_COLOR_TABLE, or GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// The symbolic name of a color lookup table parameter. Must be one of GL_COLOR_TABLE_BIAS, GL_COLOR_TABLE_SCALE, GL_COLOR_TABLE_FORMAT, GL_COLOR_TABLE_WIDTH, GL_COLOR_TABLE_RED_SIZE, GL_COLOR_TABLE_GREEN_SIZE, GL_COLOR_TABLE_BLUE_SIZE, GL_COLOR_TABLE_ALPHA_SIZE, GL_COLOR_TABLE_LUMINANCE_SIZE, or GL_COLOR_TABLE_INTENSITY_SIZE.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// A pointer to an array where the values of the parameter will be stored.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetColorTableParameterfv")]
-        public static 
-        void GetColorTableParameter(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.GetColorTableParameterPName pname, [OutAttribute] Single[] @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* @params_ptr = @params)
-                {
-                    Delegates.glGetColorTableParameterfv((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (OpenTK.Graphics.OpenGL.GetColorTableParameterPName)pname, (Single*)@params_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Get color lookup table parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The target color table. Must be GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, GL_POST_COLOR_MATRIX_COLOR_TABLE, GL_PROXY_COLOR_TABLE, GL_PROXY_POST_CONVOLUTION_COLOR_TABLE, or GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// The symbolic name of a color lookup table parameter. Must be one of GL_COLOR_TABLE_BIAS, GL_COLOR_TABLE_SCALE, GL_COLOR_TABLE_FORMAT, GL_COLOR_TABLE_WIDTH, GL_COLOR_TABLE_RED_SIZE, GL_COLOR_TABLE_GREEN_SIZE, GL_COLOR_TABLE_BLUE_SIZE, GL_COLOR_TABLE_ALPHA_SIZE, GL_COLOR_TABLE_LUMINANCE_SIZE, or GL_COLOR_TABLE_INTENSITY_SIZE.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// A pointer to an array where the values of the parameter will be stored.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetColorTableParameteriv")]
-        public static 
-        unsafe void GetColorTableParameter(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.GetColorTableParameterPName pname, [OutAttribute] Int32* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGetColorTableParameteriv((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (OpenTK.Graphics.OpenGL.GetColorTableParameterPName)pname, (Int32*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Get color lookup table parameters
         /// </summary>
@@ -43822,42 +43788,33 @@ namespace OpenTK.Graphics.OpenGL
 
         
         /// <summary>
-        /// Return a compressed texture image
+        /// Get color lookup table parameters
         /// </summary>
         /// <param name="target">
         /// <para>
-        /// Specifies which texture is to be obtained. GL_TEXTURE_1D, GL_TEXTURE_2D, and GL_TEXTURE_3D GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, and GL_TEXTURE_CUBE_MAP_NEGATIVE_Z are accepted.
+        /// The target color table. Must be GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, GL_POST_COLOR_MATRIX_COLOR_TABLE, GL_PROXY_COLOR_TABLE, GL_PROXY_POST_CONVOLUTION_COLOR_TABLE, or GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE.
         /// </para>
         /// </param>
-        /// <param name="lod">
+        /// <param name="pname">
         /// <para>
-        /// Specifies the level-of-detail number of the desired image. Level 0 is the base image level. Level is the th mipmap reduction image.
+        /// The symbolic name of a color lookup table parameter. Must be one of GL_COLOR_TABLE_BIAS, GL_COLOR_TABLE_SCALE, GL_COLOR_TABLE_FORMAT, GL_COLOR_TABLE_WIDTH, GL_COLOR_TABLE_RED_SIZE, GL_COLOR_TABLE_GREEN_SIZE, GL_COLOR_TABLE_BLUE_SIZE, GL_COLOR_TABLE_ALPHA_SIZE, GL_COLOR_TABLE_LUMINANCE_SIZE, or GL_COLOR_TABLE_INTENSITY_SIZE.
         /// </para>
         /// </param>
-        /// <param name="img">
+        /// <param name="params">
         /// <para>
-        /// Returns the compressed texture image.
+        /// A pointer to an array where the values of the parameter will be stored.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glGetCompressedTexImage")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetColorTableParameteriv")]
         public static 
-        void GetCompressedTexImage<T2>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, [InAttribute, OutAttribute] ref T2 img)
-            where T2 : struct
+        unsafe void GetColorTableParameter(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.GetColorTableParameterPName pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle img_ptr = GCHandle.Alloc(img, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glGetCompressedTexImage((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (IntPtr)img_ptr.AddrOfPinnedObject());
-                img = (T2)img_ptr.Target;
-            }
-            finally
-            {
-                img_ptr.Free();
-            }
+            Delegates.glGetColorTableParameteriv((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (OpenTK.Graphics.OpenGL.GetColorTableParameterPName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -43884,7 +43841,40 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glGetCompressedTexImage")]
         public static 
-        void GetCompressedTexImage<T2>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, [InAttribute, OutAttribute] T2[,,] img)
+        void GetCompressedTexImage(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, [OutAttribute] IntPtr img)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetCompressedTexImage((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (IntPtr)img);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Return a compressed texture image
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies which texture is to be obtained. GL_TEXTURE_1D, GL_TEXTURE_2D, and GL_TEXTURE_3D GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, and GL_TEXTURE_CUBE_MAP_NEGATIVE_Z are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="lod">
+        /// <para>
+        /// Specifies the level-of-detail number of the desired image. Level 0 is the base image level. Level is the th mipmap reduction image.
+        /// </para>
+        /// </param>
+        /// <param name="img">
+        /// <para>
+        /// Returns the compressed texture image.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glGetCompressedTexImage")]
+        public static 
+        void GetCompressedTexImage<T2>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, [InAttribute, OutAttribute] T2[] img)
             where T2 : struct
         {
             #if DEBUG
@@ -43968,7 +43958,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glGetCompressedTexImage")]
         public static 
-        void GetCompressedTexImage<T2>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, [InAttribute, OutAttribute] T2[] img)
+        void GetCompressedTexImage<T2>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, [InAttribute, OutAttribute] T2[,,] img)
             where T2 : struct
         {
             #if DEBUG
@@ -44010,60 +44000,22 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version13", Version = "1.3", EntryPoint = "glGetCompressedTexImage")]
         public static 
-        void GetCompressedTexImage(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, [OutAttribute] IntPtr img)
+        void GetCompressedTexImage<T2>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, [InAttribute, OutAttribute] ref T2 img)
+            where T2 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetCompressedTexImage((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (IntPtr)img);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Get current 1D or 2D convolution filter kernel
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The filter to be retrieved. Must be one of GL_CONVOLUTION_1D or GL_CONVOLUTION_2D.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Format of the output image. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Data type of components in the output image. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="image">
-        /// <para>
-        /// Pointer to storage for the output image.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetConvolutionFilter")]
-        public static 
-        void GetConvolutionFilter<T3>(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T3 image)
-            where T3 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle image_ptr = GCHandle.Alloc(image, GCHandleType.Pinned);
+            GCHandle img_ptr = GCHandle.Alloc(img, GCHandleType.Pinned);
             try
             {
-                Delegates.glGetConvolutionFilter((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)image_ptr.AddrOfPinnedObject());
-                image = (T3)image_ptr.Target;
+                Delegates.glGetCompressedTexImage((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (IntPtr)img_ptr.AddrOfPinnedObject());
+                img = (T2)img_ptr.Target;
             }
             finally
             {
-                image_ptr.Free();
+                img_ptr.Free();
             }
             #if DEBUG
             }
@@ -44096,7 +44048,45 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetConvolutionFilter")]
         public static 
-        void GetConvolutionFilter<T3>(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[,,] image)
+        void GetConvolutionFilter(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr image)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetConvolutionFilter((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)image);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Get current 1D or 2D convolution filter kernel
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The filter to be retrieved. Must be one of GL_CONVOLUTION_1D or GL_CONVOLUTION_2D.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Format of the output image. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Data type of components in the output image. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="image">
+        /// <para>
+        /// Pointer to storage for the output image.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetConvolutionFilter")]
+        public static 
+        void GetConvolutionFilter<T3>(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[] image)
             where T3 : struct
         {
             #if DEBUG
@@ -44190,7 +44180,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetConvolutionFilter")]
         public static 
-        void GetConvolutionFilter<T3>(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[] image)
+        void GetConvolutionFilter<T3>(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[,,] image)
             where T3 : struct
         {
             #if DEBUG
@@ -44237,13 +44227,62 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetConvolutionFilter")]
         public static 
-        void GetConvolutionFilter(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr image)
+        void GetConvolutionFilter<T3>(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T3 image)
+            where T3 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetConvolutionFilter((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)image);
+            GCHandle image_ptr = GCHandle.Alloc(image, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glGetConvolutionFilter((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)image_ptr.AddrOfPinnedObject());
+                image = (T3)image_ptr.Target;
+            }
+            finally
+            {
+                image_ptr.Free();
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Get convolution parameters
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The filter whose parameters are to be retrieved. Must be one of GL_CONVOLUTION_1D, GL_CONVOLUTION_2D, or GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// The parameter to be retrieved. Must be one of GL_CONVOLUTION_BORDER_MODE, GL_CONVOLUTION_BORDER_COLOR, GL_CONVOLUTION_FILTER_SCALE, GL_CONVOLUTION_FILTER_BIAS, GL_CONVOLUTION_FORMAT, GL_CONVOLUTION_WIDTH, GL_CONVOLUTION_HEIGHT, GL_MAX_CONVOLUTION_WIDTH, or GL_MAX_CONVOLUTION_HEIGHT.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Pointer to storage for the parameters to be retrieved.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetConvolutionParameterfv")]
+        public static 
+        void GetConvolutionParameter(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.GetConvolutionParameterPName pname, [OutAttribute] Single[] @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* @params_ptr = @params)
+                {
+                    Delegates.glGetConvolutionParameterfv((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.GetConvolutionParameterPName)pname, (Single*)@params_ptr);
+                }
+            }
             #if DEBUG
             }
             #endif
@@ -44324,79 +44363,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Get convolution parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The filter whose parameters are to be retrieved. Must be one of GL_CONVOLUTION_1D, GL_CONVOLUTION_2D, or GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// The parameter to be retrieved. Must be one of GL_CONVOLUTION_BORDER_MODE, GL_CONVOLUTION_BORDER_COLOR, GL_CONVOLUTION_FILTER_SCALE, GL_CONVOLUTION_FILTER_BIAS, GL_CONVOLUTION_FORMAT, GL_CONVOLUTION_WIDTH, GL_CONVOLUTION_HEIGHT, GL_MAX_CONVOLUTION_WIDTH, or GL_MAX_CONVOLUTION_HEIGHT.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Pointer to storage for the parameters to be retrieved.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetConvolutionParameterfv")]
-        public static 
-        void GetConvolutionParameter(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.GetConvolutionParameterPName pname, [OutAttribute] Single[] @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* @params_ptr = @params)
-                {
-                    Delegates.glGetConvolutionParameterfv((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.GetConvolutionParameterPName)pname, (Single*)@params_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Get convolution parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The filter whose parameters are to be retrieved. Must be one of GL_CONVOLUTION_1D, GL_CONVOLUTION_2D, or GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// The parameter to be retrieved. Must be one of GL_CONVOLUTION_BORDER_MODE, GL_CONVOLUTION_BORDER_COLOR, GL_CONVOLUTION_FILTER_SCALE, GL_CONVOLUTION_FILTER_BIAS, GL_CONVOLUTION_FORMAT, GL_CONVOLUTION_WIDTH, GL_CONVOLUTION_HEIGHT, GL_MAX_CONVOLUTION_WIDTH, or GL_MAX_CONVOLUTION_HEIGHT.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Pointer to storage for the parameters to be retrieved.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetConvolutionParameteriv")]
-        public static 
-        unsafe void GetConvolutionParameter(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.GetConvolutionParameterPName pname, [OutAttribute] Int32* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGetConvolutionParameteriv((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.GetConvolutionParameterPName)pname, (Int32*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Get convolution parameters
         /// </summary>
@@ -44475,16 +44441,35 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        
+        /// <summary>
+        /// Get convolution parameters
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The filter whose parameters are to be retrieved. Must be one of GL_CONVOLUTION_1D, GL_CONVOLUTION_2D, or GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// The parameter to be retrieved. Must be one of GL_CONVOLUTION_BORDER_MODE, GL_CONVOLUTION_BORDER_COLOR, GL_CONVOLUTION_FILTER_SCALE, GL_CONVOLUTION_FILTER_BIAS, GL_CONVOLUTION_FORMAT, GL_CONVOLUTION_WIDTH, GL_CONVOLUTION_HEIGHT, GL_MAX_CONVOLUTION_WIDTH, or GL_MAX_CONVOLUTION_HEIGHT.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Pointer to storage for the parameters to be retrieved.
+        /// </para>
+        /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glGetDoublev")]
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetConvolutionParameteriv")]
         public static 
-        unsafe void GetDouble(OpenTK.Graphics.OpenGL.GetPName pname, [OutAttribute] Double* @params)
+        unsafe void GetConvolutionParameter(OpenTK.Graphics.OpenGL.ConvolutionTarget target, OpenTK.Graphics.OpenGL.GetConvolutionParameterPName pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetDoublev((OpenTK.Graphics.OpenGL.GetPName)pname, (Double*)@params);
+            Delegates.glGetConvolutionParameteriv((OpenTK.Graphics.OpenGL.ConvolutionTarget)target, (OpenTK.Graphics.OpenGL.GetConvolutionParameterPName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -44531,6 +44516,21 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glGetDoublev")]
+        public static 
+        unsafe void GetDouble(OpenTK.Graphics.OpenGL.GetPName pname, [OutAttribute] Double* @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetDoublev((OpenTK.Graphics.OpenGL.GetPName)pname, (Double*)@params);
+            #if DEBUG
+            }
+            #endif
+        }
+
         
         /// <summary>
         /// Return error information
@@ -44542,6 +44542,26 @@ namespace OpenTK.Graphics.OpenGL
             return Delegates.glGetError();
         }
 
+        [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glGetFloatv")]
+        public static 
+        void GetFloat(OpenTK.Graphics.OpenGL.GetPName pname, [OutAttribute] Single[] @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* @params_ptr = @params)
+                {
+                    Delegates.glGetFloatv((OpenTK.Graphics.OpenGL.GetPName)pname, (Single*)@params_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
         [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glGetFloatv")]
         public static 
         void GetFloat(OpenTK.Graphics.OpenGL.GetPName pname, [OutAttribute] out Single @params)
@@ -44578,26 +44598,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glGetFloatv")]
-        public static 
-        void GetFloat(OpenTK.Graphics.OpenGL.GetPName pname, [OutAttribute] Single[] @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* @params_ptr = @params)
-                {
-                    Delegates.glGetFloatv((OpenTK.Graphics.OpenGL.GetPName)pname, (Single*)@params_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetFragDataLocation")]
         public static 
         Int32 GetFragDataLocation(Int32 program, String name)
@@ -44627,21 +44627,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glGetFramebufferAttachmentParameteriv")]
-        public static 
-        unsafe void GetFramebufferAttachmentParameter(OpenTK.Graphics.OpenGL.FramebufferTarget target, OpenTK.Graphics.OpenGL.FramebufferAttachment attachment, OpenTK.Graphics.OpenGL.FramebufferParameterName pname, [OutAttribute] Int32* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGetFramebufferAttachmentParameteriv((OpenTK.Graphics.OpenGL.FramebufferTarget)target, (OpenTK.Graphics.OpenGL.FramebufferAttachment)attachment, (OpenTK.Graphics.OpenGL.FramebufferParameterName)pname, (Int32*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glGetFramebufferAttachmentParameteriv")]
         public static 
         void GetFramebufferAttachmentParameter(OpenTK.Graphics.OpenGL.FramebufferTarget target, OpenTK.Graphics.OpenGL.FramebufferAttachment attachment, OpenTK.Graphics.OpenGL.FramebufferParameterName pname, [OutAttribute] Int32[] @params)
@@ -44683,54 +44668,16 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        
-        /// <summary>
-        /// Get histogram table
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Must be GL_HISTOGRAM.
-        /// </para>
-        /// </param>
-        /// <param name="reset">
-        /// <para>
-        /// If GL_TRUE, each component counter that is actually returned is reset to zero. (Other counters are unaffected.) If GL_FALSE, none of the counters in the histogram table is modified.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// The format of values to be returned in values. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// The type of values to be returned in values. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="values">
-        /// <para>
-        /// A pointer to storage for the returned histogram table.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetHistogram")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glGetFramebufferAttachmentParameteriv")]
         public static 
-        void GetHistogram<T4>(OpenTK.Graphics.OpenGL.HistogramTarget target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T4 values)
-            where T4 : struct
+        unsafe void GetFramebufferAttachmentParameter(OpenTK.Graphics.OpenGL.FramebufferTarget target, OpenTK.Graphics.OpenGL.FramebufferAttachment attachment, OpenTK.Graphics.OpenGL.FramebufferParameterName pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle values_ptr = GCHandle.Alloc(values, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glGetHistogram((OpenTK.Graphics.OpenGL.HistogramTarget)target, (bool)reset, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)values_ptr.AddrOfPinnedObject());
-                values = (T4)values_ptr.Target;
-            }
-            finally
-            {
-                values_ptr.Free();
-            }
+            Delegates.glGetFramebufferAttachmentParameteriv((OpenTK.Graphics.OpenGL.FramebufferTarget)target, (OpenTK.Graphics.OpenGL.FramebufferAttachment)attachment, (OpenTK.Graphics.OpenGL.FramebufferParameterName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -44767,7 +44714,50 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetHistogram")]
         public static 
-        void GetHistogram<T4>(OpenTK.Graphics.OpenGL.HistogramTarget target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[,,] values)
+        void GetHistogram(OpenTK.Graphics.OpenGL.HistogramTarget target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr values)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetHistogram((OpenTK.Graphics.OpenGL.HistogramTarget)target, (bool)reset, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)values);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Get histogram table
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be GL_HISTOGRAM.
+        /// </para>
+        /// </param>
+        /// <param name="reset">
+        /// <para>
+        /// If GL_TRUE, each component counter that is actually returned is reset to zero. (Other counters are unaffected.) If GL_FALSE, none of the counters in the histogram table is modified.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// The format of values to be returned in values. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// The type of values to be returned in values. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="values">
+        /// <para>
+        /// A pointer to storage for the returned histogram table.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetHistogram")]
+        public static 
+        void GetHistogram<T4>(OpenTK.Graphics.OpenGL.HistogramTarget target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[] values)
             where T4 : struct
         {
             #if DEBUG
@@ -44871,7 +44861,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetHistogram")]
         public static 
-        void GetHistogram<T4>(OpenTK.Graphics.OpenGL.HistogramTarget target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[] values)
+        void GetHistogram<T4>(OpenTK.Graphics.OpenGL.HistogramTarget target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[,,] values)
             where T4 : struct
         {
             #if DEBUG
@@ -44923,13 +44913,62 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetHistogram")]
         public static 
-        void GetHistogram(OpenTK.Graphics.OpenGL.HistogramTarget target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr values)
+        void GetHistogram<T4>(OpenTK.Graphics.OpenGL.HistogramTarget target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T4 values)
+            where T4 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetHistogram((OpenTK.Graphics.OpenGL.HistogramTarget)target, (bool)reset, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)values);
+            GCHandle values_ptr = GCHandle.Alloc(values, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glGetHistogram((OpenTK.Graphics.OpenGL.HistogramTarget)target, (bool)reset, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)values_ptr.AddrOfPinnedObject());
+                values = (T4)values_ptr.Target;
+            }
+            finally
+            {
+                values_ptr.Free();
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Get histogram parameters
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be one of GL_HISTOGRAM or GL_PROXY_HISTOGRAM.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// The name of the parameter to be retrieved. Must be one of GL_HISTOGRAM_WIDTH, GL_HISTOGRAM_FORMAT, GL_HISTOGRAM_RED_SIZE, GL_HISTOGRAM_GREEN_SIZE, GL_HISTOGRAM_BLUE_SIZE, GL_HISTOGRAM_ALPHA_SIZE, GL_HISTOGRAM_LUMINANCE_SIZE, or GL_HISTOGRAM_SINK.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Pointer to storage for the returned values.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetHistogramParameterfv")]
+        public static 
+        void GetHistogramParameter(OpenTK.Graphics.OpenGL.HistogramTarget target, OpenTK.Graphics.OpenGL.GetHistogramParameterPName pname, [OutAttribute] Single[] @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* @params_ptr = @params)
+                {
+                    Delegates.glGetHistogramParameterfv((OpenTK.Graphics.OpenGL.HistogramTarget)target, (OpenTK.Graphics.OpenGL.GetHistogramParameterPName)pname, (Single*)@params_ptr);
+                }
+            }
             #if DEBUG
             }
             #endif
@@ -45010,79 +45049,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Get histogram parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Must be one of GL_HISTOGRAM or GL_PROXY_HISTOGRAM.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// The name of the parameter to be retrieved. Must be one of GL_HISTOGRAM_WIDTH, GL_HISTOGRAM_FORMAT, GL_HISTOGRAM_RED_SIZE, GL_HISTOGRAM_GREEN_SIZE, GL_HISTOGRAM_BLUE_SIZE, GL_HISTOGRAM_ALPHA_SIZE, GL_HISTOGRAM_LUMINANCE_SIZE, or GL_HISTOGRAM_SINK.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Pointer to storage for the returned values.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetHistogramParameterfv")]
-        public static 
-        void GetHistogramParameter(OpenTK.Graphics.OpenGL.HistogramTarget target, OpenTK.Graphics.OpenGL.GetHistogramParameterPName pname, [OutAttribute] Single[] @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* @params_ptr = @params)
-                {
-                    Delegates.glGetHistogramParameterfv((OpenTK.Graphics.OpenGL.HistogramTarget)target, (OpenTK.Graphics.OpenGL.GetHistogramParameterPName)pname, (Single*)@params_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Get histogram parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Must be one of GL_HISTOGRAM or GL_PROXY_HISTOGRAM.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// The name of the parameter to be retrieved. Must be one of GL_HISTOGRAM_WIDTH, GL_HISTOGRAM_FORMAT, GL_HISTOGRAM_RED_SIZE, GL_HISTOGRAM_GREEN_SIZE, GL_HISTOGRAM_BLUE_SIZE, GL_HISTOGRAM_ALPHA_SIZE, GL_HISTOGRAM_LUMINANCE_SIZE, or GL_HISTOGRAM_SINK.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Pointer to storage for the returned values.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetHistogramParameteriv")]
-        public static 
-        unsafe void GetHistogramParameter(OpenTK.Graphics.OpenGL.HistogramTarget target, OpenTK.Graphics.OpenGL.GetHistogramParameterPName pname, [OutAttribute] Int32* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGetHistogramParameteriv((OpenTK.Graphics.OpenGL.HistogramTarget)target, (OpenTK.Graphics.OpenGL.GetHistogramParameterPName)pname, (Int32*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Get histogram parameters
         /// </summary>
@@ -45161,16 +45127,35 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        
+        /// <summary>
+        /// Get histogram parameters
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be one of GL_HISTOGRAM or GL_PROXY_HISTOGRAM.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// The name of the parameter to be retrieved. Must be one of GL_HISTOGRAM_WIDTH, GL_HISTOGRAM_FORMAT, GL_HISTOGRAM_RED_SIZE, GL_HISTOGRAM_GREEN_SIZE, GL_HISTOGRAM_BLUE_SIZE, GL_HISTOGRAM_ALPHA_SIZE, GL_HISTOGRAM_LUMINANCE_SIZE, or GL_HISTOGRAM_SINK.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Pointer to storage for the returned values.
+        /// </para>
+        /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version32", Version = "3.2", EntryPoint = "glGetInteger64i_v")]
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetHistogramParameteriv")]
         public static 
-        unsafe void GetInteger64(OpenTK.Graphics.OpenGL.Version32 target, Int32 index, [OutAttribute] Int64* data)
+        unsafe void GetHistogramParameter(OpenTK.Graphics.OpenGL.HistogramTarget target, OpenTK.Graphics.OpenGL.GetHistogramParameterPName pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetInteger64i_v((OpenTK.Graphics.OpenGL.Version32)target, (UInt32)index, (Int64*)data);
+            Delegates.glGetHistogramParameteriv((OpenTK.Graphics.OpenGL.HistogramTarget)target, (OpenTK.Graphics.OpenGL.GetHistogramParameterPName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -45220,7 +45205,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version32", Version = "3.2", EntryPoint = "glGetInteger64i_v")]
         public static 
-        unsafe void GetInteger64(OpenTK.Graphics.OpenGL.Version32 target, UInt32 index, [OutAttribute] Int64* data)
+        unsafe void GetInteger64(OpenTK.Graphics.OpenGL.Version32 target, Int32 index, [OutAttribute] Int64* data)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -45276,15 +45261,15 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ArbSync", Version = "1.2", EntryPoint = "glGetInteger64v")]
+        [AutoGenerated(Category = "Version32", Version = "3.2", EntryPoint = "glGetInteger64i_v")]
         public static 
-        unsafe void GetInteger64(OpenTK.Graphics.OpenGL.ArbSync pname, [OutAttribute] Int64* @params)
+        unsafe void GetInteger64(OpenTK.Graphics.OpenGL.Version32 target, UInt32 index, [OutAttribute] Int64* data)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetInteger64v((OpenTK.Graphics.OpenGL.ArbSync)pname, (Int64*)@params);
+            Delegates.glGetInteger64i_v((OpenTK.Graphics.OpenGL.Version32)target, (UInt32)index, (Int64*)data);
             #if DEBUG
             }
             #endif
@@ -45332,15 +45317,15 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetIntegeri_v")]
+        [AutoGenerated(Category = "ArbSync", Version = "1.2", EntryPoint = "glGetInteger64v")]
         public static 
-        unsafe void GetInteger(OpenTK.Graphics.OpenGL.GetIndexedPName target, Int32 index, [OutAttribute] Int32* data)
+        unsafe void GetInteger64(OpenTK.Graphics.OpenGL.ArbSync pname, [OutAttribute] Int64* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetIntegeri_v((OpenTK.Graphics.OpenGL.GetIndexedPName)target, (UInt32)index, (Int32*)data);
+            Delegates.glGetInteger64v((OpenTK.Graphics.OpenGL.ArbSync)pname, (Int64*)@params);
             #if DEBUG
             }
             #endif
@@ -45390,7 +45375,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetIntegeri_v")]
         public static 
-        unsafe void GetInteger(OpenTK.Graphics.OpenGL.GetIndexedPName target, UInt32 index, [OutAttribute] Int32* data)
+        unsafe void GetInteger(OpenTK.Graphics.OpenGL.GetIndexedPName target, Int32 index, [OutAttribute] Int32* data)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -45446,15 +45431,15 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glGetIntegerv")]
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetIntegeri_v")]
         public static 
-        unsafe void GetInteger(OpenTK.Graphics.OpenGL.GetPName pname, [OutAttribute] Int32* @params)
+        unsafe void GetInteger(OpenTK.Graphics.OpenGL.GetIndexedPName target, UInt32 index, [OutAttribute] Int32* data)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetIntegerv((OpenTK.Graphics.OpenGL.GetPName)pname, (Int32*)@params);
+            Delegates.glGetIntegeri_v((OpenTK.Graphics.OpenGL.GetIndexedPName)target, (UInt32)index, (Int32*)data);
             #if DEBUG
             }
             #endif
@@ -45501,6 +45486,60 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glGetIntegerv")]
+        public static 
+        unsafe void GetInteger(OpenTK.Graphics.OpenGL.GetPName pname, [OutAttribute] Int32* @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetIntegerv((OpenTK.Graphics.OpenGL.GetPName)pname, (Int32*)@params);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Return light source parameter values
+        /// </summary>
+        /// <param name="light">
+        /// <para>
+        /// Specifies a light source. The number of possible lights depends on the implementation, but at least eight lights are supported. They are identified by symbolic names of the form GL_LIGHT where ranges from 0 to the value of GL_MAX_LIGHTS - 1.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies a light source parameter for light. Accepted symbolic names are GL_AMBIENT, GL_DIFFUSE, GL_SPECULAR, GL_POSITION, GL_SPOT_DIRECTION, GL_SPOT_EXPONENT, GL_SPOT_CUTOFF, GL_CONSTANT_ATTENUATION, GL_LINEAR_ATTENUATION, and GL_QUADRATIC_ATTENUATION.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the requested data.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetLightfv")]
+        public static 
+        void GetLight(OpenTK.Graphics.OpenGL.LightName light, OpenTK.Graphics.OpenGL.LightParameter pname, [OutAttribute] Single[] @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* @params_ptr = @params)
+                {
+                    Delegates.glGetLightfv((OpenTK.Graphics.OpenGL.LightName)light, (OpenTK.Graphics.OpenGL.LightParameter)pname, (Single*)@params_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
         
         /// <summary>
         /// Return light source parameter values
@@ -45576,79 +45615,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Return light source parameter values
-        /// </summary>
-        /// <param name="light">
-        /// <para>
-        /// Specifies a light source. The number of possible lights depends on the implementation, but at least eight lights are supported. They are identified by symbolic names of the form GL_LIGHT where ranges from 0 to the value of GL_MAX_LIGHTS - 1.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies a light source parameter for light. Accepted symbolic names are GL_AMBIENT, GL_DIFFUSE, GL_SPECULAR, GL_POSITION, GL_SPOT_DIRECTION, GL_SPOT_EXPONENT, GL_SPOT_CUTOFF, GL_CONSTANT_ATTENUATION, GL_LINEAR_ATTENUATION, and GL_QUADRATIC_ATTENUATION.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the requested data.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetLightfv")]
-        public static 
-        void GetLight(OpenTK.Graphics.OpenGL.LightName light, OpenTK.Graphics.OpenGL.LightParameter pname, [OutAttribute] Single[] @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* @params_ptr = @params)
-                {
-                    Delegates.glGetLightfv((OpenTK.Graphics.OpenGL.LightName)light, (OpenTK.Graphics.OpenGL.LightParameter)pname, (Single*)@params_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Return light source parameter values
-        /// </summary>
-        /// <param name="light">
-        /// <para>
-        /// Specifies a light source. The number of possible lights depends on the implementation, but at least eight lights are supported. They are identified by symbolic names of the form GL_LIGHT where ranges from 0 to the value of GL_MAX_LIGHTS - 1.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies a light source parameter for light. Accepted symbolic names are GL_AMBIENT, GL_DIFFUSE, GL_SPECULAR, GL_POSITION, GL_SPOT_DIRECTION, GL_SPOT_EXPONENT, GL_SPOT_CUTOFF, GL_CONSTANT_ATTENUATION, GL_LINEAR_ATTENUATION, and GL_QUADRATIC_ATTENUATION.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the requested data.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetLightiv")]
-        public static 
-        unsafe void GetLight(OpenTK.Graphics.OpenGL.LightName light, OpenTK.Graphics.OpenGL.LightParameter pname, [OutAttribute] Int32* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGetLightiv((OpenTK.Graphics.OpenGL.LightName)light, (OpenTK.Graphics.OpenGL.LightParameter)pname, (Int32*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Return light source parameter values
         /// </summary>
@@ -45729,33 +45695,33 @@ namespace OpenTK.Graphics.OpenGL
 
         
         /// <summary>
-        /// Return evaluator parameters
+        /// Return light source parameter values
         /// </summary>
-        /// <param name="target">
+        /// <param name="light">
         /// <para>
-        /// Specifies the symbolic name of a map. Accepted values are GL_MAP1_COLOR_4, GL_MAP1_INDEX, GL_MAP1_NORMAL, GL_MAP1_TEXTURE_COORD_1, GL_MAP1_TEXTURE_COORD_2, GL_MAP1_TEXTURE_COORD_3, GL_MAP1_TEXTURE_COORD_4, GL_MAP1_VERTEX_3, GL_MAP1_VERTEX_4, GL_MAP2_COLOR_4, GL_MAP2_INDEX, GL_MAP2_NORMAL, GL_MAP2_TEXTURE_COORD_1, GL_MAP2_TEXTURE_COORD_2, GL_MAP2_TEXTURE_COORD_3, GL_MAP2_TEXTURE_COORD_4, GL_MAP2_VERTEX_3, and GL_MAP2_VERTEX_4.
+        /// Specifies a light source. The number of possible lights depends on the implementation, but at least eight lights are supported. They are identified by symbolic names of the form GL_LIGHT where ranges from 0 to the value of GL_MAX_LIGHTS - 1.
         /// </para>
         /// </param>
-        /// <param name="query">
+        /// <param name="pname">
         /// <para>
-        /// Specifies which parameter to return. Symbolic names GL_COEFF, GL_ORDER, and GL_DOMAIN are accepted.
+        /// Specifies a light source parameter for light. Accepted symbolic names are GL_AMBIENT, GL_DIFFUSE, GL_SPECULAR, GL_POSITION, GL_SPOT_DIRECTION, GL_SPOT_EXPONENT, GL_SPOT_CUTOFF, GL_CONSTANT_ATTENUATION, GL_LINEAR_ATTENUATION, and GL_QUADRATIC_ATTENUATION.
         /// </para>
         /// </param>
-        /// <param name="v">
+        /// <param name="params">
         /// <para>
         /// Returns the requested data.
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetMapdv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetLightiv")]
         public static 
-        unsafe void GetMap(OpenTK.Graphics.OpenGL.MapTarget target, OpenTK.Graphics.OpenGL.GetMapQuery query, [OutAttribute] Double* v)
+        unsafe void GetLight(OpenTK.Graphics.OpenGL.LightName light, OpenTK.Graphics.OpenGL.LightParameter pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetMapdv((OpenTK.Graphics.OpenGL.MapTarget)target, (OpenTK.Graphics.OpenGL.GetMapQuery)query, (Double*)v);
+            Delegates.glGetLightiv((OpenTK.Graphics.OpenGL.LightName)light, (OpenTK.Graphics.OpenGL.LightParameter)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -45841,46 +45807,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Return evaluator parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the symbolic name of a map. Accepted values are GL_MAP1_COLOR_4, GL_MAP1_INDEX, GL_MAP1_NORMAL, GL_MAP1_TEXTURE_COORD_1, GL_MAP1_TEXTURE_COORD_2, GL_MAP1_TEXTURE_COORD_3, GL_MAP1_TEXTURE_COORD_4, GL_MAP1_VERTEX_3, GL_MAP1_VERTEX_4, GL_MAP2_COLOR_4, GL_MAP2_INDEX, GL_MAP2_NORMAL, GL_MAP2_TEXTURE_COORD_1, GL_MAP2_TEXTURE_COORD_2, GL_MAP2_TEXTURE_COORD_3, GL_MAP2_TEXTURE_COORD_4, GL_MAP2_VERTEX_3, and GL_MAP2_VERTEX_4.
-        /// </para>
-        /// </param>
-        /// <param name="query">
-        /// <para>
-        /// Specifies which parameter to return. Symbolic names GL_COEFF, GL_ORDER, and GL_DOMAIN are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="v">
-        /// <para>
-        /// Returns the requested data.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetMapfv")]
-        public static 
-        void GetMap(OpenTK.Graphics.OpenGL.MapTarget target, OpenTK.Graphics.OpenGL.GetMapQuery query, [OutAttribute] out Single v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* v_ptr = &v)
-                {
-                    Delegates.glGetMapfv((OpenTK.Graphics.OpenGL.MapTarget)target, (OpenTK.Graphics.OpenGL.GetMapQuery)query, (Single*)v_ptr);
-                    v = *v_ptr;
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Return evaluator parameters
         /// </summary>
@@ -45900,15 +45826,15 @@ namespace OpenTK.Graphics.OpenGL
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetMapfv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetMapdv")]
         public static 
-        unsafe void GetMap(OpenTK.Graphics.OpenGL.MapTarget target, OpenTK.Graphics.OpenGL.GetMapQuery query, [OutAttribute] Single* v)
+        unsafe void GetMap(OpenTK.Graphics.OpenGL.MapTarget target, OpenTK.Graphics.OpenGL.GetMapQuery query, [OutAttribute] Double* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetMapfv((OpenTK.Graphics.OpenGL.MapTarget)target, (OpenTK.Graphics.OpenGL.GetMapQuery)query, (Single*)v);
+            Delegates.glGetMapdv((OpenTK.Graphics.OpenGL.MapTarget)target, (OpenTK.Graphics.OpenGL.GetMapQuery)query, (Double*)v);
             #if DEBUG
             }
             #endif
@@ -45972,16 +45898,56 @@ namespace OpenTK.Graphics.OpenGL
         /// Returns the requested data.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetMapiv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetMapfv")]
         public static 
-        unsafe void GetMap(OpenTK.Graphics.OpenGL.MapTarget target, OpenTK.Graphics.OpenGL.GetMapQuery query, [OutAttribute] Int32* v)
+        void GetMap(OpenTK.Graphics.OpenGL.MapTarget target, OpenTK.Graphics.OpenGL.GetMapQuery query, [OutAttribute] out Single v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetMapiv((OpenTK.Graphics.OpenGL.MapTarget)target, (OpenTK.Graphics.OpenGL.GetMapQuery)query, (Int32*)v);
+            unsafe
+            {
+                fixed (Single* v_ptr = &v)
+                {
+                    Delegates.glGetMapfv((OpenTK.Graphics.OpenGL.MapTarget)target, (OpenTK.Graphics.OpenGL.GetMapQuery)query, (Single*)v_ptr);
+                    v = *v_ptr;
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Return evaluator parameters
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the symbolic name of a map. Accepted values are GL_MAP1_COLOR_4, GL_MAP1_INDEX, GL_MAP1_NORMAL, GL_MAP1_TEXTURE_COORD_1, GL_MAP1_TEXTURE_COORD_2, GL_MAP1_TEXTURE_COORD_3, GL_MAP1_TEXTURE_COORD_4, GL_MAP1_VERTEX_3, GL_MAP1_VERTEX_4, GL_MAP2_COLOR_4, GL_MAP2_INDEX, GL_MAP2_NORMAL, GL_MAP2_TEXTURE_COORD_1, GL_MAP2_TEXTURE_COORD_2, GL_MAP2_TEXTURE_COORD_3, GL_MAP2_TEXTURE_COORD_4, GL_MAP2_VERTEX_3, and GL_MAP2_VERTEX_4.
+        /// </para>
+        /// </param>
+        /// <param name="query">
+        /// <para>
+        /// Specifies which parameter to return. Symbolic names GL_COEFF, GL_ORDER, and GL_DOMAIN are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="v">
+        /// <para>
+        /// Returns the requested data.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetMapfv")]
+        public static 
+        unsafe void GetMap(OpenTK.Graphics.OpenGL.MapTarget target, OpenTK.Graphics.OpenGL.GetMapQuery query, [OutAttribute] Single* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetMapfv((OpenTK.Graphics.OpenGL.MapTarget)target, (OpenTK.Graphics.OpenGL.GetMapQuery)query, (Single*)v);
             #if DEBUG
             }
             #endif
@@ -46067,6 +46033,79 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Return evaluator parameters
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the symbolic name of a map. Accepted values are GL_MAP1_COLOR_4, GL_MAP1_INDEX, GL_MAP1_NORMAL, GL_MAP1_TEXTURE_COORD_1, GL_MAP1_TEXTURE_COORD_2, GL_MAP1_TEXTURE_COORD_3, GL_MAP1_TEXTURE_COORD_4, GL_MAP1_VERTEX_3, GL_MAP1_VERTEX_4, GL_MAP2_COLOR_4, GL_MAP2_INDEX, GL_MAP2_NORMAL, GL_MAP2_TEXTURE_COORD_1, GL_MAP2_TEXTURE_COORD_2, GL_MAP2_TEXTURE_COORD_3, GL_MAP2_TEXTURE_COORD_4, GL_MAP2_VERTEX_3, and GL_MAP2_VERTEX_4.
+        /// </para>
+        /// </param>
+        /// <param name="query">
+        /// <para>
+        /// Specifies which parameter to return. Symbolic names GL_COEFF, GL_ORDER, and GL_DOMAIN are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="v">
+        /// <para>
+        /// Returns the requested data.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetMapiv")]
+        public static 
+        unsafe void GetMap(OpenTK.Graphics.OpenGL.MapTarget target, OpenTK.Graphics.OpenGL.GetMapQuery query, [OutAttribute] Int32* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetMapiv((OpenTK.Graphics.OpenGL.MapTarget)target, (OpenTK.Graphics.OpenGL.GetMapQuery)query, (Int32*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Return material parameters
+        /// </summary>
+        /// <param name="face">
+        /// <para>
+        /// Specifies which of the two materials is being queried. GL_FRONT or GL_BACK are accepted, representing the front and back materials, respectively.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the material parameter to return. GL_AMBIENT, GL_DIFFUSE, GL_SPECULAR, GL_EMISSION, GL_SHININESS, and GL_COLOR_INDEXES are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the requested data.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetMaterialfv")]
+        public static 
+        void GetMaterial(OpenTK.Graphics.OpenGL.MaterialFace face, OpenTK.Graphics.OpenGL.MaterialParameter pname, [OutAttribute] Single[] @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* @params_ptr = @params)
+                {
+                    Delegates.glGetMaterialfv((OpenTK.Graphics.OpenGL.MaterialFace)face, (OpenTK.Graphics.OpenGL.MaterialParameter)pname, (Single*)@params_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Return material parameters
         /// </summary>
@@ -46141,79 +46180,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Return material parameters
-        /// </summary>
-        /// <param name="face">
-        /// <para>
-        /// Specifies which of the two materials is being queried. GL_FRONT or GL_BACK are accepted, representing the front and back materials, respectively.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the material parameter to return. GL_AMBIENT, GL_DIFFUSE, GL_SPECULAR, GL_EMISSION, GL_SHININESS, and GL_COLOR_INDEXES are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the requested data.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetMaterialfv")]
-        public static 
-        void GetMaterial(OpenTK.Graphics.OpenGL.MaterialFace face, OpenTK.Graphics.OpenGL.MaterialParameter pname, [OutAttribute] Single[] @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* @params_ptr = @params)
-                {
-                    Delegates.glGetMaterialfv((OpenTK.Graphics.OpenGL.MaterialFace)face, (OpenTK.Graphics.OpenGL.MaterialParameter)pname, (Single*)@params_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Return material parameters
-        /// </summary>
-        /// <param name="face">
-        /// <para>
-        /// Specifies which of the two materials is being queried. GL_FRONT or GL_BACK are accepted, representing the front and back materials, respectively.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the material parameter to return. GL_AMBIENT, GL_DIFFUSE, GL_SPECULAR, GL_EMISSION, GL_SHININESS, and GL_COLOR_INDEXES are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the requested data.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetMaterialiv")]
-        public static 
-        unsafe void GetMaterial(OpenTK.Graphics.OpenGL.MaterialFace face, OpenTK.Graphics.OpenGL.MaterialParameter pname, [OutAttribute] Int32* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGetMaterialiv((OpenTK.Graphics.OpenGL.MaterialFace)face, (OpenTK.Graphics.OpenGL.MaterialParameter)pname, (Int32*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Return material parameters
         /// </summary>
@@ -46294,52 +46260,33 @@ namespace OpenTK.Graphics.OpenGL
 
         
         /// <summary>
-        /// Get minimum and maximum pixel values
+        /// Return material parameters
         /// </summary>
-        /// <param name="target">
+        /// <param name="face">
         /// <para>
-        /// Must be GL_MINMAX.
+        /// Specifies which of the two materials is being queried. GL_FRONT or GL_BACK are accepted, representing the front and back materials, respectively.
         /// </para>
         /// </param>
-        /// <param name="reset">
+        /// <param name="pname">
         /// <para>
-        /// If GL_TRUE, all entries in the minmax table that are actually returned are reset to their initial values. (Other entries are unaltered.) If GL_FALSE, the minmax table is unaltered.
+        /// Specifies the material parameter to return. GL_AMBIENT, GL_DIFFUSE, GL_SPECULAR, GL_EMISSION, GL_SHININESS, and GL_COLOR_INDEXES are accepted.
         /// </para>
         /// </param>
-        /// <param name="format">
+        /// <param name="params">
         /// <para>
-        /// The format of the data to be returned in values. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
+        /// Returns the requested data.
         /// </para>
         /// </param>
-        /// <param name="types">
-        /// <para>
-        /// The type of the data to be returned in values. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="values">
-        /// <para>
-        /// A pointer to storage for the returned values.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetMinmax")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetMaterialiv")]
         public static 
-        void GetMinmax<T4>(OpenTK.Graphics.OpenGL.MinmaxTarget target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T4 values)
-            where T4 : struct
+        unsafe void GetMaterial(OpenTK.Graphics.OpenGL.MaterialFace face, OpenTK.Graphics.OpenGL.MaterialParameter pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle values_ptr = GCHandle.Alloc(values, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glGetMinmax((OpenTK.Graphics.OpenGL.MinmaxTarget)target, (bool)reset, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)values_ptr.AddrOfPinnedObject());
-                values = (T4)values_ptr.Target;
-            }
-            finally
-            {
-                values_ptr.Free();
-            }
+            Delegates.glGetMaterialiv((OpenTK.Graphics.OpenGL.MaterialFace)face, (OpenTK.Graphics.OpenGL.MaterialParameter)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -46376,7 +46323,50 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetMinmax")]
         public static 
-        void GetMinmax<T4>(OpenTK.Graphics.OpenGL.MinmaxTarget target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[,,] values)
+        void GetMinmax(OpenTK.Graphics.OpenGL.MinmaxTarget target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr values)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetMinmax((OpenTK.Graphics.OpenGL.MinmaxTarget)target, (bool)reset, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)values);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Get minimum and maximum pixel values
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be GL_MINMAX.
+        /// </para>
+        /// </param>
+        /// <param name="reset">
+        /// <para>
+        /// If GL_TRUE, all entries in the minmax table that are actually returned are reset to their initial values. (Other entries are unaltered.) If GL_FALSE, the minmax table is unaltered.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// The format of the data to be returned in values. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="types">
+        /// <para>
+        /// The type of the data to be returned in values. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="values">
+        /// <para>
+        /// A pointer to storage for the returned values.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetMinmax")]
+        public static 
+        void GetMinmax<T4>(OpenTK.Graphics.OpenGL.MinmaxTarget target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[] values)
             where T4 : struct
         {
             #if DEBUG
@@ -46480,7 +46470,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetMinmax")]
         public static 
-        void GetMinmax<T4>(OpenTK.Graphics.OpenGL.MinmaxTarget target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[] values)
+        void GetMinmax<T4>(OpenTK.Graphics.OpenGL.MinmaxTarget target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[,,] values)
             where T4 : struct
         {
             #if DEBUG
@@ -46532,13 +46522,62 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetMinmax")]
         public static 
-        void GetMinmax(OpenTK.Graphics.OpenGL.MinmaxTarget target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr values)
+        void GetMinmax<T4>(OpenTK.Graphics.OpenGL.MinmaxTarget target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T4 values)
+            where T4 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetMinmax((OpenTK.Graphics.OpenGL.MinmaxTarget)target, (bool)reset, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)values);
+            GCHandle values_ptr = GCHandle.Alloc(values, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glGetMinmax((OpenTK.Graphics.OpenGL.MinmaxTarget)target, (bool)reset, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)values_ptr.AddrOfPinnedObject());
+                values = (T4)values_ptr.Target;
+            }
+            finally
+            {
+                values_ptr.Free();
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Get minmax parameters
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be GL_MINMAX.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// The parameter to be retrieved. Must be one of GL_MINMAX_FORMAT or GL_MINMAX_SINK.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// A pointer to storage for the retrieved parameters.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetMinmaxParameterfv")]
+        public static 
+        void GetMinmaxParameter(OpenTK.Graphics.OpenGL.MinmaxTarget target, OpenTK.Graphics.OpenGL.GetMinmaxParameterPName pname, [OutAttribute] Single[] @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* @params_ptr = @params)
+                {
+                    Delegates.glGetMinmaxParameterfv((OpenTK.Graphics.OpenGL.MinmaxTarget)target, (OpenTK.Graphics.OpenGL.GetMinmaxParameterPName)pname, (Single*)@params_ptr);
+                }
+            }
             #if DEBUG
             }
             #endif
@@ -46619,79 +46658,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Get minmax parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Must be GL_MINMAX.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// The parameter to be retrieved. Must be one of GL_MINMAX_FORMAT or GL_MINMAX_SINK.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// A pointer to storage for the retrieved parameters.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetMinmaxParameterfv")]
-        public static 
-        void GetMinmaxParameter(OpenTK.Graphics.OpenGL.MinmaxTarget target, OpenTK.Graphics.OpenGL.GetMinmaxParameterPName pname, [OutAttribute] Single[] @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* @params_ptr = @params)
-                {
-                    Delegates.glGetMinmaxParameterfv((OpenTK.Graphics.OpenGL.MinmaxTarget)target, (OpenTK.Graphics.OpenGL.GetMinmaxParameterPName)pname, (Single*)@params_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Get minmax parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Must be GL_MINMAX.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// The parameter to be retrieved. Must be one of GL_MINMAX_FORMAT or GL_MINMAX_SINK.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// A pointer to storage for the retrieved parameters.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetMinmaxParameteriv")]
-        public static 
-        unsafe void GetMinmaxParameter(OpenTK.Graphics.OpenGL.MinmaxTarget target, OpenTK.Graphics.OpenGL.GetMinmaxParameterPName pname, [OutAttribute] Int32* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGetMinmaxParameteriv((OpenTK.Graphics.OpenGL.MinmaxTarget)target, (OpenTK.Graphics.OpenGL.GetMinmaxParameterPName)pname, (Int32*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Get minmax parameters
         /// </summary>
@@ -46770,6 +46736,60 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        
+        /// <summary>
+        /// Get minmax parameters
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be GL_MINMAX.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// The parameter to be retrieved. Must be one of GL_MINMAX_FORMAT or GL_MINMAX_SINK.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// A pointer to storage for the retrieved parameters.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetMinmaxParameteriv")]
+        public static 
+        unsafe void GetMinmaxParameter(OpenTK.Graphics.OpenGL.MinmaxTarget target, OpenTK.Graphics.OpenGL.GetMinmaxParameterPName pname, [OutAttribute] Int32* @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetMinmaxParameteriv((OpenTK.Graphics.OpenGL.MinmaxTarget)target, (OpenTK.Graphics.OpenGL.GetMinmaxParameterPName)pname, (Int32*)@params);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [AutoGenerated(Category = "ArbTextureMultisample", Version = "1.2", EntryPoint = "glGetMultisamplefv")]
+        public static 
+        void GetMultisample(OpenTK.Graphics.OpenGL.GetMultisamplePName pname, Int32 index, [OutAttribute] Single[] val)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* val_ptr = val)
+                {
+                    Delegates.glGetMultisamplefv((OpenTK.Graphics.OpenGL.GetMultisamplePName)pname, (UInt32)index, (Single*)val_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
         [AutoGenerated(Category = "ArbTextureMultisample", Version = "1.2", EntryPoint = "glGetMultisamplefv")]
         public static 
         void GetMultisample(OpenTK.Graphics.OpenGL.GetMultisamplePName pname, Int32 index, [OutAttribute] out Single val)
@@ -46806,9 +46826,10 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ArbTextureMultisample", Version = "1.2", EntryPoint = "glGetMultisamplefv")]
         public static 
-        void GetMultisample(OpenTK.Graphics.OpenGL.GetMultisamplePName pname, Int32 index, [OutAttribute] Single[] val)
+        void GetMultisample(OpenTK.Graphics.OpenGL.GetMultisamplePName pname, UInt32 index, [OutAttribute] Single[] val)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -46863,10 +46884,23 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ArbTextureMultisample", Version = "1.2", EntryPoint = "glGetMultisamplefv")]
+        
+        /// <summary>
+        /// Return the specified pixel map
+        /// </summary>
+        /// <param name="map">
+        /// <para>
+        /// Specifies the name of the pixel map to return. Accepted values are GL_PIXEL_MAP_I_TO_I, GL_PIXEL_MAP_S_TO_S, GL_PIXEL_MAP_I_TO_R, GL_PIXEL_MAP_I_TO_G, GL_PIXEL_MAP_I_TO_B, GL_PIXEL_MAP_I_TO_A, GL_PIXEL_MAP_R_TO_R, GL_PIXEL_MAP_G_TO_G, GL_PIXEL_MAP_B_TO_B, and GL_PIXEL_MAP_A_TO_A.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Returns the pixel map contents.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetPixelMapfv")]
         public static 
-        void GetMultisample(OpenTK.Graphics.OpenGL.GetMultisamplePName pname, UInt32 index, [OutAttribute] Single[] val)
+        void GetPixelMap(OpenTK.Graphics.OpenGL.PixelMap map, [OutAttribute] Single[] values)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -46874,9 +46908,9 @@ namespace OpenTK.Graphics.OpenGL
             #endif
             unsafe
             {
-                fixed (Single* val_ptr = val)
+                fixed (Single* values_ptr = values)
                 {
-                    Delegates.glGetMultisamplefv((OpenTK.Graphics.OpenGL.GetMultisamplePName)pname, (UInt32)index, (Single*)val_ptr);
+                    Delegates.glGetPixelMapfv((OpenTK.Graphics.OpenGL.PixelMap)map, (Single*)values_ptr);
                 }
             }
             #if DEBUG
@@ -46949,69 +46983,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Return the specified pixel map
-        /// </summary>
-        /// <param name="map">
-        /// <para>
-        /// Specifies the name of the pixel map to return. Accepted values are GL_PIXEL_MAP_I_TO_I, GL_PIXEL_MAP_S_TO_S, GL_PIXEL_MAP_I_TO_R, GL_PIXEL_MAP_I_TO_G, GL_PIXEL_MAP_I_TO_B, GL_PIXEL_MAP_I_TO_A, GL_PIXEL_MAP_R_TO_R, GL_PIXEL_MAP_G_TO_G, GL_PIXEL_MAP_B_TO_B, and GL_PIXEL_MAP_A_TO_A.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Returns the pixel map contents.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetPixelMapfv")]
-        public static 
-        void GetPixelMap(OpenTK.Graphics.OpenGL.PixelMap map, [OutAttribute] Single[] values)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* values_ptr = values)
-                {
-                    Delegates.glGetPixelMapfv((OpenTK.Graphics.OpenGL.PixelMap)map, (Single*)values_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Return the specified pixel map
-        /// </summary>
-        /// <param name="map">
-        /// <para>
-        /// Specifies the name of the pixel map to return. Accepted values are GL_PIXEL_MAP_I_TO_I, GL_PIXEL_MAP_S_TO_S, GL_PIXEL_MAP_I_TO_R, GL_PIXEL_MAP_I_TO_G, GL_PIXEL_MAP_I_TO_B, GL_PIXEL_MAP_I_TO_A, GL_PIXEL_MAP_R_TO_R, GL_PIXEL_MAP_G_TO_G, GL_PIXEL_MAP_B_TO_B, and GL_PIXEL_MAP_A_TO_A.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Returns the pixel map contents.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetPixelMapuiv")]
-        public static 
-        unsafe void GetPixelMap(OpenTK.Graphics.OpenGL.PixelMap map, [OutAttribute] Int32* values)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGetPixelMapuiv((OpenTK.Graphics.OpenGL.PixelMap)map, (UInt32*)values);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Return the specified pixel map
         /// </summary>
@@ -47097,43 +47068,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetPixelMapuiv")]
         public static 
-        void GetPixelMap(OpenTK.Graphics.OpenGL.PixelMap map, [OutAttribute] out UInt32 values)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* values_ptr = &values)
-                {
-                    Delegates.glGetPixelMapuiv((OpenTK.Graphics.OpenGL.PixelMap)map, (UInt32*)values_ptr);
-                    values = *values_ptr;
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Return the specified pixel map
-        /// </summary>
-        /// <param name="map">
-        /// <para>
-        /// Specifies the name of the pixel map to return. Accepted values are GL_PIXEL_MAP_I_TO_I, GL_PIXEL_MAP_S_TO_S, GL_PIXEL_MAP_I_TO_R, GL_PIXEL_MAP_I_TO_G, GL_PIXEL_MAP_I_TO_B, GL_PIXEL_MAP_I_TO_A, GL_PIXEL_MAP_R_TO_R, GL_PIXEL_MAP_G_TO_G, GL_PIXEL_MAP_B_TO_B, and GL_PIXEL_MAP_A_TO_A.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Returns the pixel map contents.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetPixelMapuiv")]
-        public static 
-        unsafe void GetPixelMap(OpenTK.Graphics.OpenGL.PixelMap map, [OutAttribute] UInt32* values)
+        unsafe void GetPixelMap(OpenTK.Graphics.OpenGL.PixelMap map, [OutAttribute] Int32* values)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -47195,15 +47130,51 @@ namespace OpenTK.Graphics.OpenGL
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetPixelMapusv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetPixelMapuiv")]
         public static 
-        unsafe void GetPixelMap(OpenTK.Graphics.OpenGL.PixelMap map, [OutAttribute] Int16* values)
+        void GetPixelMap(OpenTK.Graphics.OpenGL.PixelMap map, [OutAttribute] out UInt32 values)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetPixelMapusv((OpenTK.Graphics.OpenGL.PixelMap)map, (UInt16*)values);
+            unsafe
+            {
+                fixed (UInt32* values_ptr = &values)
+                {
+                    Delegates.glGetPixelMapuiv((OpenTK.Graphics.OpenGL.PixelMap)map, (UInt32*)values_ptr);
+                    values = *values_ptr;
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Return the specified pixel map
+        /// </summary>
+        /// <param name="map">
+        /// <para>
+        /// Specifies the name of the pixel map to return. Accepted values are GL_PIXEL_MAP_I_TO_I, GL_PIXEL_MAP_S_TO_S, GL_PIXEL_MAP_I_TO_R, GL_PIXEL_MAP_I_TO_G, GL_PIXEL_MAP_I_TO_B, GL_PIXEL_MAP_I_TO_A, GL_PIXEL_MAP_R_TO_R, GL_PIXEL_MAP_G_TO_G, GL_PIXEL_MAP_B_TO_B, and GL_PIXEL_MAP_A_TO_A.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Returns the pixel map contents.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetPixelMapuiv")]
+        public static 
+        unsafe void GetPixelMap(OpenTK.Graphics.OpenGL.PixelMap map, [OutAttribute] UInt32* values)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetPixelMapuiv((OpenTK.Graphics.OpenGL.PixelMap)map, (UInt32*)values);
             #if DEBUG
             }
             #endif
@@ -47279,6 +47250,70 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Return the specified pixel map
+        /// </summary>
+        /// <param name="map">
+        /// <para>
+        /// Specifies the name of the pixel map to return. Accepted values are GL_PIXEL_MAP_I_TO_I, GL_PIXEL_MAP_S_TO_S, GL_PIXEL_MAP_I_TO_R, GL_PIXEL_MAP_I_TO_G, GL_PIXEL_MAP_I_TO_B, GL_PIXEL_MAP_I_TO_A, GL_PIXEL_MAP_R_TO_R, GL_PIXEL_MAP_G_TO_G, GL_PIXEL_MAP_B_TO_B, and GL_PIXEL_MAP_A_TO_A.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Returns the pixel map contents.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetPixelMapusv")]
+        public static 
+        unsafe void GetPixelMap(OpenTK.Graphics.OpenGL.PixelMap map, [OutAttribute] Int16* values)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetPixelMapusv((OpenTK.Graphics.OpenGL.PixelMap)map, (UInt16*)values);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Return the specified pixel map
+        /// </summary>
+        /// <param name="map">
+        /// <para>
+        /// Specifies the name of the pixel map to return. Accepted values are GL_PIXEL_MAP_I_TO_I, GL_PIXEL_MAP_S_TO_S, GL_PIXEL_MAP_I_TO_R, GL_PIXEL_MAP_I_TO_G, GL_PIXEL_MAP_I_TO_B, GL_PIXEL_MAP_I_TO_A, GL_PIXEL_MAP_R_TO_R, GL_PIXEL_MAP_G_TO_G, GL_PIXEL_MAP_B_TO_B, and GL_PIXEL_MAP_A_TO_A.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Returns the pixel map contents.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetPixelMapusv")]
+        public static 
+        void GetPixelMap(OpenTK.Graphics.OpenGL.PixelMap map, [OutAttribute] UInt16[] values)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt16* values_ptr = values)
+                {
+                    Delegates.glGetPixelMapusv((OpenTK.Graphics.OpenGL.PixelMap)map, (UInt16*)values_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Return the specified pixel map
         /// </summary>
@@ -47345,34 +47380,27 @@ namespace OpenTK.Graphics.OpenGL
 
         
         /// <summary>
-        /// Return the specified pixel map
+        /// Return the address of the specified pointer
         /// </summary>
-        /// <param name="map">
+        /// <param name="pname">
         /// <para>
-        /// Specifies the name of the pixel map to return. Accepted values are GL_PIXEL_MAP_I_TO_I, GL_PIXEL_MAP_S_TO_S, GL_PIXEL_MAP_I_TO_R, GL_PIXEL_MAP_I_TO_G, GL_PIXEL_MAP_I_TO_B, GL_PIXEL_MAP_I_TO_A, GL_PIXEL_MAP_R_TO_R, GL_PIXEL_MAP_G_TO_G, GL_PIXEL_MAP_B_TO_B, and GL_PIXEL_MAP_A_TO_A.
+        /// Specifies the array or buffer pointer to be returned. Symbolic constants GL_COLOR_ARRAY_POINTER, GL_EDGE_FLAG_ARRAY_POINTER, GL_FOG_COORD_ARRAY_POINTER, GL_FEEDBACK_BUFFER_POINTER, GL_INDEX_ARRAY_POINTER, GL_NORMAL_ARRAY_POINTER, GL_SECONDARY_COLOR_ARRAY_POINTER, GL_SELECTION_BUFFER_POINTER, GL_TEXTURE_COORD_ARRAY_POINTER, or GL_VERTEX_ARRAY_POINTER are accepted.
         /// </para>
         /// </param>
-        /// <param name="data">
+        /// <param name="params">
         /// <para>
-        /// Returns the pixel map contents.
+        /// Returns the pointer value specified by pname.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetPixelMapusv")]
+        [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glGetPointerv")]
         public static 
-        void GetPixelMap(OpenTK.Graphics.OpenGL.PixelMap map, [OutAttribute] UInt16[] values)
+        void GetPointer(OpenTK.Graphics.OpenGL.GetPointervPName pname, [OutAttribute] IntPtr @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            unsafe
-            {
-                fixed (UInt16* values_ptr = values)
-                {
-                    Delegates.glGetPixelMapusv((OpenTK.Graphics.OpenGL.PixelMap)map, (UInt16*)values_ptr);
-                }
-            }
+            Delegates.glGetPointerv((OpenTK.Graphics.OpenGL.GetPointervPName)pname, (IntPtr)@params);
             #if DEBUG
             }
             #endif
@@ -47394,45 +47422,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glGetPointerv")]
         public static 
-        void GetPointer<T1>(OpenTK.Graphics.OpenGL.GetPointervPName pname, [InAttribute, OutAttribute] ref T1 @params)
-            where T1 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle @params_ptr = GCHandle.Alloc(@params, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glGetPointerv((OpenTK.Graphics.OpenGL.GetPointervPName)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
-                @params = (T1)@params_ptr.Target;
-            }
-            finally
-            {
-                @params_ptr.Free();
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Return the address of the specified pointer
-        /// </summary>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the array or buffer pointer to be returned. Symbolic constants GL_COLOR_ARRAY_POINTER, GL_EDGE_FLAG_ARRAY_POINTER, GL_FOG_COORD_ARRAY_POINTER, GL_FEEDBACK_BUFFER_POINTER, GL_INDEX_ARRAY_POINTER, GL_NORMAL_ARRAY_POINTER, GL_SECONDARY_COLOR_ARRAY_POINTER, GL_SELECTION_BUFFER_POINTER, GL_TEXTURE_COORD_ARRAY_POINTER, or GL_VERTEX_ARRAY_POINTER are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the pointer value specified by pname.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glGetPointerv")]
-        public static 
-        void GetPointer<T1>(OpenTK.Graphics.OpenGL.GetPointervPName pname, [InAttribute, OutAttribute] T1[,,] @params)
+        void GetPointer<T1>(OpenTK.Graphics.OpenGL.GetPointervPName pname, [InAttribute, OutAttribute] T1[] @params)
             where T1 : struct
         {
             #if DEBUG
@@ -47506,7 +47496,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glGetPointerv")]
         public static 
-        void GetPointer<T1>(OpenTK.Graphics.OpenGL.GetPointervPName pname, [InAttribute, OutAttribute] T1[] @params)
+        void GetPointer<T1>(OpenTK.Graphics.OpenGL.GetPointervPName pname, [InAttribute, OutAttribute] T1[,,] @params)
             where T1 : struct
         {
             #if DEBUG
@@ -47543,37 +47533,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glGetPointerv")]
         public static 
-        void GetPointer(OpenTK.Graphics.OpenGL.GetPointervPName pname, [OutAttribute] IntPtr @params)
+        void GetPointer<T1>(OpenTK.Graphics.OpenGL.GetPointervPName pname, [InAttribute, OutAttribute] ref T1 @params)
+            where T1 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetPointerv((OpenTK.Graphics.OpenGL.GetPointervPName)pname, (IntPtr)@params);
-            #if DEBUG
+            GCHandle @params_ptr = GCHandle.Alloc(@params, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glGetPointerv((OpenTK.Graphics.OpenGL.GetPointervPName)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
+                @params = (T1)@params_ptr.Target;
             }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Return the polygon stipple pattern
-        /// </summary>
-        /// <param name="pattern">
-        /// <para>
-        /// Returns the stipple pattern. The initial value is all 1's.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetPolygonStipple")]
-        public static 
-        unsafe void GetPolygonStipple([OutAttribute] Byte* mask)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            finally
             {
-            #endif
-            Delegates.glGetPolygonStipple((Byte*)mask);
+                @params_ptr.Free();
+            }
             #if DEBUG
             }
             #endif
@@ -47640,38 +47616,23 @@ namespace OpenTK.Graphics.OpenGL
 
         
         /// <summary>
-        /// Returns the information log for a program object
+        /// Return the polygon stipple pattern
         /// </summary>
-        /// <param name="program">
+        /// <param name="pattern">
         /// <para>
-        /// Specifies the program object whose information log is to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="maxLength">
-        /// <para>
-        /// Specifies the size of the character buffer for storing the returned information log.
-        /// </para>
-        /// </param>
-        /// <param name="length">
-        /// <para>
-        /// Returns the length of the string returned in infoLog (excluding the null terminator).
-        /// </para>
-        /// </param>
-        /// <param name="infoLog">
-        /// <para>
-        /// Specifies an array of characters that is used to return the information log.
+        /// Returns the stipple pattern. The initial value is all 1's.
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetProgramInfoLog")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetPolygonStipple")]
         public static 
-        unsafe void GetProgramInfoLog(Int32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infoLog)
+        unsafe void GetPolygonStipple([OutAttribute] Byte* mask)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetProgramInfoLog((UInt32)program, (Int32)bufSize, (Int32*)length, (StringBuilder)infoLog);
+            Delegates.glGetPolygonStipple((Byte*)mask);
             #if DEBUG
             }
             #endif
@@ -47749,7 +47710,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetProgramInfoLog")]
         public static 
-        unsafe void GetProgramInfoLog(UInt32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infoLog)
+        unsafe void GetProgramInfoLog(Int32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infoLog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -47809,33 +47770,38 @@ namespace OpenTK.Graphics.OpenGL
 
         
         /// <summary>
-        /// Returns a parameter from a program object
+        /// Returns the information log for a program object
         /// </summary>
         /// <param name="program">
         /// <para>
-        /// Specifies the program object to be queried.
+        /// Specifies the program object whose information log is to be queried.
         /// </para>
         /// </param>
-        /// <param name="pname">
+        /// <param name="maxLength">
         /// <para>
-        /// Specifies the object parameter. Accepted symbolic names are GL_DELETE_STATUS, GL_LINK_STATUS, GL_VALIDATE_STATUS, GL_INFO_LOG_LENGTH, GL_ATTACHED_SHADERS, GL_ACTIVE_ATTRIBUTES, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, GL_ACTIVE_UNIFORMS, GL_ACTIVE_UNIFORM_MAX_LENGTH.
+        /// Specifies the size of the character buffer for storing the returned information log.
         /// </para>
         /// </param>
-        /// <param name="params">
+        /// <param name="length">
         /// <para>
-        /// Returns the requested object parameter.
+        /// Returns the length of the string returned in infoLog (excluding the null terminator).
+        /// </para>
+        /// </param>
+        /// <param name="infoLog">
+        /// <para>
+        /// Specifies an array of characters that is used to return the information log.
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetProgramiv")]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetProgramInfoLog")]
         public static 
-        unsafe void GetProgram(Int32 program, OpenTK.Graphics.OpenGL.ProgramParameter pname, [OutAttribute] Int32* @params)
+        unsafe void GetProgramInfoLog(UInt32 program, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infoLog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramParameter)pname, (Int32*)@params);
+            Delegates.glGetProgramInfoLog((UInt32)program, (Int32)bufSize, (Int32*)length, (StringBuilder)infoLog);
             #if DEBUG
             }
             #endif
@@ -47942,7 +47908,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
-        unsafe void GetProgram(UInt32 program, OpenTK.Graphics.OpenGL.ProgramParameter pname, [OutAttribute] Int32* @params)
+        unsafe void GetProgram(Int32 program, OpenTK.Graphics.OpenGL.ProgramParameter pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -48037,33 +48003,33 @@ namespace OpenTK.Graphics.OpenGL
 
         
         /// <summary>
-        /// Return parameters of a query object target
+        /// Returns a parameter from a program object
         /// </summary>
-        /// <param name="target">
+        /// <param name="program">
         /// <para>
-        /// Specifies a query object target. Must be GL_SAMPLES_PASSED.
+        /// Specifies the program object to be queried.
         /// </para>
         /// </param>
         /// <param name="pname">
         /// <para>
-        /// Specifies the symbolic name of a query object target parameter. Accepted values are GL_CURRENT_QUERY or GL_QUERY_COUNTER_BITS.
+        /// Specifies the object parameter. Accepted symbolic names are GL_DELETE_STATUS, GL_LINK_STATUS, GL_VALIDATE_STATUS, GL_INFO_LOG_LENGTH, GL_ATTACHED_SHADERS, GL_ACTIVE_ATTRIBUTES, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, GL_ACTIVE_UNIFORMS, GL_ACTIVE_UNIFORM_MAX_LENGTH.
         /// </para>
         /// </param>
         /// <param name="params">
         /// <para>
-        /// Returns the requested data.
+        /// Returns the requested object parameter.
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glGetQueryiv")]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetProgramiv")]
         public static 
-        unsafe void GetQuery(OpenTK.Graphics.OpenGL.QueryTarget target, OpenTK.Graphics.OpenGL.GetQueryParam pname, [OutAttribute] Int32* @params)
+        unsafe void GetProgram(UInt32 program, OpenTK.Graphics.OpenGL.ProgramParameter pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetQueryiv((OpenTK.Graphics.OpenGL.QueryTarget)target, (OpenTK.Graphics.OpenGL.GetQueryParam)pname, (Int32*)@params);
+            Delegates.glGetProgramiv((UInt32)program, (OpenTK.Graphics.OpenGL.ProgramParameter)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -48150,16 +48116,16 @@ namespace OpenTK.Graphics.OpenGL
 
         
         /// <summary>
-        /// Return parameters of a query object
+        /// Return parameters of a query object target
         /// </summary>
-        /// <param name="id">
+        /// <param name="target">
         /// <para>
-        /// Specifies the name of a query object.
+        /// Specifies a query object target. Must be GL_SAMPLES_PASSED.
         /// </para>
         /// </param>
         /// <param name="pname">
         /// <para>
-        /// Specifies the symbolic name of a query object parameter. Accepted values are GL_QUERY_RESULT or GL_QUERY_RESULT_AVAILABLE.
+        /// Specifies the symbolic name of a query object target parameter. Accepted values are GL_CURRENT_QUERY or GL_QUERY_COUNTER_BITS.
         /// </para>
         /// </param>
         /// <param name="params">
@@ -48168,15 +48134,15 @@ namespace OpenTK.Graphics.OpenGL
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glGetQueryObjectiv")]
+        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glGetQueryiv")]
         public static 
-        unsafe void GetQueryObject(Int32 id, OpenTK.Graphics.OpenGL.GetQueryObjectParam pname, [OutAttribute] Int32* @params)
+        unsafe void GetQuery(OpenTK.Graphics.OpenGL.QueryTarget target, OpenTK.Graphics.OpenGL.GetQueryParam pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetQueryObjectiv((UInt32)id, (OpenTK.Graphics.OpenGL.GetQueryObjectParam)pname, (Int32*)@params);
+            Delegates.glGetQueryiv((OpenTK.Graphics.OpenGL.QueryTarget)target, (OpenTK.Graphics.OpenGL.GetQueryParam)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -48283,7 +48249,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glGetQueryObjectiv")]
         public static 
-        unsafe void GetQueryObject(UInt32 id, OpenTK.Graphics.OpenGL.GetQueryObjectParam pname, [OutAttribute] Int32* @params)
+        unsafe void GetQueryObject(Int32 id, OpenTK.Graphics.OpenGL.GetQueryObjectParam pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -48377,6 +48343,80 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Return parameters of a query object
+        /// </summary>
+        /// <param name="id">
+        /// <para>
+        /// Specifies the name of a query object.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the symbolic name of a query object parameter. Accepted values are GL_QUERY_RESULT or GL_QUERY_RESULT_AVAILABLE.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the requested data.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glGetQueryObjectiv")]
+        public static 
+        unsafe void GetQueryObject(UInt32 id, OpenTK.Graphics.OpenGL.GetQueryObjectParam pname, [OutAttribute] Int32* @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetQueryObjectiv((UInt32)id, (OpenTK.Graphics.OpenGL.GetQueryObjectParam)pname, (Int32*)@params);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Return parameters of a query object
+        /// </summary>
+        /// <param name="id">
+        /// <para>
+        /// Specifies the name of a query object.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the symbolic name of a query object parameter. Accepted values are GL_QUERY_RESULT or GL_QUERY_RESULT_AVAILABLE.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the requested data.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glGetQueryObjectuiv")]
+        public static 
+        void GetQueryObject(UInt32 id, OpenTK.Graphics.OpenGL.GetQueryObjectParam pname, [OutAttribute] UInt32[] @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* @params_ptr = @params)
+                {
+                    Delegates.glGetQueryObjectuiv((UInt32)id, (OpenTK.Graphics.OpenGL.GetQueryObjectParam)pname, (UInt32*)@params_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Return parameters of a query object
         /// </summary>
@@ -48451,61 +48491,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        
-        /// <summary>
-        /// Return parameters of a query object
-        /// </summary>
-        /// <param name="id">
-        /// <para>
-        /// Specifies the name of a query object.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the symbolic name of a query object parameter. Accepted values are GL_QUERY_RESULT or GL_QUERY_RESULT_AVAILABLE.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the requested data.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glGetQueryObjectuiv")]
-        public static 
-        void GetQueryObject(UInt32 id, OpenTK.Graphics.OpenGL.GetQueryObjectParam pname, [OutAttribute] UInt32[] @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* @params_ptr = @params)
-                {
-                    Delegates.glGetQueryObjectuiv((UInt32)id, (OpenTK.Graphics.OpenGL.GetQueryObjectParam)pname, (UInt32*)@params_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glGetRenderbufferParameteriv")]
-        public static 
-        unsafe void GetRenderbufferParameter(OpenTK.Graphics.OpenGL.RenderbufferTarget target, OpenTK.Graphics.OpenGL.RenderbufferParameterName pname, [OutAttribute] Int32* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGetRenderbufferParameteriv((OpenTK.Graphics.OpenGL.RenderbufferTarget)target, (OpenTK.Graphics.OpenGL.RenderbufferParameterName)pname, (Int32*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glGetRenderbufferParameteriv")]
         public static 
         void GetRenderbufferParameter(OpenTK.Graphics.OpenGL.RenderbufferTarget target, OpenTK.Graphics.OpenGL.RenderbufferParameterName pname, [OutAttribute] Int32[] @params)
@@ -48547,6 +48532,126 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glGetRenderbufferParameteriv")]
+        public static 
+        unsafe void GetRenderbufferParameter(OpenTK.Graphics.OpenGL.RenderbufferTarget target, OpenTK.Graphics.OpenGL.RenderbufferParameterName pname, [OutAttribute] Int32* @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetRenderbufferParameteriv((OpenTK.Graphics.OpenGL.RenderbufferTarget)target, (OpenTK.Graphics.OpenGL.RenderbufferParameterName)pname, (Int32*)@params);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Get separable convolution filter kernel images
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="row">
+        /// <para>
+        /// Pointer to storage for the row filter image.
+        /// </para>
+        /// </param>
+        /// <param name="column">
+        /// <para>
+        /// Pointer to storage for the column filter image.
+        /// </para>
+        /// </param>
+        /// <param name="span">
+        /// <para>
+        /// Pointer to storage for the span filter image (currently unused).
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")]
+        public static 
+        void GetSeparableFilter(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [OutAttribute] IntPtr span)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetSeparableFilter((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column, (IntPtr)span);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Get separable convolution filter kernel images
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="row">
+        /// <para>
+        /// Pointer to storage for the row filter image.
+        /// </para>
+        /// </param>
+        /// <param name="column">
+        /// <para>
+        /// Pointer to storage for the column filter image.
+        /// </para>
+        /// </param>
+        /// <param name="span">
+        /// <para>
+        /// Pointer to storage for the span filter image (currently unused).
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")]
+        public static 
+        void GetSeparableFilter<T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [InAttribute, OutAttribute] T5[] span)
+            where T5 : struct
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glGetSeparableFilter((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column, (IntPtr)span_ptr.AddrOfPinnedObject());
+            }
+            finally
+            {
+                span_ptr.Free();
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
         
         /// <summary>
         /// Get separable convolution filter kernel images
@@ -48583,8 +48688,179 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")]
         public static 
-        void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T3 row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
-            where T3 : struct
+        void GetSeparableFilter<T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [InAttribute, OutAttribute] T5[,] span)
+            where T5 : struct
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glGetSeparableFilter((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column, (IntPtr)span_ptr.AddrOfPinnedObject());
+            }
+            finally
+            {
+                span_ptr.Free();
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Get separable convolution filter kernel images
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="row">
+        /// <para>
+        /// Pointer to storage for the row filter image.
+        /// </para>
+        /// </param>
+        /// <param name="column">
+        /// <para>
+        /// Pointer to storage for the column filter image.
+        /// </para>
+        /// </param>
+        /// <param name="span">
+        /// <para>
+        /// Pointer to storage for the span filter image (currently unused).
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")]
+        public static 
+        void GetSeparableFilter<T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [InAttribute, OutAttribute] T5[,,] span)
+            where T5 : struct
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glGetSeparableFilter((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column, (IntPtr)span_ptr.AddrOfPinnedObject());
+            }
+            finally
+            {
+                span_ptr.Free();
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Get separable convolution filter kernel images
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="row">
+        /// <para>
+        /// Pointer to storage for the row filter image.
+        /// </para>
+        /// </param>
+        /// <param name="column">
+        /// <para>
+        /// Pointer to storage for the column filter image.
+        /// </para>
+        /// </param>
+        /// <param name="span">
+        /// <para>
+        /// Pointer to storage for the span filter image (currently unused).
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")]
+        public static 
+        void GetSeparableFilter<T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [InAttribute, OutAttribute] ref T5 span)
+            where T5 : struct
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glGetSeparableFilter((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column, (IntPtr)span_ptr.AddrOfPinnedObject());
+                span = (T5)span_ptr.Target;
+            }
+            finally
+            {
+                span_ptr.Free();
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Get separable convolution filter kernel images
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="row">
+        /// <para>
+        /// Pointer to storage for the row filter image.
+        /// </para>
+        /// </param>
+        /// <param name="column">
+        /// <para>
+        /// Pointer to storage for the column filter image.
+        /// </para>
+        /// </param>
+        /// <param name="span">
+        /// <para>
+        /// Pointer to storage for the span filter image (currently unused).
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")]
+        public static 
+        void GetSeparableFilter<T4,T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[] column, [InAttribute, OutAttribute] T5[,,] span)
             where T4 : struct
             where T5 : struct
         {
@@ -48592,17 +48868,14 @@ namespace OpenTK.Graphics.OpenGL
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle row_ptr = GCHandle.Alloc(row, GCHandleType.Pinned);
             GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
             GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
             try
             {
-                Delegates.glGetSeparableFilter((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row_ptr.AddrOfPinnedObject(), (IntPtr)column_ptr.AddrOfPinnedObject(), (IntPtr)span_ptr.AddrOfPinnedObject());
-                row = (T3)row_ptr.Target;
+                Delegates.glGetSeparableFilter((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject(), (IntPtr)span_ptr.AddrOfPinnedObject());
             }
             finally
             {
-                row_ptr.Free();
                 column_ptr.Free();
                 span_ptr.Free();
             }
@@ -48647,7 +48920,188 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")]
         public static 
-        void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[,,] row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
+        void GetSeparableFilter<T4,T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[,] column, [InAttribute, OutAttribute] T5[,,] span)
+            where T4 : struct
+            where T5 : struct
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
+            GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glGetSeparableFilter((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject(), (IntPtr)span_ptr.AddrOfPinnedObject());
+            }
+            finally
+            {
+                column_ptr.Free();
+                span_ptr.Free();
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Get separable convolution filter kernel images
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="row">
+        /// <para>
+        /// Pointer to storage for the row filter image.
+        /// </para>
+        /// </param>
+        /// <param name="column">
+        /// <para>
+        /// Pointer to storage for the column filter image.
+        /// </para>
+        /// </param>
+        /// <param name="span">
+        /// <para>
+        /// Pointer to storage for the span filter image (currently unused).
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")]
+        public static 
+        void GetSeparableFilter<T4,T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
+            where T4 : struct
+            where T5 : struct
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
+            GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glGetSeparableFilter((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject(), (IntPtr)span_ptr.AddrOfPinnedObject());
+            }
+            finally
+            {
+                column_ptr.Free();
+                span_ptr.Free();
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Get separable convolution filter kernel images
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="row">
+        /// <para>
+        /// Pointer to storage for the row filter image.
+        /// </para>
+        /// </param>
+        /// <param name="column">
+        /// <para>
+        /// Pointer to storage for the column filter image.
+        /// </para>
+        /// </param>
+        /// <param name="span">
+        /// <para>
+        /// Pointer to storage for the span filter image (currently unused).
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")]
+        public static 
+        void GetSeparableFilter<T4,T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] ref T4 column, [InAttribute, OutAttribute] T5[,,] span)
+            where T4 : struct
+            where T5 : struct
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
+            GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glGetSeparableFilter((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject(), (IntPtr)span_ptr.AddrOfPinnedObject());
+                column = (T4)column_ptr.Target;
+            }
+            finally
+            {
+                column_ptr.Free();
+                span_ptr.Free();
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Get separable convolution filter kernel images
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="row">
+        /// <para>
+        /// Pointer to storage for the row filter image.
+        /// </para>
+        /// </param>
+        /// <param name="column">
+        /// <para>
+        /// Pointer to storage for the column filter image.
+        /// </para>
+        /// </param>
+        /// <param name="span">
+        /// <para>
+        /// Pointer to storage for the span filter image (currently unused).
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")]
+        public static 
+        void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[] row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
             where T3 : struct
             where T4 : struct
             where T5 : struct
@@ -48773,7 +49227,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")]
         public static 
-        void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[] row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
+        void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[,,] row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
             where T3 : struct
             where T4 : struct
             where T5 : struct
@@ -48836,7 +49290,8 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")]
         public static 
-        void GetSeparableFilter<T4,T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] ref T4 column, [InAttribute, OutAttribute] T5[,,] span)
+        void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T3 row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
+            where T3 : struct
             where T4 : struct
             where T5 : struct
         {
@@ -48844,15 +49299,17 @@ namespace OpenTK.Graphics.OpenGL
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
+            GCHandle row_ptr = GCHandle.Alloc(row, GCHandleType.Pinned);
             GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
             GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
             try
             {
-                Delegates.glGetSeparableFilter((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject(), (IntPtr)span_ptr.AddrOfPinnedObject());
-                column = (T4)column_ptr.Target;
+                Delegates.glGetSeparableFilter((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row_ptr.AddrOfPinnedObject(), (IntPtr)column_ptr.AddrOfPinnedObject(), (IntPtr)span_ptr.AddrOfPinnedObject());
+                row = (T3)row_ptr.Target;
             }
             finally
             {
+                row_ptr.Free();
                 column_ptr.Free();
                 span_ptr.Free();
             }
@@ -48862,502 +49319,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Get separable convolution filter kernel images
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="row">
-        /// <para>
-        /// Pointer to storage for the row filter image.
-        /// </para>
-        /// </param>
-        /// <param name="column">
-        /// <para>
-        /// Pointer to storage for the column filter image.
-        /// </para>
-        /// </param>
-        /// <param name="span">
-        /// <para>
-        /// Pointer to storage for the span filter image (currently unused).
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")]
-        public static 
-        void GetSeparableFilter<T4,T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
-            where T4 : struct
-            where T5 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
-            GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glGetSeparableFilter((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject(), (IntPtr)span_ptr.AddrOfPinnedObject());
-            }
-            finally
-            {
-                column_ptr.Free();
-                span_ptr.Free();
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Get separable convolution filter kernel images
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="row">
-        /// <para>
-        /// Pointer to storage for the row filter image.
-        /// </para>
-        /// </param>
-        /// <param name="column">
-        /// <para>
-        /// Pointer to storage for the column filter image.
-        /// </para>
-        /// </param>
-        /// <param name="span">
-        /// <para>
-        /// Pointer to storage for the span filter image (currently unused).
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")]
-        public static 
-        void GetSeparableFilter<T4,T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[,] column, [InAttribute, OutAttribute] T5[,,] span)
-            where T4 : struct
-            where T5 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
-            GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glGetSeparableFilter((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject(), (IntPtr)span_ptr.AddrOfPinnedObject());
-            }
-            finally
-            {
-                column_ptr.Free();
-                span_ptr.Free();
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Get separable convolution filter kernel images
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="row">
-        /// <para>
-        /// Pointer to storage for the row filter image.
-        /// </para>
-        /// </param>
-        /// <param name="column">
-        /// <para>
-        /// Pointer to storage for the column filter image.
-        /// </para>
-        /// </param>
-        /// <param name="span">
-        /// <para>
-        /// Pointer to storage for the span filter image (currently unused).
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")]
-        public static 
-        void GetSeparableFilter<T4,T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[] column, [InAttribute, OutAttribute] T5[,,] span)
-            where T4 : struct
-            where T5 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
-            GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glGetSeparableFilter((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject(), (IntPtr)span_ptr.AddrOfPinnedObject());
-            }
-            finally
-            {
-                column_ptr.Free();
-                span_ptr.Free();
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Get separable convolution filter kernel images
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="row">
-        /// <para>
-        /// Pointer to storage for the row filter image.
-        /// </para>
-        /// </param>
-        /// <param name="column">
-        /// <para>
-        /// Pointer to storage for the column filter image.
-        /// </para>
-        /// </param>
-        /// <param name="span">
-        /// <para>
-        /// Pointer to storage for the span filter image (currently unused).
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")]
-        public static 
-        void GetSeparableFilter<T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [InAttribute, OutAttribute] ref T5 span)
-            where T5 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glGetSeparableFilter((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column, (IntPtr)span_ptr.AddrOfPinnedObject());
-                span = (T5)span_ptr.Target;
-            }
-            finally
-            {
-                span_ptr.Free();
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Get separable convolution filter kernel images
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="row">
-        /// <para>
-        /// Pointer to storage for the row filter image.
-        /// </para>
-        /// </param>
-        /// <param name="column">
-        /// <para>
-        /// Pointer to storage for the column filter image.
-        /// </para>
-        /// </param>
-        /// <param name="span">
-        /// <para>
-        /// Pointer to storage for the span filter image (currently unused).
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")]
-        public static 
-        void GetSeparableFilter<T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [InAttribute, OutAttribute] T5[,,] span)
-            where T5 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glGetSeparableFilter((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column, (IntPtr)span_ptr.AddrOfPinnedObject());
-            }
-            finally
-            {
-                span_ptr.Free();
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Get separable convolution filter kernel images
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="row">
-        /// <para>
-        /// Pointer to storage for the row filter image.
-        /// </para>
-        /// </param>
-        /// <param name="column">
-        /// <para>
-        /// Pointer to storage for the column filter image.
-        /// </para>
-        /// </param>
-        /// <param name="span">
-        /// <para>
-        /// Pointer to storage for the span filter image (currently unused).
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")]
-        public static 
-        void GetSeparableFilter<T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [InAttribute, OutAttribute] T5[,] span)
-            where T5 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glGetSeparableFilter((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column, (IntPtr)span_ptr.AddrOfPinnedObject());
-            }
-            finally
-            {
-                span_ptr.Free();
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Get separable convolution filter kernel images
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="row">
-        /// <para>
-        /// Pointer to storage for the row filter image.
-        /// </para>
-        /// </param>
-        /// <param name="column">
-        /// <para>
-        /// Pointer to storage for the column filter image.
-        /// </para>
-        /// </param>
-        /// <param name="span">
-        /// <para>
-        /// Pointer to storage for the span filter image (currently unused).
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")]
-        public static 
-        void GetSeparableFilter<T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [InAttribute, OutAttribute] T5[] span)
-            where T5 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glGetSeparableFilter((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column, (IntPtr)span_ptr.AddrOfPinnedObject());
-            }
-            finally
-            {
-                span_ptr.Free();
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Get separable convolution filter kernel images
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="row">
-        /// <para>
-        /// Pointer to storage for the row filter image.
-        /// </para>
-        /// </param>
-        /// <param name="column">
-        /// <para>
-        /// Pointer to storage for the column filter image.
-        /// </para>
-        /// </param>
-        /// <param name="span">
-        /// <para>
-        /// Pointer to storage for the span filter image (currently unused).
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")]
-        public static 
-        void GetSeparableFilter(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [OutAttribute] IntPtr span)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGetSeparableFilter((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column, (IntPtr)span);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Returns the information log for a shader object
-        /// </summary>
-        /// <param name="shader">
-        /// <para>
-        /// Specifies the shader object whose information log is to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="maxLength">
-        /// <para>
-        /// Specifies the size of the character buffer for storing the returned information log.
-        /// </para>
-        /// </param>
-        /// <param name="length">
-        /// <para>
-        /// Returns the length of the string returned in infoLog (excluding the null terminator).
-        /// </para>
-        /// </param>
-        /// <param name="infoLog">
-        /// <para>
-        /// Specifies an array of characters that is used to return the information log.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetShaderInfoLog")]
-        public static 
-        unsafe void GetShaderInfoLog(Int32 shader, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infoLog)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGetShaderInfoLog((UInt32)shader, (Int32)bufSize, (Int32*)length, (StringBuilder)infoLog);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Returns the information log for a shader object
         /// </summary>
@@ -49429,7 +49390,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetShaderInfoLog")]
         public static 
-        unsafe void GetShaderInfoLog(UInt32 shader, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infoLog)
+        unsafe void GetShaderInfoLog(Int32 shader, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infoLog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -49489,33 +49450,38 @@ namespace OpenTK.Graphics.OpenGL
 
         
         /// <summary>
-        /// Returns a parameter from a shader object
+        /// Returns the information log for a shader object
         /// </summary>
         /// <param name="shader">
         /// <para>
-        /// Specifies the shader object to be queried.
+        /// Specifies the shader object whose information log is to be queried.
         /// </para>
         /// </param>
-        /// <param name="pname">
+        /// <param name="maxLength">
         /// <para>
-        /// Specifies the object parameter. Accepted symbolic names are GL_SHADER_TYPE, GL_DELETE_STATUS, GL_COMPILE_STATUS, GL_INFO_LOG_LENGTH, GL_SHADER_SOURCE_LENGTH.
+        /// Specifies the size of the character buffer for storing the returned information log.
         /// </para>
         /// </param>
-        /// <param name="params">
+        /// <param name="length">
         /// <para>
-        /// Returns the requested object parameter.
+        /// Returns the length of the string returned in infoLog (excluding the null terminator).
+        /// </para>
+        /// </param>
+        /// <param name="infoLog">
+        /// <para>
+        /// Specifies an array of characters that is used to return the information log.
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetShaderiv")]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetShaderInfoLog")]
         public static 
-        unsafe void GetShader(Int32 shader, OpenTK.Graphics.OpenGL.ShaderParameter pname, [OutAttribute] Int32* @params)
+        unsafe void GetShaderInfoLog(UInt32 shader, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder infoLog)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetShaderiv((UInt32)shader, (OpenTK.Graphics.OpenGL.ShaderParameter)pname, (Int32*)@params);
+            Delegates.glGetShaderInfoLog((UInt32)shader, (Int32)bufSize, (Int32*)length, (StringBuilder)infoLog);
             #if DEBUG
             }
             #endif
@@ -49622,7 +49588,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetShaderiv")]
         public static 
-        unsafe void GetShader(UInt32 shader, OpenTK.Graphics.OpenGL.ShaderParameter pname, [OutAttribute] Int32* @params)
+        unsafe void GetShader(Int32 shader, OpenTK.Graphics.OpenGL.ShaderParameter pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -49717,38 +49683,33 @@ namespace OpenTK.Graphics.OpenGL
 
         
         /// <summary>
-        /// Returns the source code string from a shader object
+        /// Returns a parameter from a shader object
         /// </summary>
         /// <param name="shader">
         /// <para>
         /// Specifies the shader object to be queried.
         /// </para>
         /// </param>
-        /// <param name="bufSize">
+        /// <param name="pname">
         /// <para>
-        /// Specifies the size of the character buffer for storing the returned source code string.
+        /// Specifies the object parameter. Accepted symbolic names are GL_SHADER_TYPE, GL_DELETE_STATUS, GL_COMPILE_STATUS, GL_INFO_LOG_LENGTH, GL_SHADER_SOURCE_LENGTH.
         /// </para>
         /// </param>
-        /// <param name="length">
+        /// <param name="params">
         /// <para>
-        /// Returns the length of the string returned in source (excluding the null terminator).
-        /// </para>
-        /// </param>
-        /// <param name="source">
-        /// <para>
-        /// Specifies an array of characters that is used to return the source code string.
+        /// Returns the requested object parameter.
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetShaderSource")]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetShaderiv")]
         public static 
-        unsafe void GetShaderSource(Int32 shader, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder source)
+        unsafe void GetShader(UInt32 shader, OpenTK.Graphics.OpenGL.ShaderParameter pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetShaderSource((UInt32)shader, (Int32)bufSize, (Int32*)length, (StringBuilder)source);
+            Delegates.glGetShaderiv((UInt32)shader, (OpenTK.Graphics.OpenGL.ShaderParameter)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -49826,7 +49787,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetShaderSource")]
         public static 
-        unsafe void GetShaderSource(UInt32 shader, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder source)
+        unsafe void GetShaderSource(Int32 shader, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder source)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -49885,6 +49846,45 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Returns the source code string from a shader object
+        /// </summary>
+        /// <param name="shader">
+        /// <para>
+        /// Specifies the shader object to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="bufSize">
+        /// <para>
+        /// Specifies the size of the character buffer for storing the returned source code string.
+        /// </para>
+        /// </param>
+        /// <param name="length">
+        /// <para>
+        /// Returns the length of the string returned in source (excluding the null terminator).
+        /// </para>
+        /// </param>
+        /// <param name="source">
+        /// <para>
+        /// Specifies an array of characters that is used to return the source code string.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetShaderSource")]
+        public static 
+        unsafe void GetShaderSource(UInt32 shader, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] StringBuilder source)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetShaderSource((UInt32)shader, (Int32)bufSize, (Int32*)length, (StringBuilder)source);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Return a string describing the current GL connection
         /// </summary>
@@ -49954,16 +49954,24 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ArbSync", Version = "1.2", EntryPoint = "glGetSynciv")]
         public static 
-        unsafe void GetSync(IntPtr sync, OpenTK.Graphics.OpenGL.ArbSync pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values)
+        void GetSync(IntPtr sync, OpenTK.Graphics.OpenGL.ArbSync pname, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 values)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetSynciv((IntPtr)sync, (OpenTK.Graphics.OpenGL.ArbSync)pname, (Int32)bufSize, (Int32*)length, (Int32*)values);
+            unsafe
+            {
+                fixed (Int32* length_ptr = &length)
+                fixed (Int32* values_ptr = &values)
+                {
+                    Delegates.glGetSynciv((IntPtr)sync, (OpenTK.Graphics.OpenGL.ArbSync)pname, (Int32)bufSize, (Int32*)length_ptr, (Int32*)values_ptr);
+                    length = *length_ptr;
+                    values = *values_ptr;
+                }
+            }
             #if DEBUG
             }
             #endif
@@ -49987,9 +49995,43 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ArbSync", Version = "1.2", EntryPoint = "glGetSynciv")]
         public static 
-        void GetSync(IntPtr sync, OpenTK.Graphics.OpenGL.ArbSync pname, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 values)
+        unsafe void GetSync(IntPtr sync, OpenTK.Graphics.OpenGL.ArbSync pname, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* values)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetSynciv((IntPtr)sync, (OpenTK.Graphics.OpenGL.ArbSync)pname, (Int32)bufSize, (Int32*)length, (Int32*)values);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Return texture environment parameters
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies a texture environment. May be GL_TEXTURE_ENV, GL_TEXTURE_FILTER_CONTROL, or GL_POINT_SPRITE.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the symbolic name of a texture environment parameter. Accepted values are GL_TEXTURE_ENV_MODE, GL_TEXTURE_ENV_COLOR, GL_TEXTURE_LOD_BIAS, GL_COMBINE_RGB, GL_COMBINE_ALPHA, GL_SRC0_RGB, GL_SRC1_RGB, GL_SRC2_RGB, GL_SRC0_ALPHA, GL_SRC1_ALPHA, GL_SRC2_ALPHA, GL_OPERAND0_RGB, GL_OPERAND1_RGB, GL_OPERAND2_RGB, GL_OPERAND0_ALPHA, GL_OPERAND1_ALPHA, GL_OPERAND2_ALPHA, GL_RGB_SCALE, GL_ALPHA_SCALE, or GL_COORD_REPLACE.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the requested data.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetTexEnvfv")]
+        public static 
+        void GetTexEnv(OpenTK.Graphics.OpenGL.TextureEnvTarget target, OpenTK.Graphics.OpenGL.TextureEnvParameter pname, [OutAttribute] Single[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -49997,12 +50039,9 @@ namespace OpenTK.Graphics.OpenGL
             #endif
             unsafe
             {
-                fixed (Int32* length_ptr = &length)
-                fixed (Int32* values_ptr = &values)
+                fixed (Single* @params_ptr = @params)
                 {
-                    Delegates.glGetSynciv((IntPtr)sync, (OpenTK.Graphics.OpenGL.ArbSync)pname, (Int32)bufSize, (Int32*)length_ptr, (Int32*)values_ptr);
-                    length = *length_ptr;
-                    values = *values_ptr;
+                    Delegates.glGetTexEnvfv((OpenTK.Graphics.OpenGL.TextureEnvTarget)target, (OpenTK.Graphics.OpenGL.TextureEnvParameter)pname, (Single*)@params_ptr);
                 }
             }
             #if DEBUG
@@ -50085,79 +50124,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Return texture environment parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies a texture environment. May be GL_TEXTURE_ENV, GL_TEXTURE_FILTER_CONTROL, or GL_POINT_SPRITE.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the symbolic name of a texture environment parameter. Accepted values are GL_TEXTURE_ENV_MODE, GL_TEXTURE_ENV_COLOR, GL_TEXTURE_LOD_BIAS, GL_COMBINE_RGB, GL_COMBINE_ALPHA, GL_SRC0_RGB, GL_SRC1_RGB, GL_SRC2_RGB, GL_SRC0_ALPHA, GL_SRC1_ALPHA, GL_SRC2_ALPHA, GL_OPERAND0_RGB, GL_OPERAND1_RGB, GL_OPERAND2_RGB, GL_OPERAND0_ALPHA, GL_OPERAND1_ALPHA, GL_OPERAND2_ALPHA, GL_RGB_SCALE, GL_ALPHA_SCALE, or GL_COORD_REPLACE.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the requested data.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetTexEnvfv")]
-        public static 
-        void GetTexEnv(OpenTK.Graphics.OpenGL.TextureEnvTarget target, OpenTK.Graphics.OpenGL.TextureEnvParameter pname, [OutAttribute] Single[] @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* @params_ptr = @params)
-                {
-                    Delegates.glGetTexEnvfv((OpenTK.Graphics.OpenGL.TextureEnvTarget)target, (OpenTK.Graphics.OpenGL.TextureEnvParameter)pname, (Single*)@params_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Return texture environment parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies a texture environment. May be GL_TEXTURE_ENV, GL_TEXTURE_FILTER_CONTROL, or GL_POINT_SPRITE.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the symbolic name of a texture environment parameter. Accepted values are GL_TEXTURE_ENV_MODE, GL_TEXTURE_ENV_COLOR, GL_TEXTURE_LOD_BIAS, GL_COMBINE_RGB, GL_COMBINE_ALPHA, GL_SRC0_RGB, GL_SRC1_RGB, GL_SRC2_RGB, GL_SRC0_ALPHA, GL_SRC1_ALPHA, GL_SRC2_ALPHA, GL_OPERAND0_RGB, GL_OPERAND1_RGB, GL_OPERAND2_RGB, GL_OPERAND0_ALPHA, GL_OPERAND1_ALPHA, GL_OPERAND2_ALPHA, GL_RGB_SCALE, GL_ALPHA_SCALE, or GL_COORD_REPLACE.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the requested data.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetTexEnviv")]
-        public static 
-        unsafe void GetTexEnv(OpenTK.Graphics.OpenGL.TextureEnvTarget target, OpenTK.Graphics.OpenGL.TextureEnvParameter pname, [OutAttribute] Int32* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGetTexEnviv((OpenTK.Graphics.OpenGL.TextureEnvTarget)target, (OpenTK.Graphics.OpenGL.TextureEnvParameter)pname, (Int32*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Return texture environment parameters
         /// </summary>
@@ -50238,16 +50204,16 @@ namespace OpenTK.Graphics.OpenGL
 
         
         /// <summary>
-        /// Return texture coordinate generation parameters
+        /// Return texture environment parameters
         /// </summary>
-        /// <param name="coord">
+        /// <param name="target">
         /// <para>
-        /// Specifies a texture coordinate. Must be GL_S, GL_T, GL_R, or GL_Q.
+        /// Specifies a texture environment. May be GL_TEXTURE_ENV, GL_TEXTURE_FILTER_CONTROL, or GL_POINT_SPRITE.
         /// </para>
         /// </param>
         /// <param name="pname">
         /// <para>
-        /// Specifies the symbolic name of the value(s) to be returned. Must be either GL_TEXTURE_GEN_MODE or the name of one of the texture generation plane equations: GL_OBJECT_PLANE or GL_EYE_PLANE.
+        /// Specifies the symbolic name of a texture environment parameter. Accepted values are GL_TEXTURE_ENV_MODE, GL_TEXTURE_ENV_COLOR, GL_TEXTURE_LOD_BIAS, GL_COMBINE_RGB, GL_COMBINE_ALPHA, GL_SRC0_RGB, GL_SRC1_RGB, GL_SRC2_RGB, GL_SRC0_ALPHA, GL_SRC1_ALPHA, GL_SRC2_ALPHA, GL_OPERAND0_RGB, GL_OPERAND1_RGB, GL_OPERAND2_RGB, GL_OPERAND0_ALPHA, GL_OPERAND1_ALPHA, GL_OPERAND2_ALPHA, GL_RGB_SCALE, GL_ALPHA_SCALE, or GL_COORD_REPLACE.
         /// </para>
         /// </param>
         /// <param name="params">
@@ -50256,15 +50222,15 @@ namespace OpenTK.Graphics.OpenGL
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetTexGendv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetTexEnviv")]
         public static 
-        unsafe void GetTexGen(OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, [OutAttribute] Double* @params)
+        unsafe void GetTexEnv(OpenTK.Graphics.OpenGL.TextureEnvTarget target, OpenTK.Graphics.OpenGL.TextureEnvParameter pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetTexGendv((OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Double*)@params);
+            Delegates.glGetTexEnviv((OpenTK.Graphics.OpenGL.TextureEnvTarget)target, (OpenTK.Graphics.OpenGL.TextureEnvParameter)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -50350,46 +50316,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Return texture coordinate generation parameters
-        /// </summary>
-        /// <param name="coord">
-        /// <para>
-        /// Specifies a texture coordinate. Must be GL_S, GL_T, GL_R, or GL_Q.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the symbolic name of the value(s) to be returned. Must be either GL_TEXTURE_GEN_MODE or the name of one of the texture generation plane equations: GL_OBJECT_PLANE or GL_EYE_PLANE.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the requested data.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetTexGenfv")]
-        public static 
-        void GetTexGen(OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, [OutAttribute] out Single @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* @params_ptr = &@params)
-                {
-                    Delegates.glGetTexGenfv((OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Single*)@params_ptr);
-                    @params = *@params_ptr;
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Return texture coordinate generation parameters
         /// </summary>
@@ -50409,15 +50335,15 @@ namespace OpenTK.Graphics.OpenGL
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetTexGenfv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetTexGendv")]
         public static 
-        unsafe void GetTexGen(OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, [OutAttribute] Single* @params)
+        unsafe void GetTexGen(OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, [OutAttribute] Double* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetTexGenfv((OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Single*)@params);
+            Delegates.glGetTexGendv((OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Double*)@params);
             #if DEBUG
             }
             #endif
@@ -50481,16 +50407,56 @@ namespace OpenTK.Graphics.OpenGL
         /// Returns the requested data.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetTexGeniv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetTexGenfv")]
         public static 
-        unsafe void GetTexGen(OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, [OutAttribute] Int32* @params)
+        void GetTexGen(OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, [OutAttribute] out Single @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetTexGeniv((OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Int32*)@params);
+            unsafe
+            {
+                fixed (Single* @params_ptr = &@params)
+                {
+                    Delegates.glGetTexGenfv((OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Single*)@params_ptr);
+                    @params = *@params_ptr;
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Return texture coordinate generation parameters
+        /// </summary>
+        /// <param name="coord">
+        /// <para>
+        /// Specifies a texture coordinate. Must be GL_S, GL_T, GL_R, or GL_Q.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the symbolic name of the value(s) to be returned. Must be either GL_TEXTURE_GEN_MODE or the name of one of the texture generation plane equations: GL_OBJECT_PLANE or GL_EYE_PLANE.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the requested data.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetTexGenfv")]
+        public static 
+        unsafe void GetTexGen(OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, [OutAttribute] Single* @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetTexGenfv((OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Single*)@params);
             #if DEBUG
             }
             #endif
@@ -50577,52 +50543,33 @@ namespace OpenTK.Graphics.OpenGL
 
         
         /// <summary>
-        /// Return a texture image
+        /// Return texture coordinate generation parameters
         /// </summary>
-        /// <param name="target">
+        /// <param name="coord">
         /// <para>
-        /// Specifies which texture is to be obtained. GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, and GL_TEXTURE_CUBE_MAP_NEGATIVE_Z are accepted.
+        /// Specifies a texture coordinate. Must be GL_S, GL_T, GL_R, or GL_Q.
         /// </para>
         /// </param>
-        /// <param name="level">
+        /// <param name="pname">
         /// <para>
-        /// Specifies the level-of-detail number of the desired image. Level 0 is the base image level. Level is the th mipmap reduction image.
+        /// Specifies the symbolic name of the value(s) to be returned. Must be either GL_TEXTURE_GEN_MODE or the name of one of the texture generation plane equations: GL_OBJECT_PLANE or GL_EYE_PLANE.
         /// </para>
         /// </param>
-        /// <param name="format">
+        /// <param name="params">
         /// <para>
-        /// Specifies a pixel format for the returned data. The supported formats are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
+        /// Returns the requested data.
         /// </para>
         /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies a pixel type for the returned data. The supported types are GL_UNSIGNED_BYTE, GL_BYTE, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
-        /// </para>
-        /// </param>
-        /// <param name="img">
-        /// <para>
-        /// Returns the texture image. Should be a pointer to an array of the type specified by type.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glGetTexImage")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glGetTexGeniv")]
         public static 
-        void GetTexImage<T4>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T4 pixels)
-            where T4 : struct
+        unsafe void GetTexGen(OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glGetTexImage((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                pixels = (T4)pixels_ptr.Target;
-            }
-            finally
-            {
-                pixels_ptr.Free();
-            }
+            Delegates.glGetTexGeniv((OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -50659,7 +50606,50 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glGetTexImage")]
         public static 
-        void GetTexImage<T4>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[,,] pixels)
+        void GetTexImage(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr pixels)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetTexImage((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Return a texture image
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies which texture is to be obtained. GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, and GL_TEXTURE_CUBE_MAP_NEGATIVE_Z are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="level">
+        /// <para>
+        /// Specifies the level-of-detail number of the desired image. Level 0 is the base image level. Level is the th mipmap reduction image.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Specifies a pixel format for the returned data. The supported formats are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies a pixel type for the returned data. The supported types are GL_UNSIGNED_BYTE, GL_BYTE, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
+        /// </para>
+        /// </param>
+        /// <param name="img">
+        /// <para>
+        /// Returns the texture image. Should be a pointer to an array of the type specified by type.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glGetTexImage")]
+        public static 
+        void GetTexImage<T4>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[] pixels)
             where T4 : struct
         {
             #if DEBUG
@@ -50763,7 +50753,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glGetTexImage")]
         public static 
-        void GetTexImage<T4>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[] pixels)
+        void GetTexImage<T4>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[,,] pixels)
             where T4 : struct
         {
             #if DEBUG
@@ -50815,13 +50805,67 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glGetTexImage")]
         public static 
-        void GetTexImage(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr pixels)
+        void GetTexImage<T4>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T4 pixels)
+            where T4 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetTexImage((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+            GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glGetTexImage((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                pixels = (T4)pixels_ptr.Target;
+            }
+            finally
+            {
+                pixels_ptr.Free();
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Return texture parameter values for a specific level of detail
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the symbolic name of the target texture, either GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, GL_PROXY_TEXTURE_1D, GL_PROXY_TEXTURE_2D, GL_PROXY_TEXTURE_3D, GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, or GL_PROXY_TEXTURE_CUBE_MAP.
+        /// </para>
+        /// </param>
+        /// <param name="level">
+        /// <para>
+        /// Specifies the level-of-detail number of the desired image. Level 0 is the base image level. Level is the th mipmap reduction image.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the symbolic name of a texture parameter. GL_TEXTURE_WIDTH, GL_TEXTURE_HEIGHT, GL_TEXTURE_DEPTH, GL_TEXTURE_INTERNAL_FORMAT, GL_TEXTURE_BORDER, GL_TEXTURE_RED_SIZE, GL_TEXTURE_GREEN_SIZE, GL_TEXTURE_BLUE_SIZE, GL_TEXTURE_ALPHA_SIZE, GL_TEXTURE_LUMINANCE_SIZE, GL_TEXTURE_INTENSITY_SIZE, GL_TEXTURE_DEPTH_SIZE, GL_TEXTURE_COMPRESSED, and GL_TEXTURE_COMPRESSED_IMAGE_SIZE are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the requested data.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glGetTexLevelParameterfv")]
+        public static 
+        void GetTexLevelParameter(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Single[] @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* @params_ptr = @params)
+                {
+                    Delegates.glGetTexLevelParameterfv((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Single*)@params_ptr);
+                }
+            }
             #if DEBUG
             }
             #endif
@@ -50912,89 +50956,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Return texture parameter values for a specific level of detail
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the symbolic name of the target texture, either GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, GL_PROXY_TEXTURE_1D, GL_PROXY_TEXTURE_2D, GL_PROXY_TEXTURE_3D, GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, or GL_PROXY_TEXTURE_CUBE_MAP.
-        /// </para>
-        /// </param>
-        /// <param name="level">
-        /// <para>
-        /// Specifies the level-of-detail number of the desired image. Level 0 is the base image level. Level is the th mipmap reduction image.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the symbolic name of a texture parameter. GL_TEXTURE_WIDTH, GL_TEXTURE_HEIGHT, GL_TEXTURE_DEPTH, GL_TEXTURE_INTERNAL_FORMAT, GL_TEXTURE_BORDER, GL_TEXTURE_RED_SIZE, GL_TEXTURE_GREEN_SIZE, GL_TEXTURE_BLUE_SIZE, GL_TEXTURE_ALPHA_SIZE, GL_TEXTURE_LUMINANCE_SIZE, GL_TEXTURE_INTENSITY_SIZE, GL_TEXTURE_DEPTH_SIZE, GL_TEXTURE_COMPRESSED, and GL_TEXTURE_COMPRESSED_IMAGE_SIZE are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the requested data.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glGetTexLevelParameterfv")]
-        public static 
-        void GetTexLevelParameter(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Single[] @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* @params_ptr = @params)
-                {
-                    Delegates.glGetTexLevelParameterfv((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Single*)@params_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Return texture parameter values for a specific level of detail
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the symbolic name of the target texture, either GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, GL_PROXY_TEXTURE_1D, GL_PROXY_TEXTURE_2D, GL_PROXY_TEXTURE_3D, GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, or GL_PROXY_TEXTURE_CUBE_MAP.
-        /// </para>
-        /// </param>
-        /// <param name="level">
-        /// <para>
-        /// Specifies the level-of-detail number of the desired image. Level 0 is the base image level. Level is the th mipmap reduction image.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the symbolic name of a texture parameter. GL_TEXTURE_WIDTH, GL_TEXTURE_HEIGHT, GL_TEXTURE_DEPTH, GL_TEXTURE_INTERNAL_FORMAT, GL_TEXTURE_BORDER, GL_TEXTURE_RED_SIZE, GL_TEXTURE_GREEN_SIZE, GL_TEXTURE_BLUE_SIZE, GL_TEXTURE_ALPHA_SIZE, GL_TEXTURE_LUMINANCE_SIZE, GL_TEXTURE_INTENSITY_SIZE, GL_TEXTURE_DEPTH_SIZE, GL_TEXTURE_COMPRESSED, and GL_TEXTURE_COMPRESSED_IMAGE_SIZE are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the requested data.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glGetTexLevelParameteriv")]
-        public static 
-        unsafe void GetTexLevelParameter(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGetTexLevelParameteriv((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Int32*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Return texture parameter values for a specific level of detail
         /// </summary>
@@ -51084,6 +51045,84 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Return texture parameter values for a specific level of detail
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the symbolic name of the target texture, either GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, GL_PROXY_TEXTURE_1D, GL_PROXY_TEXTURE_2D, GL_PROXY_TEXTURE_3D, GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, or GL_PROXY_TEXTURE_CUBE_MAP.
+        /// </para>
+        /// </param>
+        /// <param name="level">
+        /// <para>
+        /// Specifies the level-of-detail number of the desired image. Level 0 is the base image level. Level is the th mipmap reduction image.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the symbolic name of a texture parameter. GL_TEXTURE_WIDTH, GL_TEXTURE_HEIGHT, GL_TEXTURE_DEPTH, GL_TEXTURE_INTERNAL_FORMAT, GL_TEXTURE_BORDER, GL_TEXTURE_RED_SIZE, GL_TEXTURE_GREEN_SIZE, GL_TEXTURE_BLUE_SIZE, GL_TEXTURE_ALPHA_SIZE, GL_TEXTURE_LUMINANCE_SIZE, GL_TEXTURE_INTENSITY_SIZE, GL_TEXTURE_DEPTH_SIZE, GL_TEXTURE_COMPRESSED, and GL_TEXTURE_COMPRESSED_IMAGE_SIZE are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the requested data.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glGetTexLevelParameteriv")]
+        public static 
+        unsafe void GetTexLevelParameter(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32* @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetTexLevelParameteriv((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Int32*)@params);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Return texture parameter values
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the symbolic name of the target texture. GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, and GL_TEXTURE_CUBE_MAP are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the symbolic name of a texture parameter. GL_TEXTURE_MAG_FILTER, GL_TEXTURE_MIN_FILTER, GL_TEXTURE_MIN_LOD, GL_TEXTURE_MAX_LOD, GL_TEXTURE_BASE_LEVEL, GL_TEXTURE_MAX_LEVEL, GL_TEXTURE_WRAP_S, GL_TEXTURE_WRAP_T, GL_TEXTURE_WRAP_R, GL_TEXTURE_BORDER_COLOR, GL_TEXTURE_PRIORITY, GL_TEXTURE_RESIDENT, GL_TEXTURE_COMPARE_MODE, GL_TEXTURE_COMPARE_FUNC, GL_DEPTH_TEXTURE_MODE, and GL_GENERATE_MIPMAP are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the texture parameters.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glGetTexParameterfv")]
+        public static 
+        void GetTexParameter(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Single[] @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* @params_ptr = @params)
+                {
+                    Delegates.glGetTexParameterfv((OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Single*)@params_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Return texture parameter values
         /// </summary>
@@ -51157,60 +51196,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        
-        /// <summary>
-        /// Return texture parameter values
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the symbolic name of the target texture. GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, and GL_TEXTURE_CUBE_MAP are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the symbolic name of a texture parameter. GL_TEXTURE_MAG_FILTER, GL_TEXTURE_MIN_FILTER, GL_TEXTURE_MIN_LOD, GL_TEXTURE_MAX_LOD, GL_TEXTURE_BASE_LEVEL, GL_TEXTURE_MAX_LEVEL, GL_TEXTURE_WRAP_S, GL_TEXTURE_WRAP_T, GL_TEXTURE_WRAP_R, GL_TEXTURE_BORDER_COLOR, GL_TEXTURE_PRIORITY, GL_TEXTURE_RESIDENT, GL_TEXTURE_COMPARE_MODE, GL_TEXTURE_COMPARE_FUNC, GL_DEPTH_TEXTURE_MODE, and GL_GENERATE_MIPMAP are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the texture parameters.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glGetTexParameterfv")]
-        public static 
-        void GetTexParameter(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Single[] @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* @params_ptr = @params)
-                {
-                    Delegates.glGetTexParameterfv((OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Single*)@params_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetTexParameterIiv")]
-        public static 
-        unsafe void GetTexParameterI(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGetTexParameterIiv((OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Int32*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetTexParameterIiv")]
         public static 
         void GetTexParameterI(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32[] @params)
@@ -51252,6 +51237,42 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetTexParameterIiv")]
+        public static 
+        unsafe void GetTexParameterI(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32* @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetTexParameterIiv((OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Int32*)@params);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetTexParameterIuiv")]
+        public static 
+        void GetTexParameterI(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] UInt32[] @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* @params_ptr = @params)
+                {
+                    Delegates.glGetTexParameterIuiv((OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (UInt32*)@params_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetTexParameterIuiv")]
         public static 
@@ -51289,61 +51310,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetTexParameterIuiv")]
-        public static 
-        void GetTexParameterI(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] UInt32[] @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* @params_ptr = @params)
-                {
-                    Delegates.glGetTexParameterIuiv((OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (UInt32*)@params_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Return texture parameter values
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the symbolic name of the target texture. GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, and GL_TEXTURE_CUBE_MAP are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the symbolic name of a texture parameter. GL_TEXTURE_MAG_FILTER, GL_TEXTURE_MIN_FILTER, GL_TEXTURE_MIN_LOD, GL_TEXTURE_MAX_LOD, GL_TEXTURE_BASE_LEVEL, GL_TEXTURE_MAX_LEVEL, GL_TEXTURE_WRAP_S, GL_TEXTURE_WRAP_T, GL_TEXTURE_WRAP_R, GL_TEXTURE_BORDER_COLOR, GL_TEXTURE_PRIORITY, GL_TEXTURE_RESIDENT, GL_TEXTURE_COMPARE_MODE, GL_TEXTURE_COMPARE_FUNC, GL_DEPTH_TEXTURE_MODE, and GL_GENERATE_MIPMAP are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the texture parameters.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glGetTexParameteriv")]
-        public static 
-        unsafe void GetTexParameter(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGetTexParameteriv((OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Int32*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
         
         /// <summary>
         /// Return texture parameter values
@@ -51423,16 +51389,35 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        
+        /// <summary>
+        /// Return texture parameter values
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the symbolic name of the target texture. GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, and GL_TEXTURE_CUBE_MAP are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the symbolic name of a texture parameter. GL_TEXTURE_MAG_FILTER, GL_TEXTURE_MIN_FILTER, GL_TEXTURE_MIN_LOD, GL_TEXTURE_MAX_LOD, GL_TEXTURE_BASE_LEVEL, GL_TEXTURE_MAX_LEVEL, GL_TEXTURE_WRAP_S, GL_TEXTURE_WRAP_T, GL_TEXTURE_WRAP_R, GL_TEXTURE_BORDER_COLOR, GL_TEXTURE_PRIORITY, GL_TEXTURE_RESIDENT, GL_TEXTURE_COMPARE_MODE, GL_TEXTURE_COMPARE_FUNC, GL_DEPTH_TEXTURE_MODE, and GL_GENERATE_MIPMAP are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the texture parameters.
+        /// </para>
+        /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetTransformFeedbackVarying")]
+        [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glGetTexParameteriv")]
         public static 
-        unsafe void GetTransformFeedbackVarying(Int32 program, Int32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ActiveAttribType* type, [OutAttribute] StringBuilder name)
+        unsafe void GetTexParameter(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length, (Int32*)size, (OpenTK.Graphics.OpenGL.ActiveAttribType*)type, (StringBuilder)name);
+            Delegates.glGetTexParameteriv((OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -51466,7 +51451,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetTransformFeedbackVarying")]
         public static 
-        unsafe void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ActiveAttribType* type, [OutAttribute] StringBuilder name)
+        unsafe void GetTransformFeedbackVarying(Int32 program, Int32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ActiveAttribType* type, [OutAttribute] StringBuilder name)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -51504,6 +51489,21 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetTransformFeedbackVarying")]
+        public static 
+        unsafe void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ActiveAttribType* type, [OutAttribute] StringBuilder name)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetTransformFeedbackVarying((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length, (Int32*)size, (OpenTK.Graphics.OpenGL.ActiveAttribType*)type, (StringBuilder)name);
+            #if DEBUG
+            }
+            #endif
+        }
+
         [AutoGenerated(Category = "ArbUniformBufferObject", Version = "2.0", EntryPoint = "glGetUniformBlockIndex")]
         public static 
         Int32 GetUniformBlockIndex(Int32 program, String uniformBlockName)
@@ -51534,6 +51534,45 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Returns the value of a uniform variable
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// Specifies the program object to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the value of the specified uniform variable.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetUniformfv")]
+        public static 
+        void GetUniform(Int32 program, Int32 location, [OutAttribute] Single[] @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* @params_ptr = @params)
+                {
+                    Delegates.glGetUniformfv((UInt32)program, (Int32)location, (Single*)@params_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Returns the value of a uniform variable
         /// </summary>
@@ -51626,9 +51665,10 @@ namespace OpenTK.Graphics.OpenGL
         /// Returns the value of the specified uniform variable.
         /// </para>
         /// </param>
+        [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetUniformfv")]
         public static 
-        void GetUniform(Int32 program, Int32 location, [OutAttribute] Single[] @params)
+        void GetUniform(UInt32 program, Int32 location, [OutAttribute] Single[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -51721,61 +51761,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        
-        /// <summary>
-        /// Returns the value of a uniform variable
-        /// </summary>
-        /// <param name="program">
-        /// <para>
-        /// Specifies the program object to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the value of the specified uniform variable.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetUniformfv")]
-        public static 
-        void GetUniform(UInt32 program, Int32 location, [OutAttribute] Single[] @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* @params_ptr = @params)
-                {
-                    Delegates.glGetUniformfv((UInt32)program, (Int32)location, (Single*)@params_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ArbUniformBufferObject", Version = "2.0", EntryPoint = "glGetUniformIndices")]
-        public static 
-        unsafe void GetUniformIndices(Int32 program, Int32 uniformCount, String[] uniformNames, [OutAttribute] Int32* uniformIndices)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGetUniformIndices((UInt32)program, (Int32)uniformCount, (String[])uniformNames, (UInt32*)uniformIndices);
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "ArbUniformBufferObject", Version = "2.0", EntryPoint = "glGetUniformIndices")]
         public static 
         void GetUniformIndices(Int32 program, Int32 uniformCount, String[] uniformNames, [OutAttribute] Int32[] uniformIndices)
@@ -51820,29 +51805,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "ArbUniformBufferObject", Version = "2.0", EntryPoint = "glGetUniformIndices")]
         public static 
-        void GetUniformIndices(UInt32 program, Int32 uniformCount, String[] uniformNames, [OutAttribute] out UInt32 uniformIndices)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* uniformIndices_ptr = &uniformIndices)
-                {
-                    Delegates.glGetUniformIndices((UInt32)program, (Int32)uniformCount, (String[])uniformNames, (UInt32*)uniformIndices_ptr);
-                    uniformIndices = *uniformIndices_ptr;
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ArbUniformBufferObject", Version = "2.0", EntryPoint = "glGetUniformIndices")]
-        public static 
-        unsafe void GetUniformIndices(UInt32 program, Int32 uniformCount, String[] uniformNames, [OutAttribute] UInt32* uniformIndices)
+        unsafe void GetUniformIndices(Int32 program, Int32 uniformCount, String[] uniformNames, [OutAttribute] Int32* uniformIndices)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -51875,35 +51838,38 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        
-        /// <summary>
-        /// Returns the value of a uniform variable
-        /// </summary>
-        /// <param name="program">
-        /// <para>
-        /// Specifies the program object to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the value of the specified uniform variable.
-        /// </para>
-        /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetUniformiv")]
+        [AutoGenerated(Category = "ArbUniformBufferObject", Version = "2.0", EntryPoint = "glGetUniformIndices")]
         public static 
-        unsafe void GetUniform(Int32 program, Int32 location, [OutAttribute] Int32* @params)
+        void GetUniformIndices(UInt32 program, Int32 uniformCount, String[] uniformNames, [OutAttribute] out UInt32 uniformIndices)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetUniformiv((UInt32)program, (Int32)location, (Int32*)@params);
+            unsafe
+            {
+                fixed (UInt32* uniformIndices_ptr = &uniformIndices)
+                {
+                    Delegates.glGetUniformIndices((UInt32)program, (Int32)uniformCount, (String[])uniformNames, (UInt32*)uniformIndices_ptr);
+                    uniformIndices = *uniformIndices_ptr;
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "ArbUniformBufferObject", Version = "2.0", EntryPoint = "glGetUniformIndices")]
+        public static 
+        unsafe void GetUniformIndices(UInt32 program, Int32 uniformCount, String[] uniformNames, [OutAttribute] UInt32* uniformIndices)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetUniformIndices((UInt32)program, (Int32)uniformCount, (String[])uniformNames, (UInt32*)uniformIndices);
             #if DEBUG
             }
             #endif
@@ -52010,7 +51976,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetUniformiv")]
         public static 
-        unsafe void GetUniform(UInt32 program, Int32 location, [OutAttribute] Int32* @params)
+        unsafe void GetUniform(Int32 program, Int32 location, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -52104,6 +52070,40 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Returns the value of a uniform variable
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// Specifies the program object to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the value of the specified uniform variable.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetUniformiv")]
+        public static 
+        unsafe void GetUniform(UInt32 program, Int32 location, [OutAttribute] Int32* @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetUniformiv((UInt32)program, (Int32)location, (Int32*)@params);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Returns the location of a uniform variable
         /// </summary>
@@ -52161,6 +52161,46 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Returns the value of a uniform variable
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// Specifies the program object to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the value of the specified uniform variable.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetUniformuiv")]
+        public static 
+        void GetUniform(UInt32 program, Int32 location, [OutAttribute] UInt32[] @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* @params_ptr = @params)
+                {
+                    Delegates.glGetUniformuiv((UInt32)program, (Int32)location, (UInt32*)@params_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Returns the value of a uniform variable
         /// </summary>
@@ -52236,80 +52276,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Returns the value of a uniform variable
-        /// </summary>
-        /// <param name="program">
-        /// <para>
-        /// Specifies the program object to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the value of the specified uniform variable.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetUniformuiv")]
-        public static 
-        void GetUniform(UInt32 program, Int32 location, [OutAttribute] UInt32[] @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* @params_ptr = @params)
-                {
-                    Delegates.glGetUniformuiv((UInt32)program, (Int32)location, (UInt32*)@params_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Return a generic vertex attribute parameter
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the generic vertex attribute parameter to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the symbolic name of the vertex attribute parameter to be queried. Accepted values are GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, GL_VERTEX_ATTRIB_ARRAY_ENABLED, GL_VERTEX_ATTRIB_ARRAY_SIZE, GL_VERTEX_ATTRIB_ARRAY_STRIDE, GL_VERTEX_ATTRIB_ARRAY_TYPE, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, or GL_CURRENT_VERTEX_ATTRIB.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the requested data.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetVertexAttribdv")]
-        public static 
-        unsafe void GetVertexAttrib(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribParameter pname, [OutAttribute] Double* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGetVertexAttribdv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribParameter)pname, (Double*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Return a generic vertex attribute parameter
         /// </summary>
@@ -52410,7 +52376,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetVertexAttribdv")]
         public static 
-        unsafe void GetVertexAttrib(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribParameter pname, [OutAttribute] Double* @params)
+        unsafe void GetVertexAttrib(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribParameter pname, [OutAttribute] Double* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -52504,6 +52470,79 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Return a generic vertex attribute parameter
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the generic vertex attribute parameter to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the symbolic name of the vertex attribute parameter to be queried. Accepted values are GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, GL_VERTEX_ATTRIB_ARRAY_ENABLED, GL_VERTEX_ATTRIB_ARRAY_SIZE, GL_VERTEX_ATTRIB_ARRAY_STRIDE, GL_VERTEX_ATTRIB_ARRAY_TYPE, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, or GL_CURRENT_VERTEX_ATTRIB.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the requested data.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetVertexAttribdv")]
+        public static 
+        unsafe void GetVertexAttrib(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribParameter pname, [OutAttribute] Double* @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetVertexAttribdv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribParameter)pname, (Double*)@params);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Return a generic vertex attribute parameter
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the generic vertex attribute parameter to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the symbolic name of the vertex attribute parameter to be queried. Accepted values are GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, GL_VERTEX_ATTRIB_ARRAY_ENABLED, GL_VERTEX_ATTRIB_ARRAY_SIZE, GL_VERTEX_ATTRIB_ARRAY_STRIDE, GL_VERTEX_ATTRIB_ARRAY_TYPE, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, or GL_CURRENT_VERTEX_ATTRIB.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the requested data.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetVertexAttribfv")]
+        public static 
+        void GetVertexAttrib(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribParameter pname, [OutAttribute] Single[] @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* @params_ptr = @params)
+                {
+                    Delegates.glGetVertexAttribfv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribParameter)pname, (Single*)@params_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Return a generic vertex attribute parameter
         /// </summary>
@@ -52596,9 +52635,10 @@ namespace OpenTK.Graphics.OpenGL
         /// Returns the requested data.
         /// </para>
         /// </param>
+        [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetVertexAttribfv")]
         public static 
-        void GetVertexAttrib(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribParameter pname, [OutAttribute] Single[] @params)
+        void GetVertexAttrib(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribParameter pname, [OutAttribute] Single[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -52691,61 +52731,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        
-        /// <summary>
-        /// Return a generic vertex attribute parameter
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the generic vertex attribute parameter to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the symbolic name of the vertex attribute parameter to be queried. Accepted values are GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, GL_VERTEX_ATTRIB_ARRAY_ENABLED, GL_VERTEX_ATTRIB_ARRAY_SIZE, GL_VERTEX_ATTRIB_ARRAY_STRIDE, GL_VERTEX_ATTRIB_ARRAY_TYPE, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, or GL_CURRENT_VERTEX_ATTRIB.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the requested data.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetVertexAttribfv")]
-        public static 
-        void GetVertexAttrib(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribParameter pname, [OutAttribute] Single[] @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* @params_ptr = @params)
-                {
-                    Delegates.glGetVertexAttribfv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribParameter)pname, (Single*)@params_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetVertexAttribIiv")]
-        public static 
-        unsafe void GetVertexAttribI(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribParameter pname, [OutAttribute] Int32* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGetVertexAttribIiv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribParameter)pname, (Int32*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetVertexAttribIiv")]
         public static 
         void GetVertexAttribI(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribParameter pname, [OutAttribute] out Int32 @params)
@@ -52770,7 +52755,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetVertexAttribIiv")]
         public static 
-        unsafe void GetVertexAttribI(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribParameter pname, [OutAttribute] Int32* @params)
+        unsafe void GetVertexAttribI(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribParameter pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -52804,6 +52789,21 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetVertexAttribIiv")]
+        public static 
+        unsafe void GetVertexAttribI(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribParameter pname, [OutAttribute] Int32* @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetVertexAttribIiv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribParameter)pname, (Int32*)@params);
+            #if DEBUG
+            }
+            #endif
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glGetVertexAttribIuiv")]
         public static 
@@ -52842,40 +52842,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Return a generic vertex attribute parameter
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the generic vertex attribute parameter to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the symbolic name of the vertex attribute parameter to be queried. Accepted values are GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, GL_VERTEX_ATTRIB_ARRAY_ENABLED, GL_VERTEX_ATTRIB_ARRAY_SIZE, GL_VERTEX_ATTRIB_ARRAY_STRIDE, GL_VERTEX_ATTRIB_ARRAY_TYPE, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, or GL_CURRENT_VERTEX_ATTRIB.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the requested data.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetVertexAttribiv")]
-        public static 
-        unsafe void GetVertexAttrib(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribParameter pname, [OutAttribute] Int32* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGetVertexAttribiv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribParameter)pname, (Int32*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Return a generic vertex attribute parameter
         /// </summary>
@@ -52976,7 +52942,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetVertexAttribiv")]
         public static 
-        unsafe void GetVertexAttrib(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribParameter pname, [OutAttribute] Int32* @params)
+        unsafe void GetVertexAttrib(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribParameter pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -53071,42 +53037,33 @@ namespace OpenTK.Graphics.OpenGL
 
         
         /// <summary>
-        /// Return the address of the specified generic vertex attribute pointer
+        /// Return a generic vertex attribute parameter
         /// </summary>
         /// <param name="index">
         /// <para>
-        /// Specifies the generic vertex attribute parameter to be returned.
+        /// Specifies the generic vertex attribute parameter to be queried.
         /// </para>
         /// </param>
         /// <param name="pname">
         /// <para>
-        /// Specifies the symbolic name of the generic vertex attribute parameter to be returned. Must be GL_VERTEX_ATTRIB_ARRAY_POINTER.
+        /// Specifies the symbolic name of the vertex attribute parameter to be queried. Accepted values are GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, GL_VERTEX_ATTRIB_ARRAY_ENABLED, GL_VERTEX_ATTRIB_ARRAY_SIZE, GL_VERTEX_ATTRIB_ARRAY_STRIDE, GL_VERTEX_ATTRIB_ARRAY_TYPE, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, or GL_CURRENT_VERTEX_ATTRIB.
         /// </para>
         /// </param>
-        /// <param name="pointer">
+        /// <param name="params">
         /// <para>
-        /// Returns the pointer value.
+        /// Returns the requested data.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetVertexAttribiv")]
         public static 
-        void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] ref T2 pointer)
-            where T2 : struct
+        unsafe void GetVertexAttrib(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribParameter pname, [OutAttribute] Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerParameter)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                pointer = (T2)pointer_ptr.Target;
-            }
-            finally
-            {
-                pointer_ptr.Free();
-            }
+            Delegates.glGetVertexAttribiv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribParameter)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -53133,7 +53090,40 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
         public static 
-        void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] T2[,,] pointer)
+        void GetVertexAttribPointer(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameter pname, [OutAttribute] IntPtr pointer)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerParameter)pname, (IntPtr)pointer);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Return the address of the specified generic vertex attribute pointer
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the generic vertex attribute parameter to be returned.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the symbolic name of the generic vertex attribute parameter to be returned. Must be GL_VERTEX_ATTRIB_ARRAY_POINTER.
+        /// </para>
+        /// </param>
+        /// <param name="pointer">
+        /// <para>
+        /// Returns the pointer value.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
+        public static 
+        void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] T2[] pointer)
             where T2 : struct
         {
             #if DEBUG
@@ -53217,7 +53207,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
         public static 
-        void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] T2[] pointer)
+        void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] T2[,,] pointer)
             where T2 : struct
         {
             #if DEBUG
@@ -53259,41 +53249,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
         public static 
-        void GetVertexAttribPointer(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameter pname, [OutAttribute] IntPtr pointer)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerParameter)pname, (IntPtr)pointer);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Return the address of the specified generic vertex attribute pointer
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the generic vertex attribute parameter to be returned.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the symbolic name of the generic vertex attribute parameter to be returned. Must be GL_VERTEX_ATTRIB_ARRAY_POINTER.
-        /// </para>
-        /// </param>
-        /// <param name="pointer">
-        /// <para>
-        /// Returns the pointer value.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
-        public static 
-        void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] ref T2 pointer)
+        void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] ref T2 pointer)
             where T2 : struct
         {
             #if DEBUG
@@ -53337,7 +53293,41 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
         public static 
-        void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] T2[,,] pointer)
+        void GetVertexAttribPointer(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameter pname, [OutAttribute] IntPtr pointer)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerParameter)pname, (IntPtr)pointer);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Return the address of the specified generic vertex attribute pointer
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the generic vertex attribute parameter to be returned.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the symbolic name of the generic vertex attribute parameter to be returned. Must be GL_VERTEX_ATTRIB_ARRAY_POINTER.
+        /// </para>
+        /// </param>
+        /// <param name="pointer">
+        /// <para>
+        /// Returns the pointer value.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
+        public static 
+        void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] T2[] pointer)
             where T2 : struct
         {
             #if DEBUG
@@ -53423,7 +53413,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
         public static 
-        void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] T2[] pointer)
+        void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] T2[,,] pointer)
             where T2 : struct
         {
             #if DEBUG
@@ -53466,13 +53456,23 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glGetVertexAttribPointerv")]
         public static 
-        void GetVertexAttribPointer(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameter pname, [OutAttribute] IntPtr pointer)
+        void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.OpenGL.VertexAttribPointerParameter pname, [InAttribute, OutAttribute] ref T2 pointer)
+            where T2 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerParameter)pname, (IntPtr)pointer);
+            GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glGetVertexAttribPointerv((UInt32)index, (OpenTK.Graphics.OpenGL.VertexAttribPointerParameter)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                pointer = (T2)pointer_ptr.Target;
+            }
+            finally
+            {
+                pointer_ptr.Free();
+            }
             #if DEBUG
             }
             #endif
@@ -53771,23 +53771,13 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glIndexPointer")]
         public static 
-        void IndexPointer<T2>(OpenTK.Graphics.OpenGL.IndexPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T2 pointer)
-            where T2 : struct
+        void IndexPointer(OpenTK.Graphics.OpenGL.IndexPointerType type, Int32 stride, IntPtr pointer)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glIndexPointer((OpenTK.Graphics.OpenGL.IndexPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                pointer = (T2)pointer_ptr.Target;
-            }
-            finally
-            {
-                pointer_ptr.Free();
-            }
+            Delegates.glIndexPointer((OpenTK.Graphics.OpenGL.IndexPointerType)type, (Int32)stride, (IntPtr)pointer);
             #if DEBUG
             }
             #endif
@@ -53814,7 +53804,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glIndexPointer")]
         public static 
-        void IndexPointer<T2>(OpenTK.Graphics.OpenGL.IndexPointerType type, Int32 stride, [InAttribute, OutAttribute] T2[,,] pointer)
+        void IndexPointer<T2>(OpenTK.Graphics.OpenGL.IndexPointerType type, Int32 stride, [InAttribute, OutAttribute] T2[] pointer)
             where T2 : struct
         {
             #if DEBUG
@@ -53898,7 +53888,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glIndexPointer")]
         public static 
-        void IndexPointer<T2>(OpenTK.Graphics.OpenGL.IndexPointerType type, Int32 stride, [InAttribute, OutAttribute] T2[] pointer)
+        void IndexPointer<T2>(OpenTK.Graphics.OpenGL.IndexPointerType type, Int32 stride, [InAttribute, OutAttribute] T2[,,] pointer)
             where T2 : struct
         {
             #if DEBUG
@@ -53940,13 +53930,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glIndexPointer")]
         public static 
-        void IndexPointer(OpenTK.Graphics.OpenGL.IndexPointerType type, Int32 stride, IntPtr pointer)
+        void IndexPointer<T2>(OpenTK.Graphics.OpenGL.IndexPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T2 pointer)
+            where T2 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glIndexPointer((OpenTK.Graphics.OpenGL.IndexPointerType)type, (Int32)stride, (IntPtr)pointer);
+            GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glIndexPointer((OpenTK.Graphics.OpenGL.IndexPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                pointer = (T2)pointer_ptr.Target;
+            }
+            finally
+            {
+                pointer_ptr.Free();
+            }
             #if DEBUG
             }
             #endif
@@ -54092,23 +54092,13 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glInterleavedArrays")]
         public static 
-        void InterleavedArrays<T2>(OpenTK.Graphics.OpenGL.InterleavedArrayFormat format, Int32 stride, [InAttribute, OutAttribute] ref T2 pointer)
-            where T2 : struct
+        void InterleavedArrays(OpenTK.Graphics.OpenGL.InterleavedArrayFormat format, Int32 stride, IntPtr pointer)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glInterleavedArrays((OpenTK.Graphics.OpenGL.InterleavedArrayFormat)format, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                pointer = (T2)pointer_ptr.Target;
-            }
-            finally
-            {
-                pointer_ptr.Free();
-            }
+            Delegates.glInterleavedArrays((OpenTK.Graphics.OpenGL.InterleavedArrayFormat)format, (Int32)stride, (IntPtr)pointer);
             #if DEBUG
             }
             #endif
@@ -54130,7 +54120,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glInterleavedArrays")]
         public static 
-        void InterleavedArrays<T2>(OpenTK.Graphics.OpenGL.InterleavedArrayFormat format, Int32 stride, [InAttribute, OutAttribute] T2[,,] pointer)
+        void InterleavedArrays<T2>(OpenTK.Graphics.OpenGL.InterleavedArrayFormat format, Int32 stride, [InAttribute, OutAttribute] T2[] pointer)
             where T2 : struct
         {
             #if DEBUG
@@ -54204,7 +54194,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glInterleavedArrays")]
         public static 
-        void InterleavedArrays<T2>(OpenTK.Graphics.OpenGL.InterleavedArrayFormat format, Int32 stride, [InAttribute, OutAttribute] T2[] pointer)
+        void InterleavedArrays<T2>(OpenTK.Graphics.OpenGL.InterleavedArrayFormat format, Int32 stride, [InAttribute, OutAttribute] T2[,,] pointer)
             where T2 : struct
         {
             #if DEBUG
@@ -54241,13 +54231,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glInterleavedArrays")]
         public static 
-        void InterleavedArrays(OpenTK.Graphics.OpenGL.InterleavedArrayFormat format, Int32 stride, IntPtr pointer)
+        void InterleavedArrays<T2>(OpenTK.Graphics.OpenGL.InterleavedArrayFormat format, Int32 stride, [InAttribute, OutAttribute] ref T2 pointer)
+            where T2 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glInterleavedArrays((OpenTK.Graphics.OpenGL.InterleavedArrayFormat)format, (Int32)stride, (IntPtr)pointer);
+            GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glInterleavedArrays((OpenTK.Graphics.OpenGL.InterleavedArrayFormat)format, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                pointer = (T2)pointer_ptr.Target;
+            }
+            finally
+            {
+                pointer_ptr.Free();
+            }
             #if DEBUG
             }
             #endif
@@ -54758,16 +54758,21 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the value that parameter pname of light source light will be set to.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glLightfv")]
         public static 
-        unsafe void Light(OpenTK.Graphics.OpenGL.LightName light, OpenTK.Graphics.OpenGL.LightParameter pname, Single* @params)
+        void Light(OpenTK.Graphics.OpenGL.LightName light, OpenTK.Graphics.OpenGL.LightParameter pname, Single[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glLightfv((OpenTK.Graphics.OpenGL.LightName)light, (OpenTK.Graphics.OpenGL.LightParameter)pname, (Single*)@params);
+            unsafe
+            {
+                fixed (Single* @params_ptr = @params)
+                {
+                    Delegates.glLightfv((OpenTK.Graphics.OpenGL.LightName)light, (OpenTK.Graphics.OpenGL.LightParameter)pname, (Single*)@params_ptr);
+                }
+            }
             #if DEBUG
             }
             #endif
@@ -54792,21 +54797,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the value that parameter pname of light source light will be set to.
         /// </para>
         /// </param>
+        [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glLightfv")]
         public static 
-        void Light(OpenTK.Graphics.OpenGL.LightName light, OpenTK.Graphics.OpenGL.LightParameter pname, Single[] @params)
+        unsafe void Light(OpenTK.Graphics.OpenGL.LightName light, OpenTK.Graphics.OpenGL.LightParameter pname, Single* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            unsafe
-            {
-                fixed (Single* @params_ptr = @params)
-                {
-                    Delegates.glLightfv((OpenTK.Graphics.OpenGL.LightName)light, (OpenTK.Graphics.OpenGL.LightParameter)pname, (Single*)@params_ptr);
-                }
-            }
+            Delegates.glLightfv((OpenTK.Graphics.OpenGL.LightName)light, (OpenTK.Graphics.OpenGL.LightParameter)pname, (Single*)@params);
             #if DEBUG
             }
             #endif
@@ -54864,16 +54864,21 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the value that parameter pname of light source light will be set to.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glLightiv")]
         public static 
-        unsafe void Light(OpenTK.Graphics.OpenGL.LightName light, OpenTK.Graphics.OpenGL.LightParameter pname, Int32* @params)
+        void Light(OpenTK.Graphics.OpenGL.LightName light, OpenTK.Graphics.OpenGL.LightParameter pname, Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glLightiv((OpenTK.Graphics.OpenGL.LightName)light, (OpenTK.Graphics.OpenGL.LightParameter)pname, (Int32*)@params);
+            unsafe
+            {
+                fixed (Int32* @params_ptr = @params)
+                {
+                    Delegates.glLightiv((OpenTK.Graphics.OpenGL.LightName)light, (OpenTK.Graphics.OpenGL.LightParameter)pname, (Int32*)@params_ptr);
+                }
+            }
             #if DEBUG
             }
             #endif
@@ -54898,21 +54903,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the value that parameter pname of light source light will be set to.
         /// </para>
         /// </param>
+        [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glLightiv")]
         public static 
-        void Light(OpenTK.Graphics.OpenGL.LightName light, OpenTK.Graphics.OpenGL.LightParameter pname, Int32[] @params)
+        unsafe void Light(OpenTK.Graphics.OpenGL.LightName light, OpenTK.Graphics.OpenGL.LightParameter pname, Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            unsafe
-            {
-                fixed (Int32* @params_ptr = @params)
-                {
-                    Delegates.glLightiv((OpenTK.Graphics.OpenGL.LightName)light, (OpenTK.Graphics.OpenGL.LightParameter)pname, (Int32*)@params_ptr);
-                }
-            }
+            Delegates.glLightiv((OpenTK.Graphics.OpenGL.LightName)light, (OpenTK.Graphics.OpenGL.LightParameter)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -54947,35 +54947,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the lighting model parameters
-        /// </summary>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies a single-valued lighting model parameter. GL_LIGHT_MODEL_LOCAL_VIEWER, GL_LIGHT_MODEL_COLOR_CONTROL, and GL_LIGHT_MODEL_TWO_SIDE are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="param">
-        /// <para>
-        /// Specifies the value that param will be set to.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glLightModelfv")]
-        public static 
-        unsafe void LightModel(OpenTK.Graphics.OpenGL.LightModelParameter pname, Single* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glLightModelfv((OpenTK.Graphics.OpenGL.LightModelParameter)pname, (Single*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the lighting model parameters
         /// </summary>
@@ -55023,15 +54994,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the value that param will be set to.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glLightModeli")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glLightModelfv")]
         public static 
-        void LightModel(OpenTK.Graphics.OpenGL.LightModelParameter pname, Int32 param)
+        unsafe void LightModel(OpenTK.Graphics.OpenGL.LightModelParameter pname, Single* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glLightModeli((OpenTK.Graphics.OpenGL.LightModelParameter)pname, (Int32)param);
+            Delegates.glLightModelfv((OpenTK.Graphics.OpenGL.LightModelParameter)pname, (Single*)@params);
             #if DEBUG
             }
             #endif
@@ -55051,16 +55023,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the value that param will be set to.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glLightModeliv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glLightModeli")]
         public static 
-        unsafe void LightModel(OpenTK.Graphics.OpenGL.LightModelParameter pname, Int32* @params)
+        void LightModel(OpenTK.Graphics.OpenGL.LightModelParameter pname, Int32 param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glLightModeliv((OpenTK.Graphics.OpenGL.LightModelParameter)pname, (Int32*)@params);
+            Delegates.glLightModeli((OpenTK.Graphics.OpenGL.LightModelParameter)pname, (Int32)param);
             #if DEBUG
             }
             #endif
@@ -55101,6 +55072,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the lighting model parameters
+        /// </summary>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies a single-valued lighting model parameter. GL_LIGHT_MODEL_LOCAL_VIEWER, GL_LIGHT_MODEL_COLOR_CONTROL, and GL_LIGHT_MODEL_TWO_SIDE are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="param">
+        /// <para>
+        /// Specifies the value that param will be set to.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glLightModeliv")]
+        public static 
+        unsafe void LightModel(OpenTK.Graphics.OpenGL.LightModelParameter pname, Int32* @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glLightModeliv((OpenTK.Graphics.OpenGL.LightModelParameter)pname, (Int32*)@params);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify the line stipple pattern
         /// </summary>
@@ -55293,30 +55293,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Replace the current matrix with the specified matrix
-        /// </summary>
-        /// <param name="m">
-        /// <para>
-        /// Specifies a pointer to 16 consecutive values, which are used as the elements of a 4 times 4 column-major matrix.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glLoadMatrixd")]
-        public static 
-        unsafe void LoadMatrix(Double* m)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glLoadMatrixd((Double*)m);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Replace the current matrix with the specified matrix
         /// </summary>
@@ -55375,6 +55351,59 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Replace the current matrix with the specified matrix
+        /// </summary>
+        /// <param name="m">
+        /// <para>
+        /// Specifies a pointer to 16 consecutive values, which are used as the elements of a 4 times 4 column-major matrix.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glLoadMatrixd")]
+        public static 
+        unsafe void LoadMatrix(Double* m)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glLoadMatrixd((Double*)m);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Replace the current matrix with the specified matrix
+        /// </summary>
+        /// <param name="m">
+        /// <para>
+        /// Specifies a pointer to 16 consecutive values, which are used as the elements of a 4 times 4 column-major matrix.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glLoadMatrixf")]
+        public static 
+        void LoadMatrix(Single[] m)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* m_ptr = m)
+                {
+                    Delegates.glLoadMatrixf((Single*)m_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Replace the current matrix with the specified matrix
         /// </summary>
@@ -55428,35 +55457,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Replace the current matrix with the specified matrix
-        /// </summary>
-        /// <param name="m">
-        /// <para>
-        /// Specifies a pointer to 16 consecutive values, which are used as the elements of a 4 times 4 column-major matrix.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glLoadMatrixf")]
-        public static 
-        void LoadMatrix(Single[] m)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* m_ptr = m)
-                {
-                    Delegates.glLoadMatrixf((Single*)m_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Load a name onto the name stack
         /// </summary>
@@ -55504,30 +55504,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Replace the current matrix with the specified row-major ordered matrix
-        /// </summary>
-        /// <param name="m">
-        /// <para>
-        /// Specifies a pointer to 16 consecutive values, which are used as the elements of a 4 times 4 row-major matrix.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glLoadTransposeMatrixd")]
-        public static 
-        unsafe void LoadTransposeMatrix(Double* m)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glLoadTransposeMatrixd((Double*)m);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Replace the current matrix with the specified row-major ordered matrix
         /// </summary>
@@ -55586,6 +55562,59 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Replace the current matrix with the specified row-major ordered matrix
+        /// </summary>
+        /// <param name="m">
+        /// <para>
+        /// Specifies a pointer to 16 consecutive values, which are used as the elements of a 4 times 4 row-major matrix.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glLoadTransposeMatrixd")]
+        public static 
+        unsafe void LoadTransposeMatrix(Double* m)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glLoadTransposeMatrixd((Double*)m);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Replace the current matrix with the specified row-major ordered matrix
+        /// </summary>
+        /// <param name="m">
+        /// <para>
+        /// Specifies a pointer to 16 consecutive values, which are used as the elements of a 4 times 4 row-major matrix.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glLoadTransposeMatrixf")]
+        public static 
+        void LoadTransposeMatrix(Single[] m)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* m_ptr = m)
+                {
+                    Delegates.glLoadTransposeMatrixf((Single*)m_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Replace the current matrix with the specified row-major ordered matrix
         /// </summary>
@@ -55639,35 +55668,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Replace the current matrix with the specified row-major ordered matrix
-        /// </summary>
-        /// <param name="m">
-        /// <para>
-        /// Specifies a pointer to 16 consecutive values, which are used as the elements of a 4 times 4 row-major matrix.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glLoadTransposeMatrixf")]
-        public static 
-        void LoadTransposeMatrix(Single[] m)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* m_ptr = m)
-                {
-                    Delegates.glLoadTransposeMatrixf((Single*)m_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify a logical pixel operation for color index rendering
         /// </summary>
@@ -55691,50 +55691,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Define a one-dimensional evaluator
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the kind of values that are generated by the evaluator. Symbolic constants GL_MAP1_VERTEX_3, GL_MAP1_VERTEX_4, GL_MAP1_INDEX, GL_MAP1_COLOR_4, GL_MAP1_NORMAL, GL_MAP1_TEXTURE_COORD_1, GL_MAP1_TEXTURE_COORD_2, GL_MAP1_TEXTURE_COORD_3, and GL_MAP1_TEXTURE_COORD_4 are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="u1">
-        /// <para>
-        /// Specify a linear mapping of , as presented to glEvalCoord1, to u hat, the variable that is evaluated by the equations specified by this command.
-        /// </para>
-        /// </param>
-        /// <param name="stride">
-        /// <para>
-        /// Specifies the number of floats or doubles between the beginning of one control point and the beginning of the next one in the data structure referenced in points. This allows control points to be embedded in arbitrary data structures. The only constraint is that the values for a particular control point must occupy contiguous memory locations.
-        /// </para>
-        /// </param>
-        /// <param name="order">
-        /// <para>
-        /// Specifies the number of control points. Must be positive.
-        /// </para>
-        /// </param>
-        /// <param name="points">
-        /// <para>
-        /// Specifies a pointer to the array of control points.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glMap1d")]
-        public static 
-        unsafe void Map1(OpenTK.Graphics.OpenGL.MapTarget target, Double u1, Double u2, Int32 stride, Int32 order, Double* points)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glMap1d((OpenTK.Graphics.OpenGL.MapTarget)target, (Double)u1, (Double)u2, (Int32)stride, (Int32)order, (Double*)points);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Define a one-dimensional evaluator
         /// </summary>
@@ -55833,6 +55789,99 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Define a one-dimensional evaluator
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the kind of values that are generated by the evaluator. Symbolic constants GL_MAP1_VERTEX_3, GL_MAP1_VERTEX_4, GL_MAP1_INDEX, GL_MAP1_COLOR_4, GL_MAP1_NORMAL, GL_MAP1_TEXTURE_COORD_1, GL_MAP1_TEXTURE_COORD_2, GL_MAP1_TEXTURE_COORD_3, and GL_MAP1_TEXTURE_COORD_4 are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="u1">
+        /// <para>
+        /// Specify a linear mapping of , as presented to glEvalCoord1, to u hat, the variable that is evaluated by the equations specified by this command.
+        /// </para>
+        /// </param>
+        /// <param name="stride">
+        /// <para>
+        /// Specifies the number of floats or doubles between the beginning of one control point and the beginning of the next one in the data structure referenced in points. This allows control points to be embedded in arbitrary data structures. The only constraint is that the values for a particular control point must occupy contiguous memory locations.
+        /// </para>
+        /// </param>
+        /// <param name="order">
+        /// <para>
+        /// Specifies the number of control points. Must be positive.
+        /// </para>
+        /// </param>
+        /// <param name="points">
+        /// <para>
+        /// Specifies a pointer to the array of control points.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glMap1d")]
+        public static 
+        unsafe void Map1(OpenTK.Graphics.OpenGL.MapTarget target, Double u1, Double u2, Int32 stride, Int32 order, Double* points)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glMap1d((OpenTK.Graphics.OpenGL.MapTarget)target, (Double)u1, (Double)u2, (Int32)stride, (Int32)order, (Double*)points);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Define a one-dimensional evaluator
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the kind of values that are generated by the evaluator. Symbolic constants GL_MAP1_VERTEX_3, GL_MAP1_VERTEX_4, GL_MAP1_INDEX, GL_MAP1_COLOR_4, GL_MAP1_NORMAL, GL_MAP1_TEXTURE_COORD_1, GL_MAP1_TEXTURE_COORD_2, GL_MAP1_TEXTURE_COORD_3, and GL_MAP1_TEXTURE_COORD_4 are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="u1">
+        /// <para>
+        /// Specify a linear mapping of , as presented to glEvalCoord1, to u hat, the variable that is evaluated by the equations specified by this command.
+        /// </para>
+        /// </param>
+        /// <param name="stride">
+        /// <para>
+        /// Specifies the number of floats or doubles between the beginning of one control point and the beginning of the next one in the data structure referenced in points. This allows control points to be embedded in arbitrary data structures. The only constraint is that the values for a particular control point must occupy contiguous memory locations.
+        /// </para>
+        /// </param>
+        /// <param name="order">
+        /// <para>
+        /// Specifies the number of control points. Must be positive.
+        /// </para>
+        /// </param>
+        /// <param name="points">
+        /// <para>
+        /// Specifies a pointer to the array of control points.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glMap1f")]
+        public static 
+        void Map1(OpenTK.Graphics.OpenGL.MapTarget target, Single u1, Single u2, Int32 stride, Int32 order, Single[] points)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* points_ptr = points)
+                {
+                    Delegates.glMap1f((OpenTK.Graphics.OpenGL.MapTarget)target, (Single)u1, (Single)u2, (Int32)stride, (Int32)order, (Single*)points_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Define a one-dimensional evaluator
         /// </summary>
@@ -55926,114 +55975,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Define a one-dimensional evaluator
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the kind of values that are generated by the evaluator. Symbolic constants GL_MAP1_VERTEX_3, GL_MAP1_VERTEX_4, GL_MAP1_INDEX, GL_MAP1_COLOR_4, GL_MAP1_NORMAL, GL_MAP1_TEXTURE_COORD_1, GL_MAP1_TEXTURE_COORD_2, GL_MAP1_TEXTURE_COORD_3, and GL_MAP1_TEXTURE_COORD_4 are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="u1">
-        /// <para>
-        /// Specify a linear mapping of , as presented to glEvalCoord1, to u hat, the variable that is evaluated by the equations specified by this command.
-        /// </para>
-        /// </param>
-        /// <param name="stride">
-        /// <para>
-        /// Specifies the number of floats or doubles between the beginning of one control point and the beginning of the next one in the data structure referenced in points. This allows control points to be embedded in arbitrary data structures. The only constraint is that the values for a particular control point must occupy contiguous memory locations.
-        /// </para>
-        /// </param>
-        /// <param name="order">
-        /// <para>
-        /// Specifies the number of control points. Must be positive.
-        /// </para>
-        /// </param>
-        /// <param name="points">
-        /// <para>
-        /// Specifies a pointer to the array of control points.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glMap1f")]
-        public static 
-        void Map1(OpenTK.Graphics.OpenGL.MapTarget target, Single u1, Single u2, Int32 stride, Int32 order, Single[] points)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* points_ptr = points)
-                {
-                    Delegates.glMap1f((OpenTK.Graphics.OpenGL.MapTarget)target, (Single)u1, (Single)u2, (Int32)stride, (Int32)order, (Single*)points_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Define a two-dimensional evaluator
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the kind of values that are generated by the evaluator. Symbolic constants GL_MAP2_VERTEX_3, GL_MAP2_VERTEX_4, GL_MAP2_INDEX, GL_MAP2_COLOR_4, GL_MAP2_NORMAL, GL_MAP2_TEXTURE_COORD_1, GL_MAP2_TEXTURE_COORD_2, GL_MAP2_TEXTURE_COORD_3, and GL_MAP2_TEXTURE_COORD_4 are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="u1">
-        /// <para>
-        /// Specify a linear mapping of , as presented to glEvalCoord2, to u hat, one of the two variables that are evaluated by the equations specified by this command. Initially, u1 is 0 and u2 is 1.
-        /// </para>
-        /// </param>
-        /// <param name="ustride">
-        /// <para>
-        /// Specifies the number of floats or doubles between the beginning of control point R sub ij and the beginning of control point R sub { (i+1) j }, where and are the and control point indices, respectively. This allows control points to be embedded in arbitrary data structures. The only constraint is that the values for a particular control point must occupy contiguous memory locations. The initial value of ustride is 0.
-        /// </para>
-        /// </param>
-        /// <param name="uorder">
-        /// <para>
-        /// Specifies the dimension of the control point array in the axis. Must be positive. The initial value is 1.
-        /// </para>
-        /// </param>
-        /// <param name="v1">
-        /// <para>
-        /// Specify a linear mapping of , as presented to glEvalCoord2, to v hat, one of the two variables that are evaluated by the equations specified by this command. Initially, v1 is 0 and v2 is 1.
-        /// </para>
-        /// </param>
-        /// <param name="vstride">
-        /// <para>
-        /// Specifies the number of floats or doubles between the beginning of control point R sub ij and the beginning of control point R sub { i (j+1) }, where and are the and control point indices, respectively. This allows control points to be embedded in arbitrary data structures. The only constraint is that the values for a particular control point must occupy contiguous memory locations. The initial value of vstride is 0.
-        /// </para>
-        /// </param>
-        /// <param name="vorder">
-        /// <para>
-        /// Specifies the dimension of the control point array in the axis. Must be positive. The initial value is 1.
-        /// </para>
-        /// </param>
-        /// <param name="points">
-        /// <para>
-        /// Specifies a pointer to the array of control points.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glMap2d")]
-        public static 
-        unsafe void Map2(OpenTK.Graphics.OpenGL.MapTarget target, Double u1, Double u2, Int32 ustride, Int32 uorder, Double v1, Double v2, Int32 vstride, Int32 vorder, Double* points)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glMap2d((OpenTK.Graphics.OpenGL.MapTarget)target, (Double)u1, (Double)u2, (Int32)ustride, (Int32)uorder, (Double)v1, (Double)v2, (Int32)vstride, (Int32)vorder, (Double*)points);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Define a two-dimensional evaluator
         /// </summary>
@@ -56162,6 +56103,129 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Define a two-dimensional evaluator
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the kind of values that are generated by the evaluator. Symbolic constants GL_MAP2_VERTEX_3, GL_MAP2_VERTEX_4, GL_MAP2_INDEX, GL_MAP2_COLOR_4, GL_MAP2_NORMAL, GL_MAP2_TEXTURE_COORD_1, GL_MAP2_TEXTURE_COORD_2, GL_MAP2_TEXTURE_COORD_3, and GL_MAP2_TEXTURE_COORD_4 are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="u1">
+        /// <para>
+        /// Specify a linear mapping of , as presented to glEvalCoord2, to u hat, one of the two variables that are evaluated by the equations specified by this command. Initially, u1 is 0 and u2 is 1.
+        /// </para>
+        /// </param>
+        /// <param name="ustride">
+        /// <para>
+        /// Specifies the number of floats or doubles between the beginning of control point R sub ij and the beginning of control point R sub { (i+1) j }, where and are the and control point indices, respectively. This allows control points to be embedded in arbitrary data structures. The only constraint is that the values for a particular control point must occupy contiguous memory locations. The initial value of ustride is 0.
+        /// </para>
+        /// </param>
+        /// <param name="uorder">
+        /// <para>
+        /// Specifies the dimension of the control point array in the axis. Must be positive. The initial value is 1.
+        /// </para>
+        /// </param>
+        /// <param name="v1">
+        /// <para>
+        /// Specify a linear mapping of , as presented to glEvalCoord2, to v hat, one of the two variables that are evaluated by the equations specified by this command. Initially, v1 is 0 and v2 is 1.
+        /// </para>
+        /// </param>
+        /// <param name="vstride">
+        /// <para>
+        /// Specifies the number of floats or doubles between the beginning of control point R sub ij and the beginning of control point R sub { i (j+1) }, where and are the and control point indices, respectively. This allows control points to be embedded in arbitrary data structures. The only constraint is that the values for a particular control point must occupy contiguous memory locations. The initial value of vstride is 0.
+        /// </para>
+        /// </param>
+        /// <param name="vorder">
+        /// <para>
+        /// Specifies the dimension of the control point array in the axis. Must be positive. The initial value is 1.
+        /// </para>
+        /// </param>
+        /// <param name="points">
+        /// <para>
+        /// Specifies a pointer to the array of control points.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glMap2d")]
+        public static 
+        unsafe void Map2(OpenTK.Graphics.OpenGL.MapTarget target, Double u1, Double u2, Int32 ustride, Int32 uorder, Double v1, Double v2, Int32 vstride, Int32 vorder, Double* points)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glMap2d((OpenTK.Graphics.OpenGL.MapTarget)target, (Double)u1, (Double)u2, (Int32)ustride, (Int32)uorder, (Double)v1, (Double)v2, (Int32)vstride, (Int32)vorder, (Double*)points);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Define a two-dimensional evaluator
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the kind of values that are generated by the evaluator. Symbolic constants GL_MAP2_VERTEX_3, GL_MAP2_VERTEX_4, GL_MAP2_INDEX, GL_MAP2_COLOR_4, GL_MAP2_NORMAL, GL_MAP2_TEXTURE_COORD_1, GL_MAP2_TEXTURE_COORD_2, GL_MAP2_TEXTURE_COORD_3, and GL_MAP2_TEXTURE_COORD_4 are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="u1">
+        /// <para>
+        /// Specify a linear mapping of , as presented to glEvalCoord2, to u hat, one of the two variables that are evaluated by the equations specified by this command. Initially, u1 is 0 and u2 is 1.
+        /// </para>
+        /// </param>
+        /// <param name="ustride">
+        /// <para>
+        /// Specifies the number of floats or doubles between the beginning of control point R sub ij and the beginning of control point R sub { (i+1) j }, where and are the and control point indices, respectively. This allows control points to be embedded in arbitrary data structures. The only constraint is that the values for a particular control point must occupy contiguous memory locations. The initial value of ustride is 0.
+        /// </para>
+        /// </param>
+        /// <param name="uorder">
+        /// <para>
+        /// Specifies the dimension of the control point array in the axis. Must be positive. The initial value is 1.
+        /// </para>
+        /// </param>
+        /// <param name="v1">
+        /// <para>
+        /// Specify a linear mapping of , as presented to glEvalCoord2, to v hat, one of the two variables that are evaluated by the equations specified by this command. Initially, v1 is 0 and v2 is 1.
+        /// </para>
+        /// </param>
+        /// <param name="vstride">
+        /// <para>
+        /// Specifies the number of floats or doubles between the beginning of control point R sub ij and the beginning of control point R sub { i (j+1) }, where and are the and control point indices, respectively. This allows control points to be embedded in arbitrary data structures. The only constraint is that the values for a particular control point must occupy contiguous memory locations. The initial value of vstride is 0.
+        /// </para>
+        /// </param>
+        /// <param name="vorder">
+        /// <para>
+        /// Specifies the dimension of the control point array in the axis. Must be positive. The initial value is 1.
+        /// </para>
+        /// </param>
+        /// <param name="points">
+        /// <para>
+        /// Specifies a pointer to the array of control points.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glMap2f")]
+        public static 
+        void Map2(OpenTK.Graphics.OpenGL.MapTarget target, Single u1, Single u2, Int32 ustride, Int32 uorder, Single v1, Single v2, Int32 vstride, Int32 vorder, Single[] points)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* points_ptr = points)
+                {
+                    Delegates.glMap2f((OpenTK.Graphics.OpenGL.MapTarget)target, (Single)u1, (Single)u2, (Int32)ustride, (Int32)uorder, (Single)v1, (Single)v2, (Int32)vstride, (Int32)vorder, (Single*)points_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Define a two-dimensional evaluator
         /// </summary>
@@ -56285,70 +56349,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Define a two-dimensional evaluator
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the kind of values that are generated by the evaluator. Symbolic constants GL_MAP2_VERTEX_3, GL_MAP2_VERTEX_4, GL_MAP2_INDEX, GL_MAP2_COLOR_4, GL_MAP2_NORMAL, GL_MAP2_TEXTURE_COORD_1, GL_MAP2_TEXTURE_COORD_2, GL_MAP2_TEXTURE_COORD_3, and GL_MAP2_TEXTURE_COORD_4 are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="u1">
-        /// <para>
-        /// Specify a linear mapping of , as presented to glEvalCoord2, to u hat, one of the two variables that are evaluated by the equations specified by this command. Initially, u1 is 0 and u2 is 1.
-        /// </para>
-        /// </param>
-        /// <param name="ustride">
-        /// <para>
-        /// Specifies the number of floats or doubles between the beginning of control point R sub ij and the beginning of control point R sub { (i+1) j }, where and are the and control point indices, respectively. This allows control points to be embedded in arbitrary data structures. The only constraint is that the values for a particular control point must occupy contiguous memory locations. The initial value of ustride is 0.
-        /// </para>
-        /// </param>
-        /// <param name="uorder">
-        /// <para>
-        /// Specifies the dimension of the control point array in the axis. Must be positive. The initial value is 1.
-        /// </para>
-        /// </param>
-        /// <param name="v1">
-        /// <para>
-        /// Specify a linear mapping of , as presented to glEvalCoord2, to v hat, one of the two variables that are evaluated by the equations specified by this command. Initially, v1 is 0 and v2 is 1.
-        /// </para>
-        /// </param>
-        /// <param name="vstride">
-        /// <para>
-        /// Specifies the number of floats or doubles between the beginning of control point R sub ij and the beginning of control point R sub { i (j+1) }, where and are the and control point indices, respectively. This allows control points to be embedded in arbitrary data structures. The only constraint is that the values for a particular control point must occupy contiguous memory locations. The initial value of vstride is 0.
-        /// </para>
-        /// </param>
-        /// <param name="vorder">
-        /// <para>
-        /// Specifies the dimension of the control point array in the axis. Must be positive. The initial value is 1.
-        /// </para>
-        /// </param>
-        /// <param name="points">
-        /// <para>
-        /// Specifies a pointer to the array of control points.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glMap2f")]
-        public static 
-        void Map2(OpenTK.Graphics.OpenGL.MapTarget target, Single u1, Single u2, Int32 ustride, Int32 uorder, Single v1, Single v2, Int32 vstride, Int32 vorder, Single[] points)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* points_ptr = points)
-                {
-                    Delegates.glMap2f((OpenTK.Graphics.OpenGL.MapTarget)target, (Single)u1, (Single)u2, (Int32)ustride, (Int32)uorder, (Single)v1, (Single)v2, (Int32)vstride, (Int32)vorder, (Single*)points_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Map a buffer object's data store
         /// </summary>
@@ -56596,16 +56596,21 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the value that parameter GL_SHININESS will be set to.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glMaterialfv")]
         public static 
-        unsafe void Material(OpenTK.Graphics.OpenGL.MaterialFace face, OpenTK.Graphics.OpenGL.MaterialParameter pname, Single* @params)
+        void Material(OpenTK.Graphics.OpenGL.MaterialFace face, OpenTK.Graphics.OpenGL.MaterialParameter pname, Single[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glMaterialfv((OpenTK.Graphics.OpenGL.MaterialFace)face, (OpenTK.Graphics.OpenGL.MaterialParameter)pname, (Single*)@params);
+            unsafe
+            {
+                fixed (Single* @params_ptr = @params)
+                {
+                    Delegates.glMaterialfv((OpenTK.Graphics.OpenGL.MaterialFace)face, (OpenTK.Graphics.OpenGL.MaterialParameter)pname, (Single*)@params_ptr);
+                }
+            }
             #if DEBUG
             }
             #endif
@@ -56630,21 +56635,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the value that parameter GL_SHININESS will be set to.
         /// </para>
         /// </param>
+        [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glMaterialfv")]
         public static 
-        void Material(OpenTK.Graphics.OpenGL.MaterialFace face, OpenTK.Graphics.OpenGL.MaterialParameter pname, Single[] @params)
+        unsafe void Material(OpenTK.Graphics.OpenGL.MaterialFace face, OpenTK.Graphics.OpenGL.MaterialParameter pname, Single* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            unsafe
-            {
-                fixed (Single* @params_ptr = @params)
-                {
-                    Delegates.glMaterialfv((OpenTK.Graphics.OpenGL.MaterialFace)face, (OpenTK.Graphics.OpenGL.MaterialParameter)pname, (Single*)@params_ptr);
-                }
-            }
+            Delegates.glMaterialfv((OpenTK.Graphics.OpenGL.MaterialFace)face, (OpenTK.Graphics.OpenGL.MaterialParameter)pname, (Single*)@params);
             #if DEBUG
             }
             #endif
@@ -56702,16 +56702,21 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the value that parameter GL_SHININESS will be set to.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glMaterialiv")]
         public static 
-        unsafe void Material(OpenTK.Graphics.OpenGL.MaterialFace face, OpenTK.Graphics.OpenGL.MaterialParameter pname, Int32* @params)
+        void Material(OpenTK.Graphics.OpenGL.MaterialFace face, OpenTK.Graphics.OpenGL.MaterialParameter pname, Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glMaterialiv((OpenTK.Graphics.OpenGL.MaterialFace)face, (OpenTK.Graphics.OpenGL.MaterialParameter)pname, (Int32*)@params);
+            unsafe
+            {
+                fixed (Int32* @params_ptr = @params)
+                {
+                    Delegates.glMaterialiv((OpenTK.Graphics.OpenGL.MaterialFace)face, (OpenTK.Graphics.OpenGL.MaterialParameter)pname, (Int32*)@params_ptr);
+                }
+            }
             #if DEBUG
             }
             #endif
@@ -56736,21 +56741,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the value that parameter GL_SHININESS will be set to.
         /// </para>
         /// </param>
+        [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glMaterialiv")]
         public static 
-        void Material(OpenTK.Graphics.OpenGL.MaterialFace face, OpenTK.Graphics.OpenGL.MaterialParameter pname, Int32[] @params)
+        unsafe void Material(OpenTK.Graphics.OpenGL.MaterialFace face, OpenTK.Graphics.OpenGL.MaterialParameter pname, Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            unsafe
-            {
-                fixed (Int32* @params_ptr = @params)
-                {
-                    Delegates.glMaterialiv((OpenTK.Graphics.OpenGL.MaterialFace)face, (OpenTK.Graphics.OpenGL.MaterialParameter)pname, (Int32*)@params_ptr);
-                }
-            }
+            Delegates.glMaterialiv((OpenTK.Graphics.OpenGL.MaterialFace)face, (OpenTK.Graphics.OpenGL.MaterialParameter)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -56827,45 +56827,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Render multiple sets of primitives from array data
-        /// </summary>
-        /// <param name="mode">
-        /// <para>
-        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="first">
-        /// <para>
-        /// Points to an array of starting indices in the enabled arrays.
-        /// </para>
-        /// </param>
-        /// <param name="count">
-        /// <para>
-        /// Points to an array of the number of indices to be rendered.
-        /// </para>
-        /// </param>
-        /// <param name="primcount">
-        /// <para>
-        /// Specifies the size of the first and count
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glMultiDrawArrays")]
-        public static 
-        unsafe void MultiDrawArrays(OpenTK.Graphics.OpenGL.BeginMode mode, [OutAttribute] Int32* first, [OutAttribute] Int32* count, Int32 primcount)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glMultiDrawArrays((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)first, (Int32*)count, (Int32)primcount);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Render multiple sets of primitives from array data
         /// </summary>
@@ -56959,256 +56920,38 @@ namespace OpenTK.Graphics.OpenGL
 
         
         /// <summary>
-        /// Render multiple sets of primitives by specifying indices of array data elements
+        /// Render multiple sets of primitives from array data
         /// </summary>
         /// <param name="mode">
         /// <para>
         /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
         /// </para>
         /// </param>
+        /// <param name="first">
+        /// <para>
+        /// Points to an array of starting indices in the enabled arrays.
+        /// </para>
+        /// </param>
         /// <param name="count">
         /// <para>
-        /// Points to an array of the elements counts.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
-        /// </para>
-        /// </param>
-        /// <param name="indices">
-        /// <para>
-        /// Specifies a pointer to the location where the indices are stored.
+        /// Points to an array of the number of indices to be rendered.
         /// </para>
         /// </param>
         /// <param name="primcount">
         /// <para>
-        /// Specifies the size of the count array.
+        /// Specifies the size of the first and count
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glMultiDrawElements")]
+        [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glMultiDrawArrays")]
         public static 
-        unsafe void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount)
-            where T3 : struct
+        unsafe void MultiDrawArrays(OpenTK.Graphics.OpenGL.BeginMode mode, [OutAttribute] Int32* first, [OutAttribute] Int32* count, Int32 primcount)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glMultiDrawElements((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
-                indices = (T3)indices_ptr.Target;
-            }
-            finally
-            {
-                indices_ptr.Free();
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Render multiple sets of primitives by specifying indices of array data elements
-        /// </summary>
-        /// <param name="mode">
-        /// <para>
-        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="count">
-        /// <para>
-        /// Points to an array of the elements counts.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
-        /// </para>
-        /// </param>
-        /// <param name="indices">
-        /// <para>
-        /// Specifies a pointer to the location where the indices are stored.
-        /// </para>
-        /// </param>
-        /// <param name="primcount">
-        /// <para>
-        /// Specifies the size of the count array.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glMultiDrawElements")]
-        public static 
-        unsafe void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount)
-            where T3 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glMultiDrawElements((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
-            }
-            finally
-            {
-                indices_ptr.Free();
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Render multiple sets of primitives by specifying indices of array data elements
-        /// </summary>
-        /// <param name="mode">
-        /// <para>
-        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="count">
-        /// <para>
-        /// Points to an array of the elements counts.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
-        /// </para>
-        /// </param>
-        /// <param name="indices">
-        /// <para>
-        /// Specifies a pointer to the location where the indices are stored.
-        /// </para>
-        /// </param>
-        /// <param name="primcount">
-        /// <para>
-        /// Specifies the size of the count array.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glMultiDrawElements")]
-        public static 
-        unsafe void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,] indices, Int32 primcount)
-            where T3 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glMultiDrawElements((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
-            }
-            finally
-            {
-                indices_ptr.Free();
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Render multiple sets of primitives by specifying indices of array data elements
-        /// </summary>
-        /// <param name="mode">
-        /// <para>
-        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="count">
-        /// <para>
-        /// Points to an array of the elements counts.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
-        /// </para>
-        /// </param>
-        /// <param name="indices">
-        /// <para>
-        /// Specifies a pointer to the location where the indices are stored.
-        /// </para>
-        /// </param>
-        /// <param name="primcount">
-        /// <para>
-        /// Specifies the size of the count array.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glMultiDrawElements")]
-        public static 
-        unsafe void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount)
-            where T3 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glMultiDrawElements((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
-            }
-            finally
-            {
-                indices_ptr.Free();
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Render multiple sets of primitives by specifying indices of array data elements
-        /// </summary>
-        /// <param name="mode">
-        /// <para>
-        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="count">
-        /// <para>
-        /// Points to an array of the elements counts.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
-        /// </para>
-        /// </param>
-        /// <param name="indices">
-        /// <para>
-        /// Specifies a pointer to the location where the indices are stored.
-        /// </para>
-        /// </param>
-        /// <param name="primcount">
-        /// <para>
-        /// Specifies the size of the count array.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glMultiDrawElements")]
-        public static 
-        unsafe void MultiDrawElements(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glMultiDrawElements((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount);
+            Delegates.glMultiDrawArrays((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)first, (Int32*)count, (Int32)primcount);
             #if DEBUG
             }
             #endif
@@ -57245,8 +56988,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glMultiDrawElements")]
         public static 
-        void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount)
-            where T3 : struct
+        void MultiDrawElements(OpenTK.Graphics.OpenGL.BeginMode mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -57256,16 +56998,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* count_ptr = count)
                 {
-                    GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
-                    try
-                    {
-                        Delegates.glMultiDrawElements((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count_ptr, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
-                        indices = (T3)indices_ptr.Target;
-                    }
-                    finally
-                    {
-                        indices_ptr.Free();
-                    }
+                    Delegates.glMultiDrawElements((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count_ptr, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount);
                 }
             }
             #if DEBUG
@@ -57304,7 +57037,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glMultiDrawElements")]
         public static 
-        void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount)
+        void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount)
             where T3 : struct
         {
             #if DEBUG
@@ -57420,7 +57153,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glMultiDrawElements")]
         public static 
-        void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount)
+        void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount)
             where T3 : struct
         {
             #if DEBUG
@@ -57478,56 +57211,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glMultiDrawElements")]
         public static 
-        void MultiDrawElements(OpenTK.Graphics.OpenGL.BeginMode mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Int32* count_ptr = count)
-                {
-                    Delegates.glMultiDrawElements((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count_ptr, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Render multiple sets of primitives by specifying indices of array data elements
-        /// </summary>
-        /// <param name="mode">
-        /// <para>
-        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="count">
-        /// <para>
-        /// Points to an array of the elements counts.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
-        /// </para>
-        /// </param>
-        /// <param name="indices">
-        /// <para>
-        /// Specifies a pointer to the location where the indices are stored.
-        /// </para>
-        /// </param>
-        /// <param name="primcount">
-        /// <para>
-        /// Specifies the size of the count array.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glMultiDrawElements")]
-        public static 
-        void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount)
+        void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount)
             where T3 : struct
         {
             #if DEBUG
@@ -57536,7 +57220,7 @@ namespace OpenTK.Graphics.OpenGL
             #endif
             unsafe
             {
-                fixed (Int32* count_ptr = &count)
+                fixed (Int32* count_ptr = count)
                 {
                     GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
                     try
@@ -57586,7 +57270,56 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glMultiDrawElements")]
         public static 
-        void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount)
+        void MultiDrawElements(OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Int32* count_ptr = &count)
+                {
+                    Delegates.glMultiDrawElements((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count_ptr, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Render multiple sets of primitives by specifying indices of array data elements
+        /// </summary>
+        /// <param name="mode">
+        /// <para>
+        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="count">
+        /// <para>
+        /// Points to an array of the elements counts.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
+        /// </para>
+        /// </param>
+        /// <param name="indices">
+        /// <para>
+        /// Specifies a pointer to the location where the indices are stored.
+        /// </para>
+        /// </param>
+        /// <param name="primcount">
+        /// <para>
+        /// Specifies the size of the count array.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glMultiDrawElements")]
+        public static 
+        void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount)
             where T3 : struct
         {
             #if DEBUG
@@ -57702,7 +57435,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glMultiDrawElements")]
         public static 
-        void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount)
+        void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount)
             where T3 : struct
         {
             #if DEBUG
@@ -57760,7 +57493,8 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glMultiDrawElements")]
         public static 
-        void MultiDrawElements(OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount)
+        void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount)
+            where T3 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -57769,145 +57503,11 @@ namespace OpenTK.Graphics.OpenGL
             unsafe
             {
                 fixed (Int32* count_ptr = &count)
-                {
-                    Delegates.glMultiDrawElements((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count_ptr, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glMultiDrawElementsBaseVertex")]
-        public static 
-        unsafe void MultiDrawElementsBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount, Int32* basevertex)
-            where T3 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glMultiDrawElementsBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount, (Int32*)basevertex);
-                indices = (T3)indices_ptr.Target;
-            }
-            finally
-            {
-                indices_ptr.Free();
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glMultiDrawElementsBaseVertex")]
-        public static 
-        unsafe void MultiDrawElementsBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount, Int32* basevertex)
-            where T3 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glMultiDrawElementsBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount, (Int32*)basevertex);
-            }
-            finally
-            {
-                indices_ptr.Free();
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glMultiDrawElementsBaseVertex")]
-        public static 
-        unsafe void MultiDrawElementsBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,] indices, Int32 primcount, Int32* basevertex)
-            where T3 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glMultiDrawElementsBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount, (Int32*)basevertex);
-            }
-            finally
-            {
-                indices_ptr.Free();
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glMultiDrawElementsBaseVertex")]
-        public static 
-        unsafe void MultiDrawElementsBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount, Int32* basevertex)
-            where T3 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glMultiDrawElementsBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount, (Int32*)basevertex);
-            }
-            finally
-            {
-                indices_ptr.Free();
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glMultiDrawElementsBaseVertex")]
-        public static 
-        unsafe void MultiDrawElementsBaseVertex(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount, Int32* basevertex)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glMultiDrawElementsBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount, (Int32*)basevertex);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glMultiDrawElementsBaseVertex")]
-        public static 
-        void MultiDrawElementsBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount, Int32[] basevertex)
-            where T3 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Int32* count_ptr = count)
-                fixed (Int32* basevertex_ptr = basevertex)
                 {
                     GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
                     try
                     {
-                        Delegates.glMultiDrawElementsBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count_ptr, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount, (Int32*)basevertex_ptr);
+                        Delegates.glMultiDrawElements((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count_ptr, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
                         indices = (T3)indices_ptr.Target;
                     }
                     finally
@@ -57921,9 +57521,287 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        
+        /// <summary>
+        /// Render multiple sets of primitives by specifying indices of array data elements
+        /// </summary>
+        /// <param name="mode">
+        /// <para>
+        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="count">
+        /// <para>
+        /// Points to an array of the elements counts.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
+        /// </para>
+        /// </param>
+        /// <param name="indices">
+        /// <para>
+        /// Specifies a pointer to the location where the indices are stored.
+        /// </para>
+        /// </param>
+        /// <param name="primcount">
+        /// <para>
+        /// Specifies the size of the count array.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glMultiDrawElements")]
+        public static 
+        unsafe void MultiDrawElements(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glMultiDrawElements((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Render multiple sets of primitives by specifying indices of array data elements
+        /// </summary>
+        /// <param name="mode">
+        /// <para>
+        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="count">
+        /// <para>
+        /// Points to an array of the elements counts.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
+        /// </para>
+        /// </param>
+        /// <param name="indices">
+        /// <para>
+        /// Specifies a pointer to the location where the indices are stored.
+        /// </para>
+        /// </param>
+        /// <param name="primcount">
+        /// <para>
+        /// Specifies the size of the count array.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glMultiDrawElements")]
+        public static 
+        unsafe void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount)
+            where T3 : struct
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glMultiDrawElements((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
+            }
+            finally
+            {
+                indices_ptr.Free();
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Render multiple sets of primitives by specifying indices of array data elements
+        /// </summary>
+        /// <param name="mode">
+        /// <para>
+        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="count">
+        /// <para>
+        /// Points to an array of the elements counts.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
+        /// </para>
+        /// </param>
+        /// <param name="indices">
+        /// <para>
+        /// Specifies a pointer to the location where the indices are stored.
+        /// </para>
+        /// </param>
+        /// <param name="primcount">
+        /// <para>
+        /// Specifies the size of the count array.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glMultiDrawElements")]
+        public static 
+        unsafe void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,] indices, Int32 primcount)
+            where T3 : struct
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glMultiDrawElements((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
+            }
+            finally
+            {
+                indices_ptr.Free();
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Render multiple sets of primitives by specifying indices of array data elements
+        /// </summary>
+        /// <param name="mode">
+        /// <para>
+        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="count">
+        /// <para>
+        /// Points to an array of the elements counts.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
+        /// </para>
+        /// </param>
+        /// <param name="indices">
+        /// <para>
+        /// Specifies a pointer to the location where the indices are stored.
+        /// </para>
+        /// </param>
+        /// <param name="primcount">
+        /// <para>
+        /// Specifies the size of the count array.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glMultiDrawElements")]
+        public static 
+        unsafe void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount)
+            where T3 : struct
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glMultiDrawElements((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
+            }
+            finally
+            {
+                indices_ptr.Free();
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Render multiple sets of primitives by specifying indices of array data elements
+        /// </summary>
+        /// <param name="mode">
+        /// <para>
+        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="count">
+        /// <para>
+        /// Points to an array of the elements counts.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
+        /// </para>
+        /// </param>
+        /// <param name="indices">
+        /// <para>
+        /// Specifies a pointer to the location where the indices are stored.
+        /// </para>
+        /// </param>
+        /// <param name="primcount">
+        /// <para>
+        /// Specifies the size of the count array.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glMultiDrawElements")]
+        public static 
+        unsafe void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount)
+            where T3 : struct
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glMultiDrawElements((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
+                indices = (T3)indices_ptr.Target;
+            }
+            finally
+            {
+                indices_ptr.Free();
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
         [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glMultiDrawElementsBaseVertex")]
         public static 
-        void MultiDrawElementsBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount, Int32[] basevertex)
+        void MultiDrawElementsBaseVertex(OpenTK.Graphics.OpenGL.BeginMode mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount, Int32[] basevertex)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Int32* count_ptr = count)
+                fixed (Int32* basevertex_ptr = basevertex)
+                {
+                    Delegates.glMultiDrawElementsBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count_ptr, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount, (Int32*)basevertex_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glMultiDrawElementsBaseVertex")]
+        public static 
+        void MultiDrawElementsBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount, Int32[] basevertex)
             where T3 : struct
         {
             #if DEBUG
@@ -57983,7 +57861,7 @@ namespace OpenTK.Graphics.OpenGL
 
         [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glMultiDrawElementsBaseVertex")]
         public static 
-        void MultiDrawElementsBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount, Int32[] basevertex)
+        void MultiDrawElementsBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount, Int32[] basevertex)
             where T3 : struct
         {
             #if DEBUG
@@ -58013,7 +57891,8 @@ namespace OpenTK.Graphics.OpenGL
 
         [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glMultiDrawElementsBaseVertex")]
         public static 
-        void MultiDrawElementsBaseVertex(OpenTK.Graphics.OpenGL.BeginMode mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount, Int32[] basevertex)
+        void MultiDrawElementsBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount, Int32[] basevertex)
+            where T3 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -58023,28 +57902,6 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Int32* count_ptr = count)
                 fixed (Int32* basevertex_ptr = basevertex)
-                {
-                    Delegates.glMultiDrawElementsBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count_ptr, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount, (Int32*)basevertex_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glMultiDrawElementsBaseVertex")]
-        public static 
-        void MultiDrawElementsBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount, ref Int32 basevertex)
-            where T3 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Int32* count_ptr = &count)
-                fixed (Int32* basevertex_ptr = &basevertex)
                 {
                     GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
                     try
@@ -58065,7 +57922,28 @@ namespace OpenTK.Graphics.OpenGL
 
         [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glMultiDrawElementsBaseVertex")]
         public static 
-        void MultiDrawElementsBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount, ref Int32 basevertex)
+        void MultiDrawElementsBaseVertex(OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount, ref Int32 basevertex)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Int32* count_ptr = &count)
+                fixed (Int32* basevertex_ptr = &basevertex)
+                {
+                    Delegates.glMultiDrawElementsBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count_ptr, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount, (Int32*)basevertex_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glMultiDrawElementsBaseVertex")]
+        public static 
+        void MultiDrawElementsBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount, ref Int32 basevertex)
             where T3 : struct
         {
             #if DEBUG
@@ -58125,7 +58003,7 @@ namespace OpenTK.Graphics.OpenGL
 
         [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glMultiDrawElementsBaseVertex")]
         public static 
-        void MultiDrawElementsBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount, ref Int32 basevertex)
+        void MultiDrawElementsBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount, ref Int32 basevertex)
             where T3 : struct
         {
             #if DEBUG
@@ -58155,7 +58033,8 @@ namespace OpenTK.Graphics.OpenGL
 
         [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glMultiDrawElementsBaseVertex")]
         public static 
-        void MultiDrawElementsBaseVertex(OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount, ref Int32 basevertex)
+        void MultiDrawElementsBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount, ref Int32 basevertex)
+            where T3 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -58166,7 +58045,16 @@ namespace OpenTK.Graphics.OpenGL
                 fixed (Int32* count_ptr = &count)
                 fixed (Int32* basevertex_ptr = &basevertex)
                 {
-                    Delegates.glMultiDrawElementsBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count_ptr, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount, (Int32*)basevertex_ptr);
+                    GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
+                    try
+                    {
+                        Delegates.glMultiDrawElementsBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count_ptr, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount, (Int32*)basevertex_ptr);
+                        indices = (T3)indices_ptr.Target;
+                    }
+                    finally
+                    {
+                        indices_ptr.Free();
+                    }
                 }
             }
             #if DEBUG
@@ -58174,6 +58062,118 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glMultiDrawElementsBaseVertex")]
+        public static 
+        unsafe void MultiDrawElementsBaseVertex(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount, Int32* basevertex)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glMultiDrawElementsBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount, (Int32*)basevertex);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glMultiDrawElementsBaseVertex")]
+        public static 
+        unsafe void MultiDrawElementsBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount, Int32* basevertex)
+            where T3 : struct
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glMultiDrawElementsBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount, (Int32*)basevertex);
+            }
+            finally
+            {
+                indices_ptr.Free();
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glMultiDrawElementsBaseVertex")]
+        public static 
+        unsafe void MultiDrawElementsBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,] indices, Int32 primcount, Int32* basevertex)
+            where T3 : struct
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glMultiDrawElementsBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount, (Int32*)basevertex);
+            }
+            finally
+            {
+                indices_ptr.Free();
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glMultiDrawElementsBaseVertex")]
+        public static 
+        unsafe void MultiDrawElementsBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount, Int32* basevertex)
+            where T3 : struct
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glMultiDrawElementsBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount, (Int32*)basevertex);
+            }
+            finally
+            {
+                indices_ptr.Free();
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "ArbDrawElementsBaseVertex", Version = "1.2", EntryPoint = "glMultiDrawElementsBaseVertex")]
+        public static 
+        unsafe void MultiDrawElementsBaseVertex<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount, Int32* basevertex)
+            where T3 : struct
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glMultiDrawElementsBaseVertex((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount, (Int32*)basevertex);
+                indices = (T3)indices_ptr.Target;
+            }
+            finally
+            {
+                indices_ptr.Free();
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
         
         /// <summary>
         /// Set the current texture coordinates
@@ -58431,35 +58431,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current texture coordinates
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the texture unit whose coordinates should be modified. The number of texture units is implementation dependent, but must be at least two. Symbolic constant must be one of GL_TEXTURE, where i ranges from 0 to GL_MAX_TEXTURE_COORDS - 1, which is an implementation-dependent value.
-        /// </para>
-        /// </param>
-        /// <param name="s">
-        /// <para>
-        /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord2dv")]
-        public static 
-        unsafe void MultiTexCoord2(OpenTK.Graphics.OpenGL.TextureUnit target, Double* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glMultiTexCoord2dv((OpenTK.Graphics.OpenGL.TextureUnit)target, (Double*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -58528,6 +58499,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the current texture coordinates
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the texture unit whose coordinates should be modified. The number of texture units is implementation dependent, but must be at least two. Symbolic constant must be one of GL_TEXTURE, where i ranges from 0 to GL_MAX_TEXTURE_COORDS - 1, which is an implementation-dependent value.
+        /// </para>
+        /// </param>
+        /// <param name="s">
+        /// <para>
+        /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord2dv")]
+        public static 
+        unsafe void MultiTexCoord2(OpenTK.Graphics.OpenGL.TextureUnit target, Double* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glMultiTexCoord2dv((OpenTK.Graphics.OpenGL.TextureUnit)target, (Double*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -58556,6 +58556,40 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the current texture coordinates
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the texture unit whose coordinates should be modified. The number of texture units is implementation dependent, but must be at least two. Symbolic constant must be one of GL_TEXTURE, where i ranges from 0 to GL_MAX_TEXTURE_COORDS - 1, which is an implementation-dependent value.
+        /// </para>
+        /// </param>
+        /// <param name="s">
+        /// <para>
+        /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord2fv")]
+        public static 
+        void MultiTexCoord2(OpenTK.Graphics.OpenGL.TextureUnit target, Single[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* v_ptr = v)
+                {
+                    Delegates.glMultiTexCoord2fv((OpenTK.Graphics.OpenGL.TextureUnit)target, (Single*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -58619,40 +58653,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current texture coordinates
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the texture unit whose coordinates should be modified. The number of texture units is implementation dependent, but must be at least two. Symbolic constant must be one of GL_TEXTURE, where i ranges from 0 to GL_MAX_TEXTURE_COORDS - 1, which is an implementation-dependent value.
-        /// </para>
-        /// </param>
-        /// <param name="s">
-        /// <para>
-        /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord2fv")]
-        public static 
-        void MultiTexCoord2(OpenTK.Graphics.OpenGL.TextureUnit target, Single[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* v_ptr = v)
-                {
-                    Delegates.glMultiTexCoord2fv((OpenTK.Graphics.OpenGL.TextureUnit)target, (Single*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -58681,35 +58681,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current texture coordinates
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the texture unit whose coordinates should be modified. The number of texture units is implementation dependent, but must be at least two. Symbolic constant must be one of GL_TEXTURE, where i ranges from 0 to GL_MAX_TEXTURE_COORDS - 1, which is an implementation-dependent value.
-        /// </para>
-        /// </param>
-        /// <param name="s">
-        /// <para>
-        /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord2iv")]
-        public static 
-        unsafe void MultiTexCoord2(OpenTK.Graphics.OpenGL.TextureUnit target, Int32* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glMultiTexCoord2iv((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int32*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -58791,15 +58762,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord2s")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord2iv")]
         public static 
-        void MultiTexCoord2(OpenTK.Graphics.OpenGL.TextureUnit target, Int16 s, Int16 t)
+        unsafe void MultiTexCoord2(OpenTK.Graphics.OpenGL.TextureUnit target, Int32* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glMultiTexCoord2s((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int16)s, (Int16)t);
+            Delegates.glMultiTexCoord2iv((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int32*)v);
             #if DEBUG
             }
             #endif
@@ -58819,16 +58791,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord2sv")]
+        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord2s")]
         public static 
-        unsafe void MultiTexCoord2(OpenTK.Graphics.OpenGL.TextureUnit target, Int16* v)
+        void MultiTexCoord2(OpenTK.Graphics.OpenGL.TextureUnit target, Int16 s, Int16 t)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glMultiTexCoord2sv((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int16*)v);
+            Delegates.glMultiTexCoord2s((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int16)s, (Int16)t);
             #if DEBUG
             }
             #endif
@@ -58916,15 +58887,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord3d")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord2sv")]
         public static 
-        void MultiTexCoord3(OpenTK.Graphics.OpenGL.TextureUnit target, Double s, Double t, Double r)
+        unsafe void MultiTexCoord2(OpenTK.Graphics.OpenGL.TextureUnit target, Int16* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glMultiTexCoord3d((OpenTK.Graphics.OpenGL.TextureUnit)target, (Double)s, (Double)t, (Double)r);
+            Delegates.glMultiTexCoord2sv((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int16*)v);
             #if DEBUG
             }
             #endif
@@ -58944,16 +58916,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord3dv")]
+        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord3d")]
         public static 
-        unsafe void MultiTexCoord3(OpenTK.Graphics.OpenGL.TextureUnit target, Double* v)
+        void MultiTexCoord3(OpenTK.Graphics.OpenGL.TextureUnit target, Double s, Double t, Double r)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glMultiTexCoord3dv((OpenTK.Graphics.OpenGL.TextureUnit)target, (Double*)v);
+            Delegates.glMultiTexCoord3d((OpenTK.Graphics.OpenGL.TextureUnit)target, (Double)s, (Double)t, (Double)r);
             #if DEBUG
             }
             #endif
@@ -59028,6 +58999,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the current texture coordinates
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the texture unit whose coordinates should be modified. The number of texture units is implementation dependent, but must be at least two. Symbolic constant must be one of GL_TEXTURE, where i ranges from 0 to GL_MAX_TEXTURE_COORDS - 1, which is an implementation-dependent value.
+        /// </para>
+        /// </param>
+        /// <param name="s">
+        /// <para>
+        /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord3dv")]
+        public static 
+        unsafe void MultiTexCoord3(OpenTK.Graphics.OpenGL.TextureUnit target, Double* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glMultiTexCoord3dv((OpenTK.Graphics.OpenGL.TextureUnit)target, (Double*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -59056,6 +59056,40 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the current texture coordinates
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the texture unit whose coordinates should be modified. The number of texture units is implementation dependent, but must be at least two. Symbolic constant must be one of GL_TEXTURE, where i ranges from 0 to GL_MAX_TEXTURE_COORDS - 1, which is an implementation-dependent value.
+        /// </para>
+        /// </param>
+        /// <param name="s">
+        /// <para>
+        /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord3fv")]
+        public static 
+        void MultiTexCoord3(OpenTK.Graphics.OpenGL.TextureUnit target, Single[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* v_ptr = v)
+                {
+                    Delegates.glMultiTexCoord3fv((OpenTK.Graphics.OpenGL.TextureUnit)target, (Single*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -59119,40 +59153,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current texture coordinates
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the texture unit whose coordinates should be modified. The number of texture units is implementation dependent, but must be at least two. Symbolic constant must be one of GL_TEXTURE, where i ranges from 0 to GL_MAX_TEXTURE_COORDS - 1, which is an implementation-dependent value.
-        /// </para>
-        /// </param>
-        /// <param name="s">
-        /// <para>
-        /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord3fv")]
-        public static 
-        void MultiTexCoord3(OpenTK.Graphics.OpenGL.TextureUnit target, Single[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* v_ptr = v)
-                {
-                    Delegates.glMultiTexCoord3fv((OpenTK.Graphics.OpenGL.TextureUnit)target, (Single*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -59181,35 +59181,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current texture coordinates
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the texture unit whose coordinates should be modified. The number of texture units is implementation dependent, but must be at least two. Symbolic constant must be one of GL_TEXTURE, where i ranges from 0 to GL_MAX_TEXTURE_COORDS - 1, which is an implementation-dependent value.
-        /// </para>
-        /// </param>
-        /// <param name="s">
-        /// <para>
-        /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord3iv")]
-        public static 
-        unsafe void MultiTexCoord3(OpenTK.Graphics.OpenGL.TextureUnit target, Int32* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glMultiTexCoord3iv((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int32*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -59291,15 +59262,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord3s")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord3iv")]
         public static 
-        void MultiTexCoord3(OpenTK.Graphics.OpenGL.TextureUnit target, Int16 s, Int16 t, Int16 r)
+        unsafe void MultiTexCoord3(OpenTK.Graphics.OpenGL.TextureUnit target, Int32* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glMultiTexCoord3s((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int16)s, (Int16)t, (Int16)r);
+            Delegates.glMultiTexCoord3iv((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int32*)v);
             #if DEBUG
             }
             #endif
@@ -59319,16 +59291,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord3sv")]
+        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord3s")]
         public static 
-        unsafe void MultiTexCoord3(OpenTK.Graphics.OpenGL.TextureUnit target, Int16* v)
+        void MultiTexCoord3(OpenTK.Graphics.OpenGL.TextureUnit target, Int16 s, Int16 t, Int16 r)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glMultiTexCoord3sv((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int16*)v);
+            Delegates.glMultiTexCoord3s((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int16)s, (Int16)t, (Int16)r);
             #if DEBUG
             }
             #endif
@@ -59416,15 +59387,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord4d")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord3sv")]
         public static 
-        void MultiTexCoord4(OpenTK.Graphics.OpenGL.TextureUnit target, Double s, Double t, Double r, Double q)
+        unsafe void MultiTexCoord3(OpenTK.Graphics.OpenGL.TextureUnit target, Int16* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glMultiTexCoord4d((OpenTK.Graphics.OpenGL.TextureUnit)target, (Double)s, (Double)t, (Double)r, (Double)q);
+            Delegates.glMultiTexCoord3sv((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int16*)v);
             #if DEBUG
             }
             #endif
@@ -59444,16 +59416,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord4dv")]
+        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord4d")]
         public static 
-        unsafe void MultiTexCoord4(OpenTK.Graphics.OpenGL.TextureUnit target, Double* v)
+        void MultiTexCoord4(OpenTK.Graphics.OpenGL.TextureUnit target, Double s, Double t, Double r, Double q)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glMultiTexCoord4dv((OpenTK.Graphics.OpenGL.TextureUnit)target, (Double*)v);
+            Delegates.glMultiTexCoord4d((OpenTK.Graphics.OpenGL.TextureUnit)target, (Double)s, (Double)t, (Double)r, (Double)q);
             #if DEBUG
             }
             #endif
@@ -59528,6 +59499,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the current texture coordinates
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the texture unit whose coordinates should be modified. The number of texture units is implementation dependent, but must be at least two. Symbolic constant must be one of GL_TEXTURE, where i ranges from 0 to GL_MAX_TEXTURE_COORDS - 1, which is an implementation-dependent value.
+        /// </para>
+        /// </param>
+        /// <param name="s">
+        /// <para>
+        /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord4dv")]
+        public static 
+        unsafe void MultiTexCoord4(OpenTK.Graphics.OpenGL.TextureUnit target, Double* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glMultiTexCoord4dv((OpenTK.Graphics.OpenGL.TextureUnit)target, (Double*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -59556,6 +59556,40 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the current texture coordinates
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the texture unit whose coordinates should be modified. The number of texture units is implementation dependent, but must be at least two. Symbolic constant must be one of GL_TEXTURE, where i ranges from 0 to GL_MAX_TEXTURE_COORDS - 1, which is an implementation-dependent value.
+        /// </para>
+        /// </param>
+        /// <param name="s">
+        /// <para>
+        /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord4fv")]
+        public static 
+        void MultiTexCoord4(OpenTK.Graphics.OpenGL.TextureUnit target, Single[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* v_ptr = v)
+                {
+                    Delegates.glMultiTexCoord4fv((OpenTK.Graphics.OpenGL.TextureUnit)target, (Single*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -59619,40 +59653,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current texture coordinates
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the texture unit whose coordinates should be modified. The number of texture units is implementation dependent, but must be at least two. Symbolic constant must be one of GL_TEXTURE, where i ranges from 0 to GL_MAX_TEXTURE_COORDS - 1, which is an implementation-dependent value.
-        /// </para>
-        /// </param>
-        /// <param name="s">
-        /// <para>
-        /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord4fv")]
-        public static 
-        void MultiTexCoord4(OpenTK.Graphics.OpenGL.TextureUnit target, Single[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* v_ptr = v)
-                {
-                    Delegates.glMultiTexCoord4fv((OpenTK.Graphics.OpenGL.TextureUnit)target, (Single*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -59681,35 +59681,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current texture coordinates
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the texture unit whose coordinates should be modified. The number of texture units is implementation dependent, but must be at least two. Symbolic constant must be one of GL_TEXTURE, where i ranges from 0 to GL_MAX_TEXTURE_COORDS - 1, which is an implementation-dependent value.
-        /// </para>
-        /// </param>
-        /// <param name="s">
-        /// <para>
-        /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord4iv")]
-        public static 
-        unsafe void MultiTexCoord4(OpenTK.Graphics.OpenGL.TextureUnit target, Int32* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glMultiTexCoord4iv((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int32*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -59791,15 +59762,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord4s")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord4iv")]
         public static 
-        void MultiTexCoord4(OpenTK.Graphics.OpenGL.TextureUnit target, Int16 s, Int16 t, Int16 r, Int16 q)
+        unsafe void MultiTexCoord4(OpenTK.Graphics.OpenGL.TextureUnit target, Int32* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glMultiTexCoord4s((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int16)s, (Int16)t, (Int16)r, (Int16)q);
+            Delegates.glMultiTexCoord4iv((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int32*)v);
             #if DEBUG
             }
             #endif
@@ -59819,16 +59791,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord4sv")]
+        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord4s")]
         public static 
-        unsafe void MultiTexCoord4(OpenTK.Graphics.OpenGL.TextureUnit target, Int16* v)
+        void MultiTexCoord4(OpenTK.Graphics.OpenGL.TextureUnit target, Int16 s, Int16 t, Int16 r, Int16 q)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glMultiTexCoord4sv((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int16*)v);
+            Delegates.glMultiTexCoord4s((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int16)s, (Int16)t, (Int16)r, (Int16)q);
             #if DEBUG
             }
             #endif
@@ -59904,23 +59875,28 @@ namespace OpenTK.Graphics.OpenGL
 
         
         /// <summary>
-        /// Multiply the current matrix with the specified matrix
+        /// Set the current texture coordinates
         /// </summary>
-        /// <param name="m">
+        /// <param name="target">
         /// <para>
-        /// Points to 16 consecutive values that are used as the elements of a 4 times 4 column-major matrix.
+        /// Specifies the texture unit whose coordinates should be modified. The number of texture units is implementation dependent, but must be at least two. Symbolic constant must be one of GL_TEXTURE, where i ranges from 0 to GL_MAX_TEXTURE_COORDS - 1, which is an implementation-dependent value.
+        /// </para>
+        /// </param>
+        /// <param name="s">
+        /// <para>
+        /// Specify s, t, r, and q texture coordinates for target texture unit. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glMultMatrixd")]
+        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultiTexCoord4sv")]
         public static 
-        unsafe void MultMatrix(Double* m)
+        unsafe void MultiTexCoord4(OpenTK.Graphics.OpenGL.TextureUnit target, Int16* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glMultMatrixd((Double*)m);
+            Delegates.glMultiTexCoord4sv((OpenTK.Graphics.OpenGL.TextureUnit)target, (Int16*)v);
             #if DEBUG
             }
             #endif
@@ -59985,6 +59961,59 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Multiply the current matrix with the specified matrix
+        /// </summary>
+        /// <param name="m">
+        /// <para>
+        /// Points to 16 consecutive values that are used as the elements of a 4 times 4 column-major matrix.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glMultMatrixd")]
+        public static 
+        unsafe void MultMatrix(Double* m)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glMultMatrixd((Double*)m);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Multiply the current matrix with the specified matrix
+        /// </summary>
+        /// <param name="m">
+        /// <para>
+        /// Points to 16 consecutive values that are used as the elements of a 4 times 4 column-major matrix.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glMultMatrixf")]
+        public static 
+        void MultMatrix(Single[] m)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* m_ptr = m)
+                {
+                    Delegates.glMultMatrixf((Single*)m_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Multiply the current matrix with the specified matrix
         /// </summary>
@@ -60038,59 +60067,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Multiply the current matrix with the specified matrix
-        /// </summary>
-        /// <param name="m">
-        /// <para>
-        /// Points to 16 consecutive values that are used as the elements of a 4 times 4 column-major matrix.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glMultMatrixf")]
-        public static 
-        void MultMatrix(Single[] m)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* m_ptr = m)
-                {
-                    Delegates.glMultMatrixf((Single*)m_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Multiply the current matrix with the specified row-major ordered matrix
-        /// </summary>
-        /// <param name="m">
-        /// <para>
-        /// Points to 16 consecutive values that are used as the elements of a 4 times 4 row-major matrix.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultTransposeMatrixd")]
-        public static 
-        unsafe void MultTransposeMatrix(Double* m)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glMultTransposeMatrixd((Double*)m);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Multiply the current matrix with the specified row-major ordered matrix
         /// </summary>
@@ -60149,6 +60125,59 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Multiply the current matrix with the specified row-major ordered matrix
+        /// </summary>
+        /// <param name="m">
+        /// <para>
+        /// Points to 16 consecutive values that are used as the elements of a 4 times 4 row-major matrix.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultTransposeMatrixd")]
+        public static 
+        unsafe void MultTransposeMatrix(Double* m)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glMultTransposeMatrixd((Double*)m);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Multiply the current matrix with the specified row-major ordered matrix
+        /// </summary>
+        /// <param name="m">
+        /// <para>
+        /// Points to 16 consecutive values that are used as the elements of a 4 times 4 row-major matrix.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultTransposeMatrixf")]
+        public static 
+        void MultTransposeMatrix(Single[] m)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* m_ptr = m)
+                {
+                    Delegates.glMultTransposeMatrixf((Single*)m_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Multiply the current matrix with the specified row-major ordered matrix
         /// </summary>
@@ -60202,35 +60231,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Multiply the current matrix with the specified row-major ordered matrix
-        /// </summary>
-        /// <param name="m">
-        /// <para>
-        /// Points to 16 consecutive values that are used as the elements of a 4 times 4 row-major matrix.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version13Deprecated", Version = "1.3", EntryPoint = "glMultTransposeMatrixf")]
-        public static 
-        void MultTransposeMatrix(Single[] m)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* m_ptr = m)
-                {
-                    Delegates.glMultTransposeMatrixf((Single*)m_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Create or replace a display list
         /// </summary>
@@ -60341,33 +60341,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current normal vector
-        /// </summary>
-        /// <param name="nx">
-        /// <para>
-        /// Specify the , , and coordinates of the new current normal. The initial value of the current normal is the unit vector, (0, 0, 1).
-        /// </para>
-        /// <para>
-        /// 
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glNormal3bv")]
-        public static 
-        unsafe void Normal3(Byte* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glNormal3bv((SByte*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current normal vector
         /// </summary>
@@ -60432,6 +60405,66 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the current normal vector
+        /// </summary>
+        /// <param name="nx">
+        /// <para>
+        /// Specify the , , and coordinates of the new current normal. The initial value of the current normal is the unit vector, (0, 0, 1).
+        /// </para>
+        /// <para>
+        /// 
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glNormal3bv")]
+        public static 
+        unsafe void Normal3(Byte* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glNormal3bv((SByte*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Set the current normal vector
+        /// </summary>
+        /// <param name="nx">
+        /// <para>
+        /// Specify the , , and coordinates of the new current normal. The initial value of the current normal is the unit vector, (0, 0, 1).
+        /// </para>
+        /// <para>
+        /// 
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glNormal3bv")]
+        public static 
+        void Normal3(SByte[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (SByte* v_ptr = v)
+                {
+                    Delegates.glNormal3bv((SByte*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current normal vector
         /// </summary>
@@ -60492,39 +60525,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current normal vector
-        /// </summary>
-        /// <param name="nx">
-        /// <para>
-        /// Specify the , , and coordinates of the new current normal. The initial value of the current normal is the unit vector, (0, 0, 1).
-        /// </para>
-        /// <para>
-        /// 
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glNormal3bv")]
-        public static 
-        void Normal3(SByte[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (SByte* v_ptr = v)
-                {
-                    Delegates.glNormal3bv((SByte*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current normal vector
         /// </summary>
@@ -60551,33 +60551,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current normal vector
-        /// </summary>
-        /// <param name="nx">
-        /// <para>
-        /// Specify the , , and coordinates of the new current normal. The initial value of the current normal is the unit vector, (0, 0, 1).
-        /// </para>
-        /// <para>
-        /// 
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glNormal3dv")]
-        public static 
-        unsafe void Normal3(Double* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glNormal3dv((Double*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current normal vector
         /// </summary>
@@ -60642,6 +60615,33 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the current normal vector
+        /// </summary>
+        /// <param name="nx">
+        /// <para>
+        /// Specify the , , and coordinates of the new current normal. The initial value of the current normal is the unit vector, (0, 0, 1).
+        /// </para>
+        /// <para>
+        /// 
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glNormal3dv")]
+        public static 
+        unsafe void Normal3(Double* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glNormal3dv((Double*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current normal vector
         /// </summary>
@@ -60668,6 +60668,38 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the current normal vector
+        /// </summary>
+        /// <param name="nx">
+        /// <para>
+        /// Specify the , , and coordinates of the new current normal. The initial value of the current normal is the unit vector, (0, 0, 1).
+        /// </para>
+        /// <para>
+        /// 
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glNormal3fv")]
+        public static 
+        void Normal3(Single[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* v_ptr = v)
+                {
+                    Delegates.glNormal3fv((Single*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current normal vector
         /// </summary>
@@ -60727,38 +60759,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current normal vector
-        /// </summary>
-        /// <param name="nx">
-        /// <para>
-        /// Specify the , , and coordinates of the new current normal. The initial value of the current normal is the unit vector, (0, 0, 1).
-        /// </para>
-        /// <para>
-        /// 
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glNormal3fv")]
-        public static 
-        void Normal3(Single[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* v_ptr = v)
-                {
-                    Delegates.glNormal3fv((Single*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current normal vector
         /// </summary>
@@ -60785,33 +60785,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current normal vector
-        /// </summary>
-        /// <param name="nx">
-        /// <para>
-        /// Specify the , , and coordinates of the new current normal. The initial value of the current normal is the unit vector, (0, 0, 1).
-        /// </para>
-        /// <para>
-        /// 
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glNormal3iv")]
-        public static 
-        unsafe void Normal3(Int32* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glNormal3iv((Int32*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current normal vector
         /// </summary>
@@ -60887,15 +60860,16 @@ namespace OpenTK.Graphics.OpenGL
         /// 
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glNormal3s")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glNormal3iv")]
         public static 
-        void Normal3(Int16 nx, Int16 ny, Int16 nz)
+        unsafe void Normal3(Int32* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glNormal3s((Int16)nx, (Int16)ny, (Int16)nz);
+            Delegates.glNormal3iv((Int32*)v);
             #if DEBUG
             }
             #endif
@@ -60913,16 +60887,15 @@ namespace OpenTK.Graphics.OpenGL
         /// 
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glNormal3sv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glNormal3s")]
         public static 
-        unsafe void Normal3(Int16* v)
+        void Normal3(Int16 nx, Int16 ny, Int16 nz)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glNormal3sv((Int16*)v);
+            Delegates.glNormal3s((Int16)nx, (Int16)ny, (Int16)nz);
             #if DEBUG
             }
             #endif
@@ -60994,42 +60967,26 @@ namespace OpenTK.Graphics.OpenGL
 
         
         /// <summary>
-        /// Define an array of normals
+        /// Set the current normal vector
         /// </summary>
-        /// <param name="type">
+        /// <param name="nx">
         /// <para>
-        /// Specifies the data type of each coordinate in the array. Symbolic constants GL_BYTE, GL_SHORT, GL_INT, GL_FLOAT, and GL_DOUBLE are accepted. The initial value is GL_FLOAT.
+        /// Specify the , , and coordinates of the new current normal. The initial value of the current normal is the unit vector, (0, 0, 1).
+        /// </para>
+        /// <para>
+        /// 
         /// </para>
         /// </param>
-        /// <param name="stride">
-        /// <para>
-        /// Specifies the byte offset between consecutive normals. If stride is 0, the normals are understood to be tightly packed in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-        /// <param name="pointer">
-        /// <para>
-        /// Specifies a pointer to the first coordinate of the first normal in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glNormalPointer")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glNormal3sv")]
         public static 
-        void NormalPointer<T2>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T2 pointer)
-            where T2 : struct
+        unsafe void Normal3(Int16* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glNormalPointer((OpenTK.Graphics.OpenGL.NormalPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                pointer = (T2)pointer_ptr.Target;
-            }
-            finally
-            {
-                pointer_ptr.Free();
-            }
+            Delegates.glNormal3sv((Int16*)v);
             #if DEBUG
             }
             #endif
@@ -61056,7 +61013,40 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glNormalPointer")]
         public static 
-        void NormalPointer<T2>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, [InAttribute, OutAttribute] T2[,,] pointer)
+        void NormalPointer(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, IntPtr pointer)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glNormalPointer((OpenTK.Graphics.OpenGL.NormalPointerType)type, (Int32)stride, (IntPtr)pointer);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Define an array of normals
+        /// </summary>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the data type of each coordinate in the array. Symbolic constants GL_BYTE, GL_SHORT, GL_INT, GL_FLOAT, and GL_DOUBLE are accepted. The initial value is GL_FLOAT.
+        /// </para>
+        /// </param>
+        /// <param name="stride">
+        /// <para>
+        /// Specifies the byte offset between consecutive normals. If stride is 0, the normals are understood to be tightly packed in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+        /// <param name="pointer">
+        /// <para>
+        /// Specifies a pointer to the first coordinate of the first normal in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glNormalPointer")]
+        public static 
+        void NormalPointer<T2>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, [InAttribute, OutAttribute] T2[] pointer)
             where T2 : struct
         {
             #if DEBUG
@@ -61140,7 +61130,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glNormalPointer")]
         public static 
-        void NormalPointer<T2>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, [InAttribute, OutAttribute] T2[] pointer)
+        void NormalPointer<T2>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, [InAttribute, OutAttribute] T2[,,] pointer)
             where T2 : struct
         {
             #if DEBUG
@@ -61182,13 +61172,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glNormalPointer")]
         public static 
-        void NormalPointer(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, IntPtr pointer)
+        void NormalPointer<T2>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T2 pointer)
+            where T2 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glNormalPointer((OpenTK.Graphics.OpenGL.NormalPointerType)type, (Int32)stride, (IntPtr)pointer);
+            GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glNormalPointer((OpenTK.Graphics.OpenGL.NormalPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                pointer = (T2)pointer_ptr.Target;
+            }
+            finally
+            {
+                pointer_ptr.Free();
+            }
             #if DEBUG
             }
             #endif
@@ -61251,6 +61251,45 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set up pixel transfer maps
+        /// </summary>
+        /// <param name="map">
+        /// <para>
+        /// Specifies a symbolic map name. Must be one of the following: GL_PIXEL_MAP_I_TO_I, GL_PIXEL_MAP_S_TO_S, GL_PIXEL_MAP_I_TO_R, GL_PIXEL_MAP_I_TO_G, GL_PIXEL_MAP_I_TO_B, GL_PIXEL_MAP_I_TO_A, GL_PIXEL_MAP_R_TO_R, GL_PIXEL_MAP_G_TO_G, GL_PIXEL_MAP_B_TO_B, or GL_PIXEL_MAP_A_TO_A.
+        /// </para>
+        /// </param>
+        /// <param name="mapsize">
+        /// <para>
+        /// Specifies the size of the map being defined.
+        /// </para>
+        /// </param>
+        /// <param name="values">
+        /// <para>
+        /// Specifies an array of mapsize values.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glPixelMapfv")]
+        public static 
+        void PixelMap(OpenTK.Graphics.OpenGL.PixelMap map, Int32 mapsize, Single[] values)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* values_ptr = values)
+                {
+                    Delegates.glPixelMapfv((OpenTK.Graphics.OpenGL.PixelMap)map, (Int32)mapsize, (Single*)values_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set up pixel transfer maps
         /// </summary>
@@ -61324,79 +61363,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set up pixel transfer maps
-        /// </summary>
-        /// <param name="map">
-        /// <para>
-        /// Specifies a symbolic map name. Must be one of the following: GL_PIXEL_MAP_I_TO_I, GL_PIXEL_MAP_S_TO_S, GL_PIXEL_MAP_I_TO_R, GL_PIXEL_MAP_I_TO_G, GL_PIXEL_MAP_I_TO_B, GL_PIXEL_MAP_I_TO_A, GL_PIXEL_MAP_R_TO_R, GL_PIXEL_MAP_G_TO_G, GL_PIXEL_MAP_B_TO_B, or GL_PIXEL_MAP_A_TO_A.
-        /// </para>
-        /// </param>
-        /// <param name="mapsize">
-        /// <para>
-        /// Specifies the size of the map being defined.
-        /// </para>
-        /// </param>
-        /// <param name="values">
-        /// <para>
-        /// Specifies an array of mapsize values.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glPixelMapfv")]
-        public static 
-        void PixelMap(OpenTK.Graphics.OpenGL.PixelMap map, Int32 mapsize, Single[] values)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* values_ptr = values)
-                {
-                    Delegates.glPixelMapfv((OpenTK.Graphics.OpenGL.PixelMap)map, (Int32)mapsize, (Single*)values_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Set up pixel transfer maps
-        /// </summary>
-        /// <param name="map">
-        /// <para>
-        /// Specifies a symbolic map name. Must be one of the following: GL_PIXEL_MAP_I_TO_I, GL_PIXEL_MAP_S_TO_S, GL_PIXEL_MAP_I_TO_R, GL_PIXEL_MAP_I_TO_G, GL_PIXEL_MAP_I_TO_B, GL_PIXEL_MAP_I_TO_A, GL_PIXEL_MAP_R_TO_R, GL_PIXEL_MAP_G_TO_G, GL_PIXEL_MAP_B_TO_B, or GL_PIXEL_MAP_A_TO_A.
-        /// </para>
-        /// </param>
-        /// <param name="mapsize">
-        /// <para>
-        /// Specifies the size of the map being defined.
-        /// </para>
-        /// </param>
-        /// <param name="values">
-        /// <para>
-        /// Specifies an array of mapsize values.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glPixelMapuiv")]
-        public static 
-        unsafe void PixelMap(OpenTK.Graphics.OpenGL.PixelMap map, Int32 mapsize, Int32* values)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glPixelMapuiv((OpenTK.Graphics.OpenGL.PixelMap)map, (Int32)mapsize, (UInt32*)values);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set up pixel transfer maps
         /// </summary>
@@ -61496,47 +61462,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glPixelMapuiv")]
         public static 
-        void PixelMap(OpenTK.Graphics.OpenGL.PixelMap map, Int32 mapsize, ref UInt32 values)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* values_ptr = &values)
-                {
-                    Delegates.glPixelMapuiv((OpenTK.Graphics.OpenGL.PixelMap)map, (Int32)mapsize, (UInt32*)values_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Set up pixel transfer maps
-        /// </summary>
-        /// <param name="map">
-        /// <para>
-        /// Specifies a symbolic map name. Must be one of the following: GL_PIXEL_MAP_I_TO_I, GL_PIXEL_MAP_S_TO_S, GL_PIXEL_MAP_I_TO_R, GL_PIXEL_MAP_I_TO_G, GL_PIXEL_MAP_I_TO_B, GL_PIXEL_MAP_I_TO_A, GL_PIXEL_MAP_R_TO_R, GL_PIXEL_MAP_G_TO_G, GL_PIXEL_MAP_B_TO_B, or GL_PIXEL_MAP_A_TO_A.
-        /// </para>
-        /// </param>
-        /// <param name="mapsize">
-        /// <para>
-        /// Specifies the size of the map being defined.
-        /// </para>
-        /// </param>
-        /// <param name="values">
-        /// <para>
-        /// Specifies an array of mapsize values.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glPixelMapuiv")]
-        public static 
-        unsafe void PixelMap(OpenTK.Graphics.OpenGL.PixelMap map, Int32 mapsize, UInt32* values)
+        unsafe void PixelMap(OpenTK.Graphics.OpenGL.PixelMap map, Int32 mapsize, Int32* values)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -61608,15 +61534,55 @@ namespace OpenTK.Graphics.OpenGL
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glPixelMapusv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glPixelMapuiv")]
         public static 
-        unsafe void PixelMap(OpenTK.Graphics.OpenGL.PixelMap map, Int32 mapsize, Int16* values)
+        void PixelMap(OpenTK.Graphics.OpenGL.PixelMap map, Int32 mapsize, ref UInt32 values)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glPixelMapusv((OpenTK.Graphics.OpenGL.PixelMap)map, (Int32)mapsize, (UInt16*)values);
+            unsafe
+            {
+                fixed (UInt32* values_ptr = &values)
+                {
+                    Delegates.glPixelMapuiv((OpenTK.Graphics.OpenGL.PixelMap)map, (Int32)mapsize, (UInt32*)values_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Set up pixel transfer maps
+        /// </summary>
+        /// <param name="map">
+        /// <para>
+        /// Specifies a symbolic map name. Must be one of the following: GL_PIXEL_MAP_I_TO_I, GL_PIXEL_MAP_S_TO_S, GL_PIXEL_MAP_I_TO_R, GL_PIXEL_MAP_I_TO_G, GL_PIXEL_MAP_I_TO_B, GL_PIXEL_MAP_I_TO_A, GL_PIXEL_MAP_R_TO_R, GL_PIXEL_MAP_G_TO_G, GL_PIXEL_MAP_B_TO_B, or GL_PIXEL_MAP_A_TO_A.
+        /// </para>
+        /// </param>
+        /// <param name="mapsize">
+        /// <para>
+        /// Specifies the size of the map being defined.
+        /// </para>
+        /// </param>
+        /// <param name="values">
+        /// <para>
+        /// Specifies an array of mapsize values.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glPixelMapuiv")]
+        public static 
+        unsafe void PixelMap(OpenTK.Graphics.OpenGL.PixelMap map, Int32 mapsize, UInt32* values)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glPixelMapuiv((OpenTK.Graphics.OpenGL.PixelMap)map, (Int32)mapsize, (UInt32*)values);
             #if DEBUG
             }
             #endif
@@ -61701,6 +61667,80 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set up pixel transfer maps
+        /// </summary>
+        /// <param name="map">
+        /// <para>
+        /// Specifies a symbolic map name. Must be one of the following: GL_PIXEL_MAP_I_TO_I, GL_PIXEL_MAP_S_TO_S, GL_PIXEL_MAP_I_TO_R, GL_PIXEL_MAP_I_TO_G, GL_PIXEL_MAP_I_TO_B, GL_PIXEL_MAP_I_TO_A, GL_PIXEL_MAP_R_TO_R, GL_PIXEL_MAP_G_TO_G, GL_PIXEL_MAP_B_TO_B, or GL_PIXEL_MAP_A_TO_A.
+        /// </para>
+        /// </param>
+        /// <param name="mapsize">
+        /// <para>
+        /// Specifies the size of the map being defined.
+        /// </para>
+        /// </param>
+        /// <param name="values">
+        /// <para>
+        /// Specifies an array of mapsize values.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glPixelMapusv")]
+        public static 
+        unsafe void PixelMap(OpenTK.Graphics.OpenGL.PixelMap map, Int32 mapsize, Int16* values)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glPixelMapusv((OpenTK.Graphics.OpenGL.PixelMap)map, (Int32)mapsize, (UInt16*)values);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Set up pixel transfer maps
+        /// </summary>
+        /// <param name="map">
+        /// <para>
+        /// Specifies a symbolic map name. Must be one of the following: GL_PIXEL_MAP_I_TO_I, GL_PIXEL_MAP_S_TO_S, GL_PIXEL_MAP_I_TO_R, GL_PIXEL_MAP_I_TO_G, GL_PIXEL_MAP_I_TO_B, GL_PIXEL_MAP_I_TO_A, GL_PIXEL_MAP_R_TO_R, GL_PIXEL_MAP_G_TO_G, GL_PIXEL_MAP_B_TO_B, or GL_PIXEL_MAP_A_TO_A.
+        /// </para>
+        /// </param>
+        /// <param name="mapsize">
+        /// <para>
+        /// Specifies the size of the map being defined.
+        /// </para>
+        /// </param>
+        /// <param name="values">
+        /// <para>
+        /// Specifies an array of mapsize values.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glPixelMapusv")]
+        public static 
+        void PixelMap(OpenTK.Graphics.OpenGL.PixelMap map, Int32 mapsize, UInt16[] values)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt16* values_ptr = values)
+                {
+                    Delegates.glPixelMapusv((OpenTK.Graphics.OpenGL.PixelMap)map, (Int32)mapsize, (UInt16*)values_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set up pixel transfer maps
         /// </summary>
@@ -61775,46 +61815,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set up pixel transfer maps
-        /// </summary>
-        /// <param name="map">
-        /// <para>
-        /// Specifies a symbolic map name. Must be one of the following: GL_PIXEL_MAP_I_TO_I, GL_PIXEL_MAP_S_TO_S, GL_PIXEL_MAP_I_TO_R, GL_PIXEL_MAP_I_TO_G, GL_PIXEL_MAP_I_TO_B, GL_PIXEL_MAP_I_TO_A, GL_PIXEL_MAP_R_TO_R, GL_PIXEL_MAP_G_TO_G, GL_PIXEL_MAP_B_TO_B, or GL_PIXEL_MAP_A_TO_A.
-        /// </para>
-        /// </param>
-        /// <param name="mapsize">
-        /// <para>
-        /// Specifies the size of the map being defined.
-        /// </para>
-        /// </param>
-        /// <param name="values">
-        /// <para>
-        /// Specifies an array of mapsize values.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glPixelMapusv")]
-        public static 
-        void PixelMap(OpenTK.Graphics.OpenGL.PixelMap map, Int32 mapsize, UInt16[] values)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt16* values_ptr = values)
-                {
-                    Delegates.glPixelMapusv((OpenTK.Graphics.OpenGL.PixelMap)map, (Int32)mapsize, (UInt16*)values_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set pixel storage modes
         /// </summary>
@@ -61997,16 +61997,21 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the value that pname will be set to.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glPointParameterfv")]
         public static 
-        unsafe void PointParameter(OpenTK.Graphics.OpenGL.PointParameterName pname, Single* @params)
+        void PointParameter(OpenTK.Graphics.OpenGL.PointParameterName pname, Single[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glPointParameterfv((OpenTK.Graphics.OpenGL.PointParameterName)pname, (Single*)@params);
+            unsafe
+            {
+                fixed (Single* @params_ptr = @params)
+                {
+                    Delegates.glPointParameterfv((OpenTK.Graphics.OpenGL.PointParameterName)pname, (Single*)@params_ptr);
+                }
+            }
             #if DEBUG
             }
             #endif
@@ -62026,21 +62031,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the value that pname will be set to.
         /// </para>
         /// </param>
+        [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glPointParameterfv")]
         public static 
-        void PointParameter(OpenTK.Graphics.OpenGL.PointParameterName pname, Single[] @params)
+        unsafe void PointParameter(OpenTK.Graphics.OpenGL.PointParameterName pname, Single* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            unsafe
-            {
-                fixed (Single* @params_ptr = @params)
-                {
-                    Delegates.glPointParameterfv((OpenTK.Graphics.OpenGL.PointParameterName)pname, (Single*)@params_ptr);
-                }
-            }
+            Delegates.glPointParameterfv((OpenTK.Graphics.OpenGL.PointParameterName)pname, (Single*)@params);
             #if DEBUG
             }
             #endif
@@ -62088,16 +62088,21 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the value that pname will be set to.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glPointParameteriv")]
         public static 
-        unsafe void PointParameter(OpenTK.Graphics.OpenGL.PointParameterName pname, Int32* @params)
+        void PointParameter(OpenTK.Graphics.OpenGL.PointParameterName pname, Int32[] @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glPointParameteriv((OpenTK.Graphics.OpenGL.PointParameterName)pname, (Int32*)@params);
+            unsafe
+            {
+                fixed (Int32* @params_ptr = @params)
+                {
+                    Delegates.glPointParameteriv((OpenTK.Graphics.OpenGL.PointParameterName)pname, (Int32*)@params_ptr);
+                }
+            }
             #if DEBUG
             }
             #endif
@@ -62117,21 +62122,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the value that pname will be set to.
         /// </para>
         /// </param>
+        [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version14", Version = "1.4", EntryPoint = "glPointParameteriv")]
         public static 
-        void PointParameter(OpenTK.Graphics.OpenGL.PointParameterName pname, Int32[] @params)
+        unsafe void PointParameter(OpenTK.Graphics.OpenGL.PointParameterName pname, Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            unsafe
-            {
-                fixed (Int32* @params_ptr = @params)
-                {
-                    Delegates.glPointParameteriv((OpenTK.Graphics.OpenGL.PointParameterName)pname, (Int32*)@params_ptr);
-                }
-            }
+            Delegates.glPointParameteriv((OpenTK.Graphics.OpenGL.PointParameterName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -62217,30 +62217,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the polygon stippling pattern
-        /// </summary>
-        /// <param name="pattern">
-        /// <para>
-        /// Specifies a pointer to a 32 times 32 stipple pattern that will be unpacked from memory in the same way that glDrawPixels unpacks pixels.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glPolygonStipple")]
-        public static 
-        unsafe void PolygonStipple(Byte* mask)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glPolygonStipple((Byte*)mask);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the polygon stippling pattern
         /// </summary>
@@ -62298,6 +62274,30 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        
+        /// <summary>
+        /// Set the polygon stippling pattern
+        /// </summary>
+        /// <param name="pattern">
+        /// <para>
+        /// Specifies a pointer to a 32 times 32 stipple pattern that will be unpacked from memory in the same way that glDrawPixels unpacks pixels.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glPolygonStipple")]
+        public static 
+        unsafe void PolygonStipple(Byte* mask)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glPolygonStipple((Byte*)mask);
+            #if DEBUG
+            }
+            #endif
+        }
+
         [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glPopAttrib")]
         public static 
         void PopAttrib()
@@ -62384,40 +62384,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set texture residence priority
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of textures to be prioritized.
-        /// </para>
-        /// </param>
-        /// <param name="textures">
-        /// <para>
-        /// Specifies an array containing the names of the textures to be prioritized.
-        /// </para>
-        /// </param>
-        /// <param name="priorities">
-        /// <para>
-        /// Specifies an array containing the texture priorities. A priority given in an element of priorities applies to the texture named by the corresponding element of textures.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glPrioritizeTextures")]
-        public static 
-        unsafe void PrioritizeTextures(Int32 n, Int32* textures, Single* priorities)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glPrioritizeTextures((Int32)n, (UInt32*)textures, (Single*)priorities);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set texture residence priority
         /// </summary>
@@ -62498,6 +62464,81 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set texture residence priority
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of textures to be prioritized.
+        /// </para>
+        /// </param>
+        /// <param name="textures">
+        /// <para>
+        /// Specifies an array containing the names of the textures to be prioritized.
+        /// </para>
+        /// </param>
+        /// <param name="priorities">
+        /// <para>
+        /// Specifies an array containing the texture priorities. A priority given in an element of priorities applies to the texture named by the corresponding element of textures.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glPrioritizeTextures")]
+        public static 
+        unsafe void PrioritizeTextures(Int32 n, Int32* textures, Single* priorities)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glPrioritizeTextures((Int32)n, (UInt32*)textures, (Single*)priorities);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Set texture residence priority
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of textures to be prioritized.
+        /// </para>
+        /// </param>
+        /// <param name="textures">
+        /// <para>
+        /// Specifies an array containing the names of the textures to be prioritized.
+        /// </para>
+        /// </param>
+        /// <param name="priorities">
+        /// <para>
+        /// Specifies an array containing the texture priorities. A priority given in an element of priorities applies to the texture named by the corresponding element of textures.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glPrioritizeTextures")]
+        public static 
+        void PrioritizeTextures(Int32 n, UInt32[] textures, Single[] priorities)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* textures_ptr = textures)
+                fixed (Single* priorities_ptr = priorities)
+                {
+                    Delegates.glPrioritizeTextures((Int32)n, (UInt32*)textures_ptr, (Single*)priorities_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set texture residence priority
         /// </summary>
@@ -62572,47 +62613,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        
-        /// <summary>
-        /// Set texture residence priority
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of textures to be prioritized.
-        /// </para>
-        /// </param>
-        /// <param name="textures">
-        /// <para>
-        /// Specifies an array containing the names of the textures to be prioritized.
-        /// </para>
-        /// </param>
-        /// <param name="priorities">
-        /// <para>
-        /// Specifies an array containing the texture priorities. A priority given in an element of priorities applies to the texture named by the corresponding element of textures.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glPrioritizeTextures")]
-        public static 
-        void PrioritizeTextures(Int32 n, UInt32[] textures, Single[] priorities)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* textures_ptr = textures)
-                fixed (Single* priorities_ptr = priorities)
-                {
-                    Delegates.glPrioritizeTextures((Int32)n, (UInt32*)textures_ptr, (Single*)priorities_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "Version32", Version = "1.2", EntryPoint = "glProgramParameteri")]
         public static 
         void ProgramParameter(Int32 program, OpenTK.Graphics.OpenGL.Version32 pname, Int32 value)
@@ -62791,30 +62791,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specify the raster position for pixel operations
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify the , , , and object coordinates (if present) for the raster position.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos2dv")]
-        public static 
-        unsafe void RasterPos2(Double* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glRasterPos2dv((Double*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify the raster position for pixel operations
         /// </summary>
@@ -62873,6 +62849,30 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specify the raster position for pixel operations
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify the , , , and object coordinates (if present) for the raster position.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos2dv")]
+        public static 
+        unsafe void RasterPos2(Double* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glRasterPos2dv((Double*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify the raster position for pixel operations
         /// </summary>
@@ -62896,6 +62896,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specify the raster position for pixel operations
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify the , , , and object coordinates (if present) for the raster position.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos2fv")]
+        public static 
+        void RasterPos2(Single[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* v_ptr = v)
+                {
+                    Delegates.glRasterPos2fv((Single*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify the raster position for pixel operations
         /// </summary>
@@ -62949,35 +62978,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specify the raster position for pixel operations
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify the , , , and object coordinates (if present) for the raster position.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos2fv")]
-        public static 
-        void RasterPos2(Single[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* v_ptr = v)
-                {
-                    Delegates.glRasterPos2fv((Single*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify the raster position for pixel operations
         /// </summary>
@@ -63001,30 +63001,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specify the raster position for pixel operations
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify the , , , and object coordinates (if present) for the raster position.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos2iv")]
-        public static 
-        unsafe void RasterPos2(Int32* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glRasterPos2iv((Int32*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify the raster position for pixel operations
         /// </summary>
@@ -63091,15 +63067,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , , and object coordinates (if present) for the raster position.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos2s")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos2iv")]
         public static 
-        void RasterPos2(Int16 x, Int16 y)
+        unsafe void RasterPos2(Int32* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glRasterPos2s((Int16)x, (Int16)y);
+            Delegates.glRasterPos2iv((Int32*)v);
             #if DEBUG
             }
             #endif
@@ -63114,16 +63091,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , , and object coordinates (if present) for the raster position.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos2sv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos2s")]
         public static 
-        unsafe void RasterPos2(Int16* v)
+        void RasterPos2(Int16 x, Int16 y)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glRasterPos2sv((Int16*)v);
+            Delegates.glRasterPos2s((Int16)x, (Int16)y);
             #if DEBUG
             }
             #endif
@@ -63196,15 +63172,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , , and object coordinates (if present) for the raster position.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos3d")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos2sv")]
         public static 
-        void RasterPos3(Double x, Double y, Double z)
+        unsafe void RasterPos2(Int16* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glRasterPos3d((Double)x, (Double)y, (Double)z);
+            Delegates.glRasterPos2sv((Int16*)v);
             #if DEBUG
             }
             #endif
@@ -63219,16 +63196,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , , and object coordinates (if present) for the raster position.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos3dv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos3d")]
         public static 
-        unsafe void RasterPos3(Double* v)
+        void RasterPos3(Double x, Double y, Double z)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glRasterPos3dv((Double*)v);
+            Delegates.glRasterPos3d((Double)x, (Double)y, (Double)z);
             #if DEBUG
             }
             #endif
@@ -63293,6 +63269,30 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specify the raster position for pixel operations
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify the , , , and object coordinates (if present) for the raster position.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos3dv")]
+        public static 
+        unsafe void RasterPos3(Double* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glRasterPos3dv((Double*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify the raster position for pixel operations
         /// </summary>
@@ -63316,6 +63316,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specify the raster position for pixel operations
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify the , , , and object coordinates (if present) for the raster position.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos3fv")]
+        public static 
+        void RasterPos3(Single[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* v_ptr = v)
+                {
+                    Delegates.glRasterPos3fv((Single*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify the raster position for pixel operations
         /// </summary>
@@ -63369,35 +63398,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specify the raster position for pixel operations
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify the , , , and object coordinates (if present) for the raster position.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos3fv")]
-        public static 
-        void RasterPos3(Single[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* v_ptr = v)
-                {
-                    Delegates.glRasterPos3fv((Single*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify the raster position for pixel operations
         /// </summary>
@@ -63421,30 +63421,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specify the raster position for pixel operations
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify the , , , and object coordinates (if present) for the raster position.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos3iv")]
-        public static 
-        unsafe void RasterPos3(Int32* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glRasterPos3iv((Int32*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify the raster position for pixel operations
         /// </summary>
@@ -63511,15 +63487,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , , and object coordinates (if present) for the raster position.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos3s")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos3iv")]
         public static 
-        void RasterPos3(Int16 x, Int16 y, Int16 z)
+        unsafe void RasterPos3(Int32* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glRasterPos3s((Int16)x, (Int16)y, (Int16)z);
+            Delegates.glRasterPos3iv((Int32*)v);
             #if DEBUG
             }
             #endif
@@ -63534,16 +63511,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , , and object coordinates (if present) for the raster position.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos3sv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos3s")]
         public static 
-        unsafe void RasterPos3(Int16* v)
+        void RasterPos3(Int16 x, Int16 y, Int16 z)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glRasterPos3sv((Int16*)v);
+            Delegates.glRasterPos3s((Int16)x, (Int16)y, (Int16)z);
             #if DEBUG
             }
             #endif
@@ -63616,15 +63592,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , , and object coordinates (if present) for the raster position.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos4d")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos3sv")]
         public static 
-        void RasterPos4(Double x, Double y, Double z, Double w)
+        unsafe void RasterPos3(Int16* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glRasterPos4d((Double)x, (Double)y, (Double)z, (Double)w);
+            Delegates.glRasterPos3sv((Int16*)v);
             #if DEBUG
             }
             #endif
@@ -63639,16 +63616,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , , and object coordinates (if present) for the raster position.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos4dv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos4d")]
         public static 
-        unsafe void RasterPos4(Double* v)
+        void RasterPos4(Double x, Double y, Double z, Double w)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glRasterPos4dv((Double*)v);
+            Delegates.glRasterPos4d((Double)x, (Double)y, (Double)z, (Double)w);
             #if DEBUG
             }
             #endif
@@ -63713,6 +63689,30 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specify the raster position for pixel operations
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify the , , , and object coordinates (if present) for the raster position.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos4dv")]
+        public static 
+        unsafe void RasterPos4(Double* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glRasterPos4dv((Double*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify the raster position for pixel operations
         /// </summary>
@@ -63736,6 +63736,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specify the raster position for pixel operations
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify the , , , and object coordinates (if present) for the raster position.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos4fv")]
+        public static 
+        void RasterPos4(Single[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* v_ptr = v)
+                {
+                    Delegates.glRasterPos4fv((Single*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify the raster position for pixel operations
         /// </summary>
@@ -63789,35 +63818,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specify the raster position for pixel operations
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify the , , , and object coordinates (if present) for the raster position.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos4fv")]
-        public static 
-        void RasterPos4(Single[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* v_ptr = v)
-                {
-                    Delegates.glRasterPos4fv((Single*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify the raster position for pixel operations
         /// </summary>
@@ -63841,30 +63841,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specify the raster position for pixel operations
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify the , , , and object coordinates (if present) for the raster position.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos4iv")]
-        public static 
-        unsafe void RasterPos4(Int32* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glRasterPos4iv((Int32*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify the raster position for pixel operations
         /// </summary>
@@ -63931,15 +63907,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , , and object coordinates (if present) for the raster position.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos4s")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos4iv")]
         public static 
-        void RasterPos4(Int16 x, Int16 y, Int16 z, Int16 w)
+        unsafe void RasterPos4(Int32* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glRasterPos4s((Int16)x, (Int16)y, (Int16)z, (Int16)w);
+            Delegates.glRasterPos4iv((Int32*)v);
             #if DEBUG
             }
             #endif
@@ -63954,16 +63931,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , , and object coordinates (if present) for the raster position.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos4sv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos4s")]
         public static 
-        unsafe void RasterPos4(Int16* v)
+        void RasterPos4(Int16 x, Int16 y, Int16 z, Int16 w)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glRasterPos4sv((Int16*)v);
+            Delegates.glRasterPos4s((Int16)x, (Int16)y, (Int16)z, (Int16)w);
             #if DEBUG
             }
             #endif
@@ -64028,6 +64004,30 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specify the raster position for pixel operations
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify the , , , and object coordinates (if present) for the raster position.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRasterPos4sv")]
+        public static 
+        unsafe void RasterPos4(Int16* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glRasterPos4sv((Int16*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Select a color buffer source for pixels
         /// </summary>
@@ -64081,23 +64081,13 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glReadPixels")]
         public static 
-        void ReadPixels<T6>(Int32 x, Int32 y, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T6 pixels)
-            where T6 : struct
+        void ReadPixels(Int32 x, Int32 y, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr pixels)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glReadPixels((Int32)x, (Int32)y, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                pixels = (T6)pixels_ptr.Target;
-            }
-            finally
-            {
-                pixels_ptr.Free();
-            }
+            Delegates.glReadPixels((Int32)x, (Int32)y, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
             #if DEBUG
             }
             #endif
@@ -64134,7 +64124,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glReadPixels")]
         public static 
-        void ReadPixels<T6>(Int32 x, Int32 y, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[,,] pixels)
+        void ReadPixels<T6>(Int32 x, Int32 y, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[] pixels)
             where T6 : struct
         {
             #if DEBUG
@@ -64238,7 +64228,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glReadPixels")]
         public static 
-        void ReadPixels<T6>(Int32 x, Int32 y, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[] pixels)
+        void ReadPixels<T6>(Int32 x, Int32 y, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[,,] pixels)
             where T6 : struct
         {
             #if DEBUG
@@ -64290,13 +64280,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glReadPixels")]
         public static 
-        void ReadPixels(Int32 x, Int32 y, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr pixels)
+        void ReadPixels<T6>(Int32 x, Int32 y, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T6 pixels)
+            where T6 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glReadPixels((Int32)x, (Int32)y, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+            GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glReadPixels((Int32)x, (Int32)y, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                pixels = (T6)pixels_ptr.Target;
+            }
+            finally
+            {
+                pixels_ptr.Free();
+            }
             #if DEBUG
             }
             #endif
@@ -64331,35 +64331,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Draw a rectangle
-        /// </summary>
-        /// <param name="x1">
-        /// <para>
-        /// Specify one vertex of a rectangle.
-        /// </para>
-        /// </param>
-        /// <param name="x2">
-        /// <para>
-        /// Specify the opposite vertex of the rectangle.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRectdv")]
-        public static 
-        unsafe void Rect(Double* v1, Double* v2)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glRectdv((Double*)v1, (Double*)v2);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Draw a rectangle
         /// </summary>
@@ -64430,6 +64401,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Draw a rectangle
+        /// </summary>
+        /// <param name="x1">
+        /// <para>
+        /// Specify one vertex of a rectangle.
+        /// </para>
+        /// </param>
+        /// <param name="x2">
+        /// <para>
+        /// Specify the opposite vertex of the rectangle.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRectdv")]
+        public static 
+        unsafe void Rect(Double* v1, Double* v2)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glRectdv((Double*)v1, (Double*)v2);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Draw a rectangle
         /// </summary>
@@ -64458,6 +64458,41 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Draw a rectangle
+        /// </summary>
+        /// <param name="x1">
+        /// <para>
+        /// Specify one vertex of a rectangle.
+        /// </para>
+        /// </param>
+        /// <param name="x2">
+        /// <para>
+        /// Specify the opposite vertex of the rectangle.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRectfv")]
+        public static 
+        void Rect(Single[] v1, Single[] v2)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* v1_ptr = v1)
+                fixed (Single* v2_ptr = v2)
+                {
+                    Delegates.glRectfv((Single*)v1_ptr, (Single*)v2_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Draw a rectangle
         /// </summary>
@@ -64522,41 +64557,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Draw a rectangle
-        /// </summary>
-        /// <param name="x1">
-        /// <para>
-        /// Specify one vertex of a rectangle.
-        /// </para>
-        /// </param>
-        /// <param name="x2">
-        /// <para>
-        /// Specify the opposite vertex of the rectangle.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRectfv")]
-        public static 
-        void Rect(Single[] v1, Single[] v2)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* v1_ptr = v1)
-                fixed (Single* v2_ptr = v2)
-                {
-                    Delegates.glRectfv((Single*)v1_ptr, (Single*)v2_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Draw a rectangle
         /// </summary>
@@ -64585,35 +64585,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Draw a rectangle
-        /// </summary>
-        /// <param name="x1">
-        /// <para>
-        /// Specify one vertex of a rectangle.
-        /// </para>
-        /// </param>
-        /// <param name="x2">
-        /// <para>
-        /// Specify the opposite vertex of the rectangle.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRectiv")]
-        public static 
-        unsafe void Rect(Int32* v1, Int32* v2)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glRectiv((Int32*)v1, (Int32*)v2);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Draw a rectangle
         /// </summary>
@@ -64683,20 +64654,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRects")]
-        public static 
-        void Rects(Int16 x1, Int16 y1, Int16 x2, Int16 y2)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glRects((Int16)x1, (Int16)y1, (Int16)x2, (Int16)y2);
-            #if DEBUG
-            }
-            #endif
-        }
-
         
         /// <summary>
         /// Draw a rectangle
@@ -64712,15 +64669,29 @@ namespace OpenTK.Graphics.OpenGL
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRectsv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRectiv")]
         public static 
-        unsafe void Rect(Int16* v1, Int16* v2)
+        unsafe void Rect(Int32* v1, Int32* v2)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glRectsv((Int16*)v1, (Int16*)v2);
+            Delegates.glRectiv((Int32*)v1, (Int32*)v2);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRects")]
+        public static 
+        void Rects(Int16 x1, Int16 y1, Int16 x2, Int16 y2)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glRects((Int16)x1, (Int16)y1, (Int16)x2, (Int16)y2);
             #if DEBUG
             }
             #endif
@@ -64796,6 +64767,35 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        
+        /// <summary>
+        /// Draw a rectangle
+        /// </summary>
+        /// <param name="x1">
+        /// <para>
+        /// Specify one vertex of a rectangle.
+        /// </para>
+        /// </param>
+        /// <param name="x2">
+        /// <para>
+        /// Specify the opposite vertex of the rectangle.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glRectsv")]
+        public static 
+        unsafe void Rect(Int16* v1, Int16* v2)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glRectsv((Int16*)v1, (Int16*)v2);
+            #if DEBUG
+            }
+            #endif
+        }
+
         [AutoGenerated(Category = "ArbFramebufferObject", Version = "3.0", EntryPoint = "glRenderbufferStorage")]
         public static 
         void RenderbufferStorage(OpenTK.Graphics.OpenGL.RenderbufferTarget target, OpenTK.Graphics.OpenGL.RenderbufferStorage internalformat, Int32 width, Int32 height)
@@ -65105,6 +65105,36 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the current secondary color
+        /// </summary>
+        /// <param name="red">
+        /// <para>
+        /// Specify new red, green, and blue values for the current secondary color.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glSecondaryColor3bv")]
+        public static 
+        void SecondaryColor3(SByte[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (SByte* v_ptr = v)
+                {
+                    Delegates.glSecondaryColor3bv((SByte*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current secondary color
         /// </summary>
@@ -65159,36 +65189,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current secondary color
-        /// </summary>
-        /// <param name="red">
-        /// <para>
-        /// Specify new red, green, and blue values for the current secondary color.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glSecondaryColor3bv")]
-        public static 
-        void SecondaryColor3(SByte[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (SByte* v_ptr = v)
-                {
-                    Delegates.glSecondaryColor3bv((SByte*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current secondary color
         /// </summary>
@@ -65212,30 +65212,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current secondary color
-        /// </summary>
-        /// <param name="red">
-        /// <para>
-        /// Specify new red, green, and blue values for the current secondary color.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glSecondaryColor3dv")]
-        public static 
-        unsafe void SecondaryColor3(Double* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glSecondaryColor3dv((Double*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current secondary color
         /// </summary>
@@ -65294,6 +65270,30 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the current secondary color
+        /// </summary>
+        /// <param name="red">
+        /// <para>
+        /// Specify new red, green, and blue values for the current secondary color.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glSecondaryColor3dv")]
+        public static 
+        unsafe void SecondaryColor3(Double* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glSecondaryColor3dv((Double*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current secondary color
         /// </summary>
@@ -65317,6 +65317,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the current secondary color
+        /// </summary>
+        /// <param name="red">
+        /// <para>
+        /// Specify new red, green, and blue values for the current secondary color.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glSecondaryColor3fv")]
+        public static 
+        void SecondaryColor3(Single[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* v_ptr = v)
+                {
+                    Delegates.glSecondaryColor3fv((Single*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current secondary color
         /// </summary>
@@ -65370,35 +65399,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current secondary color
-        /// </summary>
-        /// <param name="red">
-        /// <para>
-        /// Specify new red, green, and blue values for the current secondary color.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glSecondaryColor3fv")]
-        public static 
-        void SecondaryColor3(Single[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* v_ptr = v)
-                {
-                    Delegates.glSecondaryColor3fv((Single*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current secondary color
         /// </summary>
@@ -65422,30 +65422,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current secondary color
-        /// </summary>
-        /// <param name="red">
-        /// <para>
-        /// Specify new red, green, and blue values for the current secondary color.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glSecondaryColor3iv")]
-        public static 
-        unsafe void SecondaryColor3(Int32* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glSecondaryColor3iv((Int32*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current secondary color
         /// </summary>
@@ -65512,15 +65488,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify new red, green, and blue values for the current secondary color.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glSecondaryColor3s")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glSecondaryColor3iv")]
         public static 
-        void SecondaryColor3(Int16 red, Int16 green, Int16 blue)
+        unsafe void SecondaryColor3(Int32* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSecondaryColor3s((Int16)red, (Int16)green, (Int16)blue);
+            Delegates.glSecondaryColor3iv((Int32*)v);
             #if DEBUG
             }
             #endif
@@ -65535,16 +65512,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify new red, green, and blue values for the current secondary color.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glSecondaryColor3sv")]
+        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glSecondaryColor3s")]
         public static 
-        unsafe void SecondaryColor3(Int16* v)
+        void SecondaryColor3(Int16 red, Int16 green, Int16 blue)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSecondaryColor3sv((Int16*)v);
+            Delegates.glSecondaryColor3s((Int16)red, (Int16)green, (Int16)blue);
             #if DEBUG
             }
             #endif
@@ -65617,15 +65593,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify new red, green, and blue values for the current secondary color.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glSecondaryColor3ub")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glSecondaryColor3sv")]
         public static 
-        void SecondaryColor3(Byte red, Byte green, Byte blue)
+        unsafe void SecondaryColor3(Int16* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSecondaryColor3ub((Byte)red, (Byte)green, (Byte)blue);
+            Delegates.glSecondaryColor3sv((Int16*)v);
             #if DEBUG
             }
             #endif
@@ -65640,16 +65617,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify new red, green, and blue values for the current secondary color.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glSecondaryColor3ubv")]
+        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glSecondaryColor3ub")]
         public static 
-        unsafe void SecondaryColor3(Byte* v)
+        void SecondaryColor3(Byte red, Byte green, Byte blue)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSecondaryColor3ubv((Byte*)v);
+            Delegates.glSecondaryColor3ub((Byte)red, (Byte)green, (Byte)blue);
             #if DEBUG
             }
             #endif
@@ -65714,6 +65690,30 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the current secondary color
+        /// </summary>
+        /// <param name="red">
+        /// <para>
+        /// Specify new red, green, and blue values for the current secondary color.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glSecondaryColor3ubv")]
+        public static 
+        unsafe void SecondaryColor3(Byte* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glSecondaryColor3ubv((Byte*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current secondary color
         /// </summary>
@@ -65738,6 +65738,36 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the current secondary color
+        /// </summary>
+        /// <param name="red">
+        /// <para>
+        /// Specify new red, green, and blue values for the current secondary color.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glSecondaryColor3uiv")]
+        public static 
+        void SecondaryColor3(UInt32[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* v_ptr = v)
+                {
+                    Delegates.glSecondaryColor3uiv((UInt32*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current secondary color
         /// </summary>
@@ -65801,21 +65831,15 @@ namespace OpenTK.Graphics.OpenGL
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glSecondaryColor3uiv")]
+        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glSecondaryColor3us")]
         public static 
-        void SecondaryColor3(UInt32[] v)
+        void SecondaryColor3(UInt16 red, UInt16 green, UInt16 blue)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            unsafe
-            {
-                fixed (UInt32* v_ptr = v)
-                {
-                    Delegates.glSecondaryColor3uiv((UInt32*)v_ptr);
-                }
-            }
+            Delegates.glSecondaryColor3us((UInt16)red, (UInt16)green, (UInt16)blue);
             #if DEBUG
             }
             #endif
@@ -65831,15 +65855,21 @@ namespace OpenTK.Graphics.OpenGL
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glSecondaryColor3us")]
+        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glSecondaryColor3usv")]
         public static 
-        void SecondaryColor3(UInt16 red, UInt16 green, UInt16 blue)
+        void SecondaryColor3(UInt16[] v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSecondaryColor3us((UInt16)red, (UInt16)green, (UInt16)blue);
+            unsafe
+            {
+                fixed (UInt16* v_ptr = v)
+                {
+                    Delegates.glSecondaryColor3usv((UInt16*)v_ptr);
+                }
+            }
             #if DEBUG
             }
             #endif
@@ -65901,29 +65931,37 @@ namespace OpenTK.Graphics.OpenGL
 
         
         /// <summary>
-        /// Set the current secondary color
+        /// Define an array of secondary colors
         /// </summary>
-        /// <param name="red">
+        /// <param name="size">
         /// <para>
-        /// Specify new red, green, and blue values for the current secondary color.
+        /// Specifies the number of components per color. Must be 3.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glSecondaryColor3usv")]
+        /// <param name="type">
+        /// <para>
+        /// Specifies the data type of each color component in the array. Symbolic constants GL_BYTE, GL_UNSIGNED_BYTE, GL_SHORT, GL_UNSIGNED_SHORT, GL_INT, GL_UNSIGNED_INT, GL_FLOAT, or GL_DOUBLE are accepted. The initial value is GL_FLOAT.
+        /// </para>
+        /// </param>
+        /// <param name="stride">
+        /// <para>
+        /// Specifies the byte offset between consecutive colors. If stride is 0, the colors are understood to be tightly packed in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+        /// <param name="pointer">
+        /// <para>
+        /// Specifies a pointer to the first component of the first color element in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glSecondaryColorPointer")]
         public static 
-        void SecondaryColor3(UInt16[] v)
+        void SecondaryColorPointer(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, IntPtr pointer)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            unsafe
-            {
-                fixed (UInt16* v_ptr = v)
-                {
-                    Delegates.glSecondaryColor3usv((UInt16*)v_ptr);
-                }
-            }
+            Delegates.glSecondaryColorPointer((Int32)size, (OpenTK.Graphics.OpenGL.ColorPointerType)type, (Int32)stride, (IntPtr)pointer);
             #if DEBUG
             }
             #endif
@@ -65955,55 +65993,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glSecondaryColorPointer")]
         public static 
-        void SecondaryColorPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T3 pointer)
-            where T3 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glSecondaryColorPointer((Int32)size, (OpenTK.Graphics.OpenGL.ColorPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                pointer = (T3)pointer_ptr.Target;
-            }
-            finally
-            {
-                pointer_ptr.Free();
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Define an array of secondary colors
-        /// </summary>
-        /// <param name="size">
-        /// <para>
-        /// Specifies the number of components per color. Must be 3.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the data type of each color component in the array. Symbolic constants GL_BYTE, GL_UNSIGNED_BYTE, GL_SHORT, GL_UNSIGNED_SHORT, GL_INT, GL_UNSIGNED_INT, GL_FLOAT, or GL_DOUBLE are accepted. The initial value is GL_FLOAT.
-        /// </para>
-        /// </param>
-        /// <param name="stride">
-        /// <para>
-        /// Specifies the byte offset between consecutive colors. If stride is 0, the colors are understood to be tightly packed in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-        /// <param name="pointer">
-        /// <para>
-        /// Specifies a pointer to the first component of the first color element in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glSecondaryColorPointer")]
-        public static 
-        void SecondaryColorPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[,,] pointer)
+        void SecondaryColorPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[] pointer)
             where T3 : struct
         {
             #if DEBUG
@@ -66097,7 +66087,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glSecondaryColorPointer")]
         public static 
-        void SecondaryColorPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[] pointer)
+        void SecondaryColorPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[,,] pointer)
             where T3 : struct
         {
             #if DEBUG
@@ -66144,42 +66134,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glSecondaryColorPointer")]
         public static 
-        void SecondaryColorPointer(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, IntPtr pointer)
+        void SecondaryColorPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T3 pointer)
+            where T3 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glSecondaryColorPointer((Int32)size, (OpenTK.Graphics.OpenGL.ColorPointerType)type, (Int32)stride, (IntPtr)pointer);
-            #if DEBUG
+            GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glSecondaryColorPointer((Int32)size, (OpenTK.Graphics.OpenGL.ColorPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                pointer = (T3)pointer_ptr.Target;
             }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Establish a buffer for selection mode values
-        /// </summary>
-        /// <param name="size">
-        /// <para>
-        /// Specifies the size of buffer.
-        /// </para>
-        /// </param>
-        /// <param name="buffer">
-        /// <para>
-        /// Returns the selection data.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glSelectBuffer")]
-        public static 
-        unsafe void SelectBuffer(Int32 size, [OutAttribute] Int32* buffer)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            finally
             {
-            #endif
-            Delegates.glSelectBuffer((Int32)size, (UInt32*)buffer);
+                pointer_ptr.Free();
+            }
             #if DEBUG
             }
             #endif
@@ -66255,6 +66226,70 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Establish a buffer for selection mode values
+        /// </summary>
+        /// <param name="size">
+        /// <para>
+        /// Specifies the size of buffer.
+        /// </para>
+        /// </param>
+        /// <param name="buffer">
+        /// <para>
+        /// Returns the selection data.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glSelectBuffer")]
+        public static 
+        unsafe void SelectBuffer(Int32 size, [OutAttribute] Int32* buffer)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glSelectBuffer((Int32)size, (UInt32*)buffer);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Establish a buffer for selection mode values
+        /// </summary>
+        /// <param name="size">
+        /// <para>
+        /// Specifies the size of buffer.
+        /// </para>
+        /// </param>
+        /// <param name="buffer">
+        /// <para>
+        /// Returns the selection data.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glSelectBuffer")]
+        public static 
+        void SelectBuffer(Int32 size, [OutAttribute] UInt32[] buffer)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* buffer_ptr = buffer)
+                {
+                    Delegates.glSelectBuffer((Int32)size, (UInt32*)buffer_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Establish a buffer for selection mode values
         /// </summary>
@@ -66320,41 +66355,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Establish a buffer for selection mode values
-        /// </summary>
-        /// <param name="size">
-        /// <para>
-        /// Specifies the size of buffer.
-        /// </para>
-        /// </param>
-        /// <param name="buffer">
-        /// <para>
-        /// Returns the selection data.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glSelectBuffer")]
-        public static 
-        void SelectBuffer(Int32 size, [OutAttribute] UInt32[] buffer)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* buffer_ptr = buffer)
-                {
-                    Delegates.glSelectBuffer((Int32)size, (UInt32*)buffer_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Define a separable two-dimensional convolution filter
         /// </summary>
@@ -66400,24 +66400,78 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glSeparableFilter2D")]
         public static 
-        void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T6 row, [InAttribute, OutAttribute] T7[,,] column)
-            where T6 : struct
+        void SeparableFilter2D(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr row, IntPtr column)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glSeparableFilter2D((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Define a separable two-dimensional convolution filter
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="internalformat">
+        /// <para>
+        /// The internal format of the convolution filter kernel. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, or GL_RGBA16.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// The number of elements in the pixel array referenced by row. (This is the width of the separable filter kernel.)
+        /// </para>
+        /// </param>
+        /// <param name="height">
+        /// <para>
+        /// The number of elements in the pixel array referenced by column. (This is the height of the separable filter kernel.)
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// The format of the pixel data in row and column. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_INTENSITY, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// The type of the pixel data in row and column. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="row">
+        /// <para>
+        /// Pointer to a one-dimensional array of pixel data that is processed to build the row filter kernel.
+        /// </para>
+        /// </param>
+        /// <param name="column">
+        /// <para>
+        /// Pointer to a one-dimensional array of pixel data that is processed to build the column filter kernel.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glSeparableFilter2D")]
+        public static 
+        void SeparableFilter2D<T7>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr row, [InAttribute, OutAttribute] T7[] column)
             where T7 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle row_ptr = GCHandle.Alloc(row, GCHandleType.Pinned);
             GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
             try
             {
-                Delegates.glSeparableFilter2D((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row_ptr.AddrOfPinnedObject(), (IntPtr)column_ptr.AddrOfPinnedObject());
-                row = (T6)row_ptr.Target;
+                Delegates.glSeparableFilter2D((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject());
             }
             finally
             {
-                row_ptr.Free();
                 column_ptr.Free();
             }
             #if DEBUG
@@ -66471,7 +66525,209 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glSeparableFilter2D")]
         public static 
-        void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[,,] row, [InAttribute, OutAttribute] T7[,,] column)
+        void SeparableFilter2D<T7>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr row, [InAttribute, OutAttribute] T7[,] column)
+            where T7 : struct
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glSeparableFilter2D((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject());
+            }
+            finally
+            {
+                column_ptr.Free();
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Define a separable two-dimensional convolution filter
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="internalformat">
+        /// <para>
+        /// The internal format of the convolution filter kernel. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, or GL_RGBA16.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// The number of elements in the pixel array referenced by row. (This is the width of the separable filter kernel.)
+        /// </para>
+        /// </param>
+        /// <param name="height">
+        /// <para>
+        /// The number of elements in the pixel array referenced by column. (This is the height of the separable filter kernel.)
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// The format of the pixel data in row and column. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_INTENSITY, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// The type of the pixel data in row and column. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="row">
+        /// <para>
+        /// Pointer to a one-dimensional array of pixel data that is processed to build the row filter kernel.
+        /// </para>
+        /// </param>
+        /// <param name="column">
+        /// <para>
+        /// Pointer to a one-dimensional array of pixel data that is processed to build the column filter kernel.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glSeparableFilter2D")]
+        public static 
+        void SeparableFilter2D<T7>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr row, [InAttribute, OutAttribute] T7[,,] column)
+            where T7 : struct
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glSeparableFilter2D((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject());
+            }
+            finally
+            {
+                column_ptr.Free();
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Define a separable two-dimensional convolution filter
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="internalformat">
+        /// <para>
+        /// The internal format of the convolution filter kernel. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, or GL_RGBA16.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// The number of elements in the pixel array referenced by row. (This is the width of the separable filter kernel.)
+        /// </para>
+        /// </param>
+        /// <param name="height">
+        /// <para>
+        /// The number of elements in the pixel array referenced by column. (This is the height of the separable filter kernel.)
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// The format of the pixel data in row and column. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_INTENSITY, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// The type of the pixel data in row and column. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="row">
+        /// <para>
+        /// Pointer to a one-dimensional array of pixel data that is processed to build the row filter kernel.
+        /// </para>
+        /// </param>
+        /// <param name="column">
+        /// <para>
+        /// Pointer to a one-dimensional array of pixel data that is processed to build the column filter kernel.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glSeparableFilter2D")]
+        public static 
+        void SeparableFilter2D<T7>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr row, [InAttribute, OutAttribute] ref T7 column)
+            where T7 : struct
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glSeparableFilter2D((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject());
+                column = (T7)column_ptr.Target;
+            }
+            finally
+            {
+                column_ptr.Free();
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Define a separable two-dimensional convolution filter
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="internalformat">
+        /// <para>
+        /// The internal format of the convolution filter kernel. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, or GL_RGBA16.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// The number of elements in the pixel array referenced by row. (This is the width of the separable filter kernel.)
+        /// </para>
+        /// </param>
+        /// <param name="height">
+        /// <para>
+        /// The number of elements in the pixel array referenced by column. (This is the height of the separable filter kernel.)
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// The format of the pixel data in row and column. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_INTENSITY, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// The type of the pixel data in row and column. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="row">
+        /// <para>
+        /// Pointer to a one-dimensional array of pixel data that is processed to build the row filter kernel.
+        /// </para>
+        /// </param>
+        /// <param name="column">
+        /// <para>
+        /// Pointer to a one-dimensional array of pixel data that is processed to build the column filter kernel.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glSeparableFilter2D")]
+        public static 
+        void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[] row, [InAttribute, OutAttribute] T7[,,] column)
             where T6 : struct
             where T7 : struct
         {
@@ -66611,7 +66867,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glSeparableFilter2D")]
         public static 
-        void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[] row, [InAttribute, OutAttribute] T7[,,] column)
+        void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[,,] row, [InAttribute, OutAttribute] T7[,,] column)
             where T6 : struct
             where T7 : struct
         {
@@ -66681,21 +66937,24 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glSeparableFilter2D")]
         public static 
-        void SeparableFilter2D<T7>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr row, [InAttribute, OutAttribute] ref T7 column)
+        void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T6 row, [InAttribute, OutAttribute] T7[,,] column)
+            where T6 : struct
             where T7 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
+            GCHandle row_ptr = GCHandle.Alloc(row, GCHandleType.Pinned);
             GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
             try
             {
-                Delegates.glSeparableFilter2D((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject());
-                column = (T7)column_ptr.Target;
+                Delegates.glSeparableFilter2D((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row_ptr.AddrOfPinnedObject(), (IntPtr)column_ptr.AddrOfPinnedObject());
+                row = (T6)row_ptr.Target;
             }
             finally
             {
+                row_ptr.Free();
                 column_ptr.Free();
             }
             #if DEBUG
@@ -66704,265 +66963,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Define a separable two-dimensional convolution filter
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Must be GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="internalformat">
-        /// <para>
-        /// The internal format of the convolution filter kernel. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, or GL_RGBA16.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// The number of elements in the pixel array referenced by row. (This is the width of the separable filter kernel.)
-        /// </para>
-        /// </param>
-        /// <param name="height">
-        /// <para>
-        /// The number of elements in the pixel array referenced by column. (This is the height of the separable filter kernel.)
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// The format of the pixel data in row and column. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_INTENSITY, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// The type of the pixel data in row and column. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="row">
-        /// <para>
-        /// Pointer to a one-dimensional array of pixel data that is processed to build the row filter kernel.
-        /// </para>
-        /// </param>
-        /// <param name="column">
-        /// <para>
-        /// Pointer to a one-dimensional array of pixel data that is processed to build the column filter kernel.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glSeparableFilter2D")]
-        public static 
-        void SeparableFilter2D<T7>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr row, [InAttribute, OutAttribute] T7[,,] column)
-            where T7 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glSeparableFilter2D((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject());
-            }
-            finally
-            {
-                column_ptr.Free();
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Define a separable two-dimensional convolution filter
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Must be GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="internalformat">
-        /// <para>
-        /// The internal format of the convolution filter kernel. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, or GL_RGBA16.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// The number of elements in the pixel array referenced by row. (This is the width of the separable filter kernel.)
-        /// </para>
-        /// </param>
-        /// <param name="height">
-        /// <para>
-        /// The number of elements in the pixel array referenced by column. (This is the height of the separable filter kernel.)
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// The format of the pixel data in row and column. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_INTENSITY, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// The type of the pixel data in row and column. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="row">
-        /// <para>
-        /// Pointer to a one-dimensional array of pixel data that is processed to build the row filter kernel.
-        /// </para>
-        /// </param>
-        /// <param name="column">
-        /// <para>
-        /// Pointer to a one-dimensional array of pixel data that is processed to build the column filter kernel.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glSeparableFilter2D")]
-        public static 
-        void SeparableFilter2D<T7>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr row, [InAttribute, OutAttribute] T7[,] column)
-            where T7 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glSeparableFilter2D((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject());
-            }
-            finally
-            {
-                column_ptr.Free();
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Define a separable two-dimensional convolution filter
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Must be GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="internalformat">
-        /// <para>
-        /// The internal format of the convolution filter kernel. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, or GL_RGBA16.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// The number of elements in the pixel array referenced by row. (This is the width of the separable filter kernel.)
-        /// </para>
-        /// </param>
-        /// <param name="height">
-        /// <para>
-        /// The number of elements in the pixel array referenced by column. (This is the height of the separable filter kernel.)
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// The format of the pixel data in row and column. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_INTENSITY, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// The type of the pixel data in row and column. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="row">
-        /// <para>
-        /// Pointer to a one-dimensional array of pixel data that is processed to build the row filter kernel.
-        /// </para>
-        /// </param>
-        /// <param name="column">
-        /// <para>
-        /// Pointer to a one-dimensional array of pixel data that is processed to build the column filter kernel.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glSeparableFilter2D")]
-        public static 
-        void SeparableFilter2D<T7>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr row, [InAttribute, OutAttribute] T7[] column)
-            where T7 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glSeparableFilter2D((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject());
-            }
-            finally
-            {
-                column_ptr.Free();
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Define a separable two-dimensional convolution filter
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Must be GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="internalformat">
-        /// <para>
-        /// The internal format of the convolution filter kernel. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, or GL_RGBA16.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// The number of elements in the pixel array referenced by row. (This is the width of the separable filter kernel.)
-        /// </para>
-        /// </param>
-        /// <param name="height">
-        /// <para>
-        /// The number of elements in the pixel array referenced by column. (This is the height of the separable filter kernel.)
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// The format of the pixel data in row and column. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_INTENSITY, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// The type of the pixel data in row and column. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="row">
-        /// <para>
-        /// Pointer to a one-dimensional array of pixel data that is processed to build the row filter kernel.
-        /// </para>
-        /// </param>
-        /// <param name="column">
-        /// <para>
-        /// Pointer to a one-dimensional array of pixel data that is processed to build the column filter kernel.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glSeparableFilter2D")]
-        public static 
-        void SeparableFilter2D(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr row, IntPtr column)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glSeparableFilter2D((OpenTK.Graphics.OpenGL.SeparableTarget)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Select flat or smooth shading
         /// </summary>
@@ -66986,45 +66986,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Replaces the source code in a shader object
-        /// </summary>
-        /// <param name="shader">
-        /// <para>
-        /// Specifies the handle of the shader object whose source code is to be replaced.
-        /// </para>
-        /// </param>
-        /// <param name="count">
-        /// <para>
-        /// Specifies the number of elements in the string and length arrays.
-        /// </para>
-        /// </param>
-        /// <param name="string">
-        /// <para>
-        /// Specifies an array of pointers to strings containing the source code to be loaded into the shader.
-        /// </para>
-        /// </param>
-        /// <param name="length">
-        /// <para>
-        /// Specifies an array of string lengths.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glShaderSource")]
-        public static 
-        unsafe void ShaderSource(Int32 shader, Int32 count, String[] @string, Int32* length)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glShaderSource((UInt32)shader, (Int32)count, (String[])@string, (Int32*)length);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Replaces the source code in a shader object
         /// </summary>
@@ -67095,7 +67056,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glShaderSource")]
         public static 
-        unsafe void ShaderSource(UInt32 shader, Int32 count, String[] @string, Int32* length)
+        unsafe void ShaderSource(Int32 shader, Int32 count, String[] @string, Int32* length)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -67153,6 +67114,45 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Replaces the source code in a shader object
+        /// </summary>
+        /// <param name="shader">
+        /// <para>
+        /// Specifies the handle of the shader object whose source code is to be replaced.
+        /// </para>
+        /// </param>
+        /// <param name="count">
+        /// <para>
+        /// Specifies the number of elements in the string and length arrays.
+        /// </para>
+        /// </param>
+        /// <param name="string">
+        /// <para>
+        /// Specifies an array of pointers to strings containing the source code to be loaded into the shader.
+        /// </para>
+        /// </param>
+        /// <param name="length">
+        /// <para>
+        /// Specifies an array of string lengths.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glShaderSource")]
+        public static 
+        unsafe void ShaderSource(UInt32 shader, Int32 count, String[] @string, Int32* length)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glShaderSource((UInt32)shader, (Int32)count, (String[])@string, (Int32*)length);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set front and back function and reference value for stencil testing
         /// </summary>
@@ -67712,30 +67712,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current texture coordinates
-        /// </summary>
-        /// <param name="s">
-        /// <para>
-        /// Specify s, t, r, and q texture coordinates. Not all parameters are present in all forms of the command.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord2dv")]
-        public static 
-        unsafe void TexCoord2(Double* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glTexCoord2dv((Double*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -67794,6 +67770,30 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the current texture coordinates
+        /// </summary>
+        /// <param name="s">
+        /// <para>
+        /// Specify s, t, r, and q texture coordinates. Not all parameters are present in all forms of the command.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord2dv")]
+        public static 
+        unsafe void TexCoord2(Double* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glTexCoord2dv((Double*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -67817,6 +67817,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the current texture coordinates
+        /// </summary>
+        /// <param name="s">
+        /// <para>
+        /// Specify s, t, r, and q texture coordinates. Not all parameters are present in all forms of the command.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord2fv")]
+        public static 
+        void TexCoord2(Single[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* v_ptr = v)
+                {
+                    Delegates.glTexCoord2fv((Single*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -67870,35 +67899,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current texture coordinates
-        /// </summary>
-        /// <param name="s">
-        /// <para>
-        /// Specify s, t, r, and q texture coordinates. Not all parameters are present in all forms of the command.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord2fv")]
-        public static 
-        void TexCoord2(Single[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* v_ptr = v)
-                {
-                    Delegates.glTexCoord2fv((Single*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -67922,30 +67922,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current texture coordinates
-        /// </summary>
-        /// <param name="s">
-        /// <para>
-        /// Specify s, t, r, and q texture coordinates. Not all parameters are present in all forms of the command.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord2iv")]
-        public static 
-        unsafe void TexCoord2(Int32* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glTexCoord2iv((Int32*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -68012,15 +67988,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord2s")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord2iv")]
         public static 
-        void TexCoord2(Int16 s, Int16 t)
+        unsafe void TexCoord2(Int32* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glTexCoord2s((Int16)s, (Int16)t);
+            Delegates.glTexCoord2iv((Int32*)v);
             #if DEBUG
             }
             #endif
@@ -68035,16 +68012,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord2sv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord2s")]
         public static 
-        unsafe void TexCoord2(Int16* v)
+        void TexCoord2(Int16 s, Int16 t)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glTexCoord2sv((Int16*)v);
+            Delegates.glTexCoord2s((Int16)s, (Int16)t);
             #if DEBUG
             }
             #endif
@@ -68117,15 +68093,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord3d")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord2sv")]
         public static 
-        void TexCoord3(Double s, Double t, Double r)
+        unsafe void TexCoord2(Int16* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glTexCoord3d((Double)s, (Double)t, (Double)r);
+            Delegates.glTexCoord2sv((Int16*)v);
             #if DEBUG
             }
             #endif
@@ -68140,16 +68117,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord3dv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord3d")]
         public static 
-        unsafe void TexCoord3(Double* v)
+        void TexCoord3(Double s, Double t, Double r)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glTexCoord3dv((Double*)v);
+            Delegates.glTexCoord3d((Double)s, (Double)t, (Double)r);
             #if DEBUG
             }
             #endif
@@ -68214,6 +68190,30 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the current texture coordinates
+        /// </summary>
+        /// <param name="s">
+        /// <para>
+        /// Specify s, t, r, and q texture coordinates. Not all parameters are present in all forms of the command.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord3dv")]
+        public static 
+        unsafe void TexCoord3(Double* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glTexCoord3dv((Double*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -68237,6 +68237,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the current texture coordinates
+        /// </summary>
+        /// <param name="s">
+        /// <para>
+        /// Specify s, t, r, and q texture coordinates. Not all parameters are present in all forms of the command.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord3fv")]
+        public static 
+        void TexCoord3(Single[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* v_ptr = v)
+                {
+                    Delegates.glTexCoord3fv((Single*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -68290,35 +68319,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current texture coordinates
-        /// </summary>
-        /// <param name="s">
-        /// <para>
-        /// Specify s, t, r, and q texture coordinates. Not all parameters are present in all forms of the command.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord3fv")]
-        public static 
-        void TexCoord3(Single[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* v_ptr = v)
-                {
-                    Delegates.glTexCoord3fv((Single*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -68342,30 +68342,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current texture coordinates
-        /// </summary>
-        /// <param name="s">
-        /// <para>
-        /// Specify s, t, r, and q texture coordinates. Not all parameters are present in all forms of the command.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord3iv")]
-        public static 
-        unsafe void TexCoord3(Int32* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glTexCoord3iv((Int32*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -68432,15 +68408,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord3s")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord3iv")]
         public static 
-        void TexCoord3(Int16 s, Int16 t, Int16 r)
+        unsafe void TexCoord3(Int32* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glTexCoord3s((Int16)s, (Int16)t, (Int16)r);
+            Delegates.glTexCoord3iv((Int32*)v);
             #if DEBUG
             }
             #endif
@@ -68455,16 +68432,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord3sv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord3s")]
         public static 
-        unsafe void TexCoord3(Int16* v)
+        void TexCoord3(Int16 s, Int16 t, Int16 r)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glTexCoord3sv((Int16*)v);
+            Delegates.glTexCoord3s((Int16)s, (Int16)t, (Int16)r);
             #if DEBUG
             }
             #endif
@@ -68537,15 +68513,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord4d")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord3sv")]
         public static 
-        void TexCoord4(Double s, Double t, Double r, Double q)
+        unsafe void TexCoord3(Int16* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glTexCoord4d((Double)s, (Double)t, (Double)r, (Double)q);
+            Delegates.glTexCoord3sv((Int16*)v);
             #if DEBUG
             }
             #endif
@@ -68560,16 +68537,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord4dv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord4d")]
         public static 
-        unsafe void TexCoord4(Double* v)
+        void TexCoord4(Double s, Double t, Double r, Double q)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glTexCoord4dv((Double*)v);
+            Delegates.glTexCoord4d((Double)s, (Double)t, (Double)r, (Double)q);
             #if DEBUG
             }
             #endif
@@ -68634,6 +68610,30 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the current texture coordinates
+        /// </summary>
+        /// <param name="s">
+        /// <para>
+        /// Specify s, t, r, and q texture coordinates. Not all parameters are present in all forms of the command.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord4dv")]
+        public static 
+        unsafe void TexCoord4(Double* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glTexCoord4dv((Double*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -68657,6 +68657,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set the current texture coordinates
+        /// </summary>
+        /// <param name="s">
+        /// <para>
+        /// Specify s, t, r, and q texture coordinates. Not all parameters are present in all forms of the command.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord4fv")]
+        public static 
+        void TexCoord4(Single[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* v_ptr = v)
+                {
+                    Delegates.glTexCoord4fv((Single*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -68710,35 +68739,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current texture coordinates
-        /// </summary>
-        /// <param name="s">
-        /// <para>
-        /// Specify s, t, r, and q texture coordinates. Not all parameters are present in all forms of the command.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord4fv")]
-        public static 
-        void TexCoord4(Single[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* v_ptr = v)
-                {
-                    Delegates.glTexCoord4fv((Single*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -68762,30 +68762,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set the current texture coordinates
-        /// </summary>
-        /// <param name="s">
-        /// <para>
-        /// Specify s, t, r, and q texture coordinates. Not all parameters are present in all forms of the command.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord4iv")]
-        public static 
-        unsafe void TexCoord4(Int32* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glTexCoord4iv((Int32*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set the current texture coordinates
         /// </summary>
@@ -68852,15 +68828,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord4s")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord4iv")]
         public static 
-        void TexCoord4(Int16 s, Int16 t, Int16 r, Int16 q)
+        unsafe void TexCoord4(Int32* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glTexCoord4s((Int16)s, (Int16)t, (Int16)r, (Int16)q);
+            Delegates.glTexCoord4iv((Int32*)v);
             #if DEBUG
             }
             #endif
@@ -68875,16 +68852,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify s, t, r, and q texture coordinates. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord4sv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord4s")]
         public static 
-        unsafe void TexCoord4(Int16* v)
+        void TexCoord4(Int16 s, Int16 t, Int16 r, Int16 q)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glTexCoord4sv((Int16*)v);
+            Delegates.glTexCoord4s((Int16)s, (Int16)t, (Int16)r, (Int16)q);
             #if DEBUG
             }
             #endif
@@ -68950,47 +68926,23 @@ namespace OpenTK.Graphics.OpenGL
 
         
         /// <summary>
-        /// Define an array of texture coordinates
+        /// Set the current texture coordinates
         /// </summary>
-        /// <param name="size">
+        /// <param name="s">
         /// <para>
-        /// Specifies the number of coordinates per array element. Must be 1, 2, 3, or 4. The initial value is 4.
+        /// Specify s, t, r, and q texture coordinates. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the data type of each texture coordinate. Symbolic constants GL_SHORT, GL_INT, GL_FLOAT, or GL_DOUBLE are accepted. The initial value is GL_FLOAT.
-        /// </para>
-        /// </param>
-        /// <param name="stride">
-        /// <para>
-        /// Specifies the byte offset between consecutive texture coordinate sets. If stride is 0, the array elements are understood to be tightly packed. The initial value is 0.
-        /// </para>
-        /// </param>
-        /// <param name="pointer">
-        /// <para>
-        /// Specifies a pointer to the first coordinate of the first texture coordinate set in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glTexCoordPointer")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexCoord4sv")]
         public static 
-        void TexCoordPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T3 pointer)
-            where T3 : struct
+        unsafe void TexCoord4(Int16* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glTexCoordPointer((Int32)size, (OpenTK.Graphics.OpenGL.TexCoordPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                pointer = (T3)pointer_ptr.Target;
-            }
-            finally
-            {
-                pointer_ptr.Free();
-            }
+            Delegates.glTexCoord4sv((Int16*)v);
             #if DEBUG
             }
             #endif
@@ -69022,7 +68974,45 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glTexCoordPointer")]
         public static 
-        void TexCoordPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[,,] pointer)
+        void TexCoordPointer(Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, IntPtr pointer)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glTexCoordPointer((Int32)size, (OpenTK.Graphics.OpenGL.TexCoordPointerType)type, (Int32)stride, (IntPtr)pointer);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Define an array of texture coordinates
+        /// </summary>
+        /// <param name="size">
+        /// <para>
+        /// Specifies the number of coordinates per array element. Must be 1, 2, 3, or 4. The initial value is 4.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the data type of each texture coordinate. Symbolic constants GL_SHORT, GL_INT, GL_FLOAT, or GL_DOUBLE are accepted. The initial value is GL_FLOAT.
+        /// </para>
+        /// </param>
+        /// <param name="stride">
+        /// <para>
+        /// Specifies the byte offset between consecutive texture coordinate sets. If stride is 0, the array elements are understood to be tightly packed. The initial value is 0.
+        /// </para>
+        /// </param>
+        /// <param name="pointer">
+        /// <para>
+        /// Specifies a pointer to the first coordinate of the first texture coordinate set in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glTexCoordPointer")]
+        public static 
+        void TexCoordPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[] pointer)
             where T3 : struct
         {
             #if DEBUG
@@ -69116,7 +69106,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glTexCoordPointer")]
         public static 
-        void TexCoordPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[] pointer)
+        void TexCoordPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[,,] pointer)
             where T3 : struct
         {
             #if DEBUG
@@ -69163,13 +69153,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glTexCoordPointer")]
         public static 
-        void TexCoordPointer(Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, IntPtr pointer)
+        void TexCoordPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T3 pointer)
+            where T3 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glTexCoordPointer((Int32)size, (OpenTK.Graphics.OpenGL.TexCoordPointerType)type, (Int32)stride, (IntPtr)pointer);
+            GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glTexCoordPointer((Int32)size, (OpenTK.Graphics.OpenGL.TexCoordPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                pointer = (T3)pointer_ptr.Target;
+            }
+            finally
+            {
+                pointer_ptr.Free();
+            }
             #if DEBUG
             }
             #endif
@@ -69209,40 +69209,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set texture environment parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies a texture environment. May be GL_TEXTURE_ENV, GL_TEXTURE_FILTER_CONTROL or GL_POINT_SPRITE.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the symbolic name of a single-valued texture environment parameter. May be either GL_TEXTURE_ENV_MODE, GL_TEXTURE_LOD_BIAS, GL_COMBINE_RGB, GL_COMBINE_ALPHA, GL_SRC0_RGB, GL_SRC1_RGB, GL_SRC2_RGB, GL_SRC0_ALPHA, GL_SRC1_ALPHA, GL_SRC2_ALPHA, GL_OPERAND0_RGB, GL_OPERAND1_RGB, GL_OPERAND2_RGB, GL_OPERAND0_ALPHA, GL_OPERAND1_ALPHA, GL_OPERAND2_ALPHA, GL_RGB_SCALE, GL_ALPHA_SCALE, or GL_COORD_REPLACE.
-        /// </para>
-        /// </param>
-        /// <param name="param">
-        /// <para>
-        /// Specifies a single symbolic constant, one of GL_ADD, GL_ADD_SIGNED, GL_INTERPOLATE, GL_MODULATE, GL_DECAL, GL_BLEND, GL_REPLACE, GL_SUBTRACT, GL_COMBINE, GL_TEXTURE, GL_CONSTANT, GL_PRIMARY_COLOR, GL_PREVIOUS, GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR, GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, a single boolean value for the point sprite texture coordinate replacement, a single floating-point value for the texture level-of-detail bias, or 1.0, 2.0, or 4.0 when specifying the GL_RGB_SCALE or GL_ALPHA_SCALE.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexEnvfv")]
-        public static 
-        unsafe void TexEnv(OpenTK.Graphics.OpenGL.TextureEnvTarget target, OpenTK.Graphics.OpenGL.TextureEnvParameter pname, Single* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glTexEnvfv((OpenTK.Graphics.OpenGL.TextureEnvTarget)target, (OpenTK.Graphics.OpenGL.TextureEnvParameter)pname, (Single*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set texture environment parameters
         /// </summary>
@@ -69300,15 +69266,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies a single symbolic constant, one of GL_ADD, GL_ADD_SIGNED, GL_INTERPOLATE, GL_MODULATE, GL_DECAL, GL_BLEND, GL_REPLACE, GL_SUBTRACT, GL_COMBINE, GL_TEXTURE, GL_CONSTANT, GL_PRIMARY_COLOR, GL_PREVIOUS, GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR, GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, a single boolean value for the point sprite texture coordinate replacement, a single floating-point value for the texture level-of-detail bias, or 1.0, 2.0, or 4.0 when specifying the GL_RGB_SCALE or GL_ALPHA_SCALE.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexEnvi")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexEnvfv")]
         public static 
-        void TexEnv(OpenTK.Graphics.OpenGL.TextureEnvTarget target, OpenTK.Graphics.OpenGL.TextureEnvParameter pname, Int32 param)
+        unsafe void TexEnv(OpenTK.Graphics.OpenGL.TextureEnvTarget target, OpenTK.Graphics.OpenGL.TextureEnvParameter pname, Single* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glTexEnvi((OpenTK.Graphics.OpenGL.TextureEnvTarget)target, (OpenTK.Graphics.OpenGL.TextureEnvParameter)pname, (Int32)param);
+            Delegates.glTexEnvfv((OpenTK.Graphics.OpenGL.TextureEnvTarget)target, (OpenTK.Graphics.OpenGL.TextureEnvParameter)pname, (Single*)@params);
             #if DEBUG
             }
             #endif
@@ -69333,16 +69300,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies a single symbolic constant, one of GL_ADD, GL_ADD_SIGNED, GL_INTERPOLATE, GL_MODULATE, GL_DECAL, GL_BLEND, GL_REPLACE, GL_SUBTRACT, GL_COMBINE, GL_TEXTURE, GL_CONSTANT, GL_PRIMARY_COLOR, GL_PREVIOUS, GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR, GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, a single boolean value for the point sprite texture coordinate replacement, a single floating-point value for the texture level-of-detail bias, or 1.0, 2.0, or 4.0 when specifying the GL_RGB_SCALE or GL_ALPHA_SCALE.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexEnviv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexEnvi")]
         public static 
-        unsafe void TexEnv(OpenTK.Graphics.OpenGL.TextureEnvTarget target, OpenTK.Graphics.OpenGL.TextureEnvParameter pname, Int32* @params)
+        void TexEnv(OpenTK.Graphics.OpenGL.TextureEnvTarget target, OpenTK.Graphics.OpenGL.TextureEnvParameter pname, Int32 param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glTexEnviv((OpenTK.Graphics.OpenGL.TextureEnvTarget)target, (OpenTK.Graphics.OpenGL.TextureEnvParameter)pname, (Int32*)@params);
+            Delegates.glTexEnvi((OpenTK.Graphics.OpenGL.TextureEnvTarget)target, (OpenTK.Graphics.OpenGL.TextureEnvParameter)pname, (Int32)param);
             #if DEBUG
             }
             #endif
@@ -69387,6 +69353,40 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        
+        /// <summary>
+        /// Set texture environment parameters
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies a texture environment. May be GL_TEXTURE_ENV, GL_TEXTURE_FILTER_CONTROL or GL_POINT_SPRITE.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the symbolic name of a single-valued texture environment parameter. May be either GL_TEXTURE_ENV_MODE, GL_TEXTURE_LOD_BIAS, GL_COMBINE_RGB, GL_COMBINE_ALPHA, GL_SRC0_RGB, GL_SRC1_RGB, GL_SRC2_RGB, GL_SRC0_ALPHA, GL_SRC1_ALPHA, GL_SRC2_ALPHA, GL_OPERAND0_RGB, GL_OPERAND1_RGB, GL_OPERAND2_RGB, GL_OPERAND0_ALPHA, GL_OPERAND1_ALPHA, GL_OPERAND2_ALPHA, GL_RGB_SCALE, GL_ALPHA_SCALE, or GL_COORD_REPLACE.
+        /// </para>
+        /// </param>
+        /// <param name="param">
+        /// <para>
+        /// Specifies a single symbolic constant, one of GL_ADD, GL_ADD_SIGNED, GL_INTERPOLATE, GL_MODULATE, GL_DECAL, GL_BLEND, GL_REPLACE, GL_SUBTRACT, GL_COMBINE, GL_TEXTURE, GL_CONSTANT, GL_PRIMARY_COLOR, GL_PREVIOUS, GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR, GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, a single boolean value for the point sprite texture coordinate replacement, a single floating-point value for the texture level-of-detail bias, or 1.0, 2.0, or 4.0 when specifying the GL_RGB_SCALE or GL_ALPHA_SCALE.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexEnviv")]
+        public static 
+        unsafe void TexEnv(OpenTK.Graphics.OpenGL.TextureEnvTarget target, OpenTK.Graphics.OpenGL.TextureEnvParameter pname, Int32* @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glTexEnviv((OpenTK.Graphics.OpenGL.TextureEnvTarget)target, (OpenTK.Graphics.OpenGL.TextureEnvParameter)pname, (Int32*)@params);
+            #if DEBUG
+            }
+            #endif
+        }
+
         [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexGend")]
         public static 
         void TexGend(OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, Double param)
@@ -69402,40 +69402,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Control the generation of texture coordinates
-        /// </summary>
-        /// <param name="coord">
-        /// <para>
-        /// Specifies a texture coordinate. Must be one of GL_S, GL_T, GL_R, or GL_Q.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the symbolic name of the texture-coordinate generation function. Must be GL_TEXTURE_GEN_MODE.
-        /// </para>
-        /// </param>
-        /// <param name="param">
-        /// <para>
-        /// Specifies a single-valued texture generation parameter, one of GL_OBJECT_LINEAR, GL_EYE_LINEAR, GL_SPHERE_MAP, GL_NORMAL_MAP, or GL_REFLECTION_MAP.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexGendv")]
-        public static 
-        unsafe void TexGen(OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, Double* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glTexGendv((OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Double*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Control the generation of texture coordinates
         /// </summary>
@@ -69532,15 +69498,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies a single-valued texture generation parameter, one of GL_OBJECT_LINEAR, GL_EYE_LINEAR, GL_SPHERE_MAP, GL_NORMAL_MAP, or GL_REFLECTION_MAP.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexGenf")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexGendv")]
         public static 
-        void TexGen(OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, Single param)
+        unsafe void TexGen(OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, Double* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glTexGenf((OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Single)param);
+            Delegates.glTexGendv((OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Double*)@params);
             #if DEBUG
             }
             #endif
@@ -69565,16 +69532,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies a single-valued texture generation parameter, one of GL_OBJECT_LINEAR, GL_EYE_LINEAR, GL_SPHERE_MAP, GL_NORMAL_MAP, or GL_REFLECTION_MAP.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexGenfv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexGenf")]
         public static 
-        unsafe void TexGen(OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, Single* @params)
+        void TexGen(OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, Single param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glTexGenfv((OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Single*)@params);
+            Delegates.glTexGenf((OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Single)param);
             #if DEBUG
             }
             #endif
@@ -69638,15 +69604,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies a single-valued texture generation parameter, one of GL_OBJECT_LINEAR, GL_EYE_LINEAR, GL_SPHERE_MAP, GL_NORMAL_MAP, or GL_REFLECTION_MAP.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexGeni")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexGenfv")]
         public static 
-        void TexGen(OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, Int32 param)
+        unsafe void TexGen(OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, Single* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glTexGeni((OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Int32)param);
+            Delegates.glTexGenfv((OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Single*)@params);
             #if DEBUG
             }
             #endif
@@ -69671,16 +69638,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies a single-valued texture generation parameter, one of GL_OBJECT_LINEAR, GL_EYE_LINEAR, GL_SPHERE_MAP, GL_NORMAL_MAP, or GL_REFLECTION_MAP.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexGeniv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexGeni")]
         public static 
-        unsafe void TexGen(OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, Int32* @params)
+        void TexGen(OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, Int32 param)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glTexGeniv((OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Int32*)@params);
+            Delegates.glTexGeni((OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Int32)param);
             #if DEBUG
             }
             #endif
@@ -69727,67 +69693,33 @@ namespace OpenTK.Graphics.OpenGL
 
         
         /// <summary>
-        /// Specify a one-dimensional texture image
+        /// Control the generation of texture coordinates
         /// </summary>
-        /// <param name="target">
+        /// <param name="coord">
         /// <para>
-        /// Specifies the target texture. Must be GL_TEXTURE_1D or GL_PROXY_TEXTURE_1D.
+        /// Specifies a texture coordinate. Must be one of GL_S, GL_T, GL_R, or GL_Q.
         /// </para>
         /// </param>
-        /// <param name="level">
+        /// <param name="pname">
         /// <para>
-        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
+        /// Specifies the symbolic name of the texture-coordinate generation function. Must be GL_TEXTURE_GEN_MODE.
         /// </para>
         /// </param>
-        /// <param name="internalFormat">
+        /// <param name="param">
         /// <para>
-        /// Specifies the number of color components in the texture. Must be 1, 2, 3, or 4, or one of the following symbolic constants: GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_COMPRESSED_ALPHA, GL_COMPRESSED_LUMINANCE, GL_COMPRESSED_LUMINANCE_ALPHA, GL_COMPRESSED_INTENSITY, GL_COMPRESSED_RGB, GL_COMPRESSED_RGBA, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT24, GL_DEPTH_COMPONENT32, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, GL_RGBA16, GL_SLUMINANCE, GL_SLUMINANCE8, GL_SLUMINANCE_ALPHA, GL_SLUMINANCE8_ALPHA8, GL_SRGB, GL_SRGB8, GL_SRGB_ALPHA, or GL_SRGB8_ALPHA8.
+        /// Specifies a single-valued texture generation parameter, one of GL_OBJECT_LINEAR, GL_EYE_LINEAR, GL_SPHERE_MAP, GL_NORMAL_MAP, or GL_REFLECTION_MAP.
         /// </para>
         /// </param>
-        /// <param name="width">
-        /// <para>
-        /// Specifies the width of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup n + 2 ( border ) for some integer . All implementations support texture images that are at least 64 texels wide. The height of the 1D texture image is 1.
-        /// </para>
-        /// </param>
-        /// <param name="border">
-        /// <para>
-        /// Specifies the width of the border. Must be either 0 or 1.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Specifies the format of the pixel data. The following symbolic values are accepted: GL_COLOR_INDEX, GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the data type of the pixel data. The following symbolic values are accepted: GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the image data in memory.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glTexImage1D")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glTexGeniv")]
         public static 
-        void TexImage1D<T7>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T7 pixels)
-            where T7 : struct
+        unsafe void TexGen(OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glTexImage1D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                pixels = (T7)pixels_ptr.Target;
-            }
-            finally
-            {
-                pixels_ptr.Free();
-            }
+            Delegates.glTexGeniv((OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -69839,7 +69771,65 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glTexImage1D")]
         public static 
-        void TexImage1D<T7>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T7[,,] pixels)
+        void TexImage1D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glTexImage1D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Specify a one-dimensional texture image
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target texture. Must be GL_TEXTURE_1D or GL_PROXY_TEXTURE_1D.
+        /// </para>
+        /// </param>
+        /// <param name="level">
+        /// <para>
+        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
+        /// </para>
+        /// </param>
+        /// <param name="internalFormat">
+        /// <para>
+        /// Specifies the number of color components in the texture. Must be 1, 2, 3, or 4, or one of the following symbolic constants: GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_COMPRESSED_ALPHA, GL_COMPRESSED_LUMINANCE, GL_COMPRESSED_LUMINANCE_ALPHA, GL_COMPRESSED_INTENSITY, GL_COMPRESSED_RGB, GL_COMPRESSED_RGBA, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT24, GL_DEPTH_COMPONENT32, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, GL_RGBA16, GL_SLUMINANCE, GL_SLUMINANCE8, GL_SLUMINANCE_ALPHA, GL_SLUMINANCE8_ALPHA8, GL_SRGB, GL_SRGB8, GL_SRGB_ALPHA, or GL_SRGB8_ALPHA8.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// Specifies the width of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup n + 2 ( border ) for some integer . All implementations support texture images that are at least 64 texels wide. The height of the 1D texture image is 1.
+        /// </para>
+        /// </param>
+        /// <param name="border">
+        /// <para>
+        /// Specifies the width of the border. Must be either 0 or 1.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Specifies the format of the pixel data. The following symbolic values are accepted: GL_COLOR_INDEX, GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the data type of the pixel data. The following symbolic values are accepted: GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the image data in memory.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glTexImage1D")]
+        public static 
+        void TexImage1D<T7>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T7[] pixels)
             where T7 : struct
         {
             #if DEBUG
@@ -69973,7 +69963,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glTexImage1D")]
         public static 
-        void TexImage1D<T7>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T7[] pixels)
+        void TexImage1D<T7>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T7[,,] pixels)
             where T7 : struct
         {
             #if DEBUG
@@ -70040,71 +70030,8 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glTexImage1D")]
         public static 
-        void TexImage1D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glTexImage1D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Specify a two-dimensional texture image
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target texture. Must be GL_TEXTURE_2D, GL_PROXY_TEXTURE_2D, GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, or GL_PROXY_TEXTURE_CUBE_MAP.
-        /// </para>
-        /// </param>
-        /// <param name="level">
-        /// <para>
-        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
-        /// </para>
-        /// </param>
-        /// <param name="internalFormat">
-        /// <para>
-        /// Specifies the number of color components in the texture. Must be 1, 2, 3, or 4, or one of the following symbolic constants: GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_COMPRESSED_ALPHA, GL_COMPRESSED_LUMINANCE, GL_COMPRESSED_LUMINANCE_ALPHA, GL_COMPRESSED_INTENSITY, GL_COMPRESSED_RGB, GL_COMPRESSED_RGBA, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT24, GL_DEPTH_COMPONENT32, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, GL_RGBA16, GL_SLUMINANCE, GL_SLUMINANCE8, GL_SLUMINANCE_ALPHA, GL_SLUMINANCE8_ALPHA8, GL_SRGB, GL_SRGB8, GL_SRGB_ALPHA, or GL_SRGB8_ALPHA8.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// Specifies the width of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup n + 2 ( border ) for some integer . All implementations support texture images that are at least 64 texels wide.
-        /// </para>
-        /// </param>
-        /// <param name="height">
-        /// <para>
-        /// Specifies the height of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup m + 2 ( border ) for some integer . All implementations support texture images that are at least 64 texels high.
-        /// </para>
-        /// </param>
-        /// <param name="border">
-        /// <para>
-        /// Specifies the width of the border. Must be either 0 or 1.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Specifies the format of the pixel data. The following symbolic values are accepted: GL_COLOR_INDEX, GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the data type of the pixel data. The following symbolic values are accepted: GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the image data in memory.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glTexImage2D")]
-        public static 
-        void TexImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T8 pixels)
-            where T8 : struct
+        void TexImage1D<T7>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T7 pixels)
+            where T7 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -70113,8 +70040,8 @@ namespace OpenTK.Graphics.OpenGL
             GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
             try
             {
-                Delegates.glTexImage2D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                pixels = (T8)pixels_ptr.Target;
+                Delegates.glTexImage1D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                pixels = (T7)pixels_ptr.Target;
             }
             finally
             {
@@ -70176,7 +70103,70 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glTexImage2D")]
         public static 
-        void TexImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T8[,,] pixels)
+        void TexImage2D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glTexImage2D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Specify a two-dimensional texture image
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target texture. Must be GL_TEXTURE_2D, GL_PROXY_TEXTURE_2D, GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, or GL_PROXY_TEXTURE_CUBE_MAP.
+        /// </para>
+        /// </param>
+        /// <param name="level">
+        /// <para>
+        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
+        /// </para>
+        /// </param>
+        /// <param name="internalFormat">
+        /// <para>
+        /// Specifies the number of color components in the texture. Must be 1, 2, 3, or 4, or one of the following symbolic constants: GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_COMPRESSED_ALPHA, GL_COMPRESSED_LUMINANCE, GL_COMPRESSED_LUMINANCE_ALPHA, GL_COMPRESSED_INTENSITY, GL_COMPRESSED_RGB, GL_COMPRESSED_RGBA, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT24, GL_DEPTH_COMPONENT32, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, GL_RGBA16, GL_SLUMINANCE, GL_SLUMINANCE8, GL_SLUMINANCE_ALPHA, GL_SLUMINANCE8_ALPHA8, GL_SRGB, GL_SRGB8, GL_SRGB_ALPHA, or GL_SRGB8_ALPHA8.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// Specifies the width of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup n + 2 ( border ) for some integer . All implementations support texture images that are at least 64 texels wide.
+        /// </para>
+        /// </param>
+        /// <param name="height">
+        /// <para>
+        /// Specifies the height of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup m + 2 ( border ) for some integer . All implementations support texture images that are at least 64 texels high.
+        /// </para>
+        /// </param>
+        /// <param name="border">
+        /// <para>
+        /// Specifies the width of the border. Must be either 0 or 1.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Specifies the format of the pixel data. The following symbolic values are accepted: GL_COLOR_INDEX, GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the data type of the pixel data. The following symbolic values are accepted: GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the image data in memory.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glTexImage2D")]
+        public static 
+        void TexImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T8[] pixels)
             where T8 : struct
         {
             #if DEBUG
@@ -70320,7 +70310,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glTexImage2D")]
         public static 
-        void TexImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T8[] pixels)
+        void TexImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T8[,,] pixels)
             where T8 : struct
         {
             #if DEBUG
@@ -70392,13 +70382,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glTexImage2D")]
         public static 
-        void TexImage2D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+        void TexImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T8 pixels)
+            where T8 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glTexImage2D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+            GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glTexImage2D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                pixels = (T8)pixels_ptr.Target;
+            }
+            finally
+            {
+                pixels_ptr.Free();
+            }
             #if DEBUG
             }
             #endif
@@ -70474,23 +70474,13 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12", Version = "1.2", EntryPoint = "glTexImage3D")]
         public static 
-        void TexImage3D<T9>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T9 pixels)
-            where T9 : struct
+        void TexImage3D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glTexImage3D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                pixels = (T9)pixels_ptr.Target;
-            }
-            finally
-            {
-                pixels_ptr.Free();
-            }
+            Delegates.glTexImage3D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
             #if DEBUG
             }
             #endif
@@ -70552,7 +70542,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12", Version = "1.2", EntryPoint = "glTexImage3D")]
         public static 
-        void TexImage3D<T9>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[,,] pixels)
+        void TexImage3D<T9>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[] pixels)
             where T9 : struct
         {
             #if DEBUG
@@ -70706,7 +70696,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12", Version = "1.2", EntryPoint = "glTexImage3D")]
         public static 
-        void TexImage3D<T9>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[] pixels)
+        void TexImage3D<T9>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[,,] pixels)
             where T9 : struct
         {
             #if DEBUG
@@ -70783,13 +70773,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12", Version = "1.2", EntryPoint = "glTexImage3D")]
         public static 
-        void TexImage3D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+        void TexImage3D<T9>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T9 pixels)
+            where T9 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glTexImage3D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+            GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glTexImage3D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                pixels = (T9)pixels_ptr.Target;
+            }
+            finally
+            {
+                pixels_ptr.Free();
+            }
             #if DEBUG
             }
             #endif
@@ -70843,40 +70843,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Set texture parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target texture, which must be either GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, or GL_TEXTURE_CUBE_MAP.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the symbolic name of a single-valued texture parameter. pname can be one of the following: GL_TEXTURE_MIN_FILTER, GL_TEXTURE_MAG_FILTER, GL_TEXTURE_MIN_LOD, GL_TEXTURE_MAX_LOD, GL_TEXTURE_BASE_LEVEL, GL_TEXTURE_MAX_LEVEL, GL_TEXTURE_WRAP_S, GL_TEXTURE_WRAP_T, GL_TEXTURE_WRAP_R, GL_TEXTURE_PRIORITY, GL_TEXTURE_COMPARE_MODE, GL_TEXTURE_COMPARE_FUNC, GL_DEPTH_TEXTURE_MODE, or GL_GENERATE_MIPMAP.
-        /// </para>
-        /// </param>
-        /// <param name="param">
-        /// <para>
-        /// Specifies the value of pname.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glTexParameterfv")]
-        public static 
-        unsafe void TexParameter(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Single* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glTexParameterfv((OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.TextureParameterName)pname, (Single*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Set texture parameters
         /// </summary>
@@ -70916,6 +70882,40 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Set texture parameters
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target texture, which must be either GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, or GL_TEXTURE_CUBE_MAP.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the symbolic name of a single-valued texture parameter. pname can be one of the following: GL_TEXTURE_MIN_FILTER, GL_TEXTURE_MAG_FILTER, GL_TEXTURE_MIN_LOD, GL_TEXTURE_MAX_LOD, GL_TEXTURE_BASE_LEVEL, GL_TEXTURE_MAX_LEVEL, GL_TEXTURE_WRAP_S, GL_TEXTURE_WRAP_T, GL_TEXTURE_WRAP_R, GL_TEXTURE_PRIORITY, GL_TEXTURE_COMPARE_MODE, GL_TEXTURE_COMPARE_FUNC, GL_DEPTH_TEXTURE_MODE, or GL_GENERATE_MIPMAP.
+        /// </para>
+        /// </param>
+        /// <param name="param">
+        /// <para>
+        /// Specifies the value of pname.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glTexParameterfv")]
+        public static 
+        unsafe void TexParameter(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Single* @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glTexParameterfv((OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.TextureParameterName)pname, (Single*)@params);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Set texture parameters
         /// </summary>
@@ -70948,21 +70948,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glTexParameterIiv")]
-        public static 
-        unsafe void TexParameterI(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Int32* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glTexParameterIiv((OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.TextureParameterName)pname, (Int32*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glTexParameterIiv")]
         public static 
         void TexParameterI(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Int32[] @params)
@@ -71003,6 +70988,42 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glTexParameterIiv")]
+        public static 
+        unsafe void TexParameterI(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Int32* @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glTexParameterIiv((OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.TextureParameterName)pname, (Int32*)@params);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glTexParameterIuiv")]
+        public static 
+        void TexParameterI(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, UInt32[] @params)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* @params_ptr = @params)
+                {
+                    Delegates.glTexParameterIuiv((OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.TextureParameterName)pname, (UInt32*)@params_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glTexParameterIuiv")]
         public static 
@@ -71039,61 +71060,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glTexParameterIuiv")]
-        public static 
-        void TexParameterI(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, UInt32[] @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* @params_ptr = @params)
-                {
-                    Delegates.glTexParameterIuiv((OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.TextureParameterName)pname, (UInt32*)@params_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Set texture parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target texture, which must be either GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, or GL_TEXTURE_CUBE_MAP.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the symbolic name of a single-valued texture parameter. pname can be one of the following: GL_TEXTURE_MIN_FILTER, GL_TEXTURE_MAG_FILTER, GL_TEXTURE_MIN_LOD, GL_TEXTURE_MAX_LOD, GL_TEXTURE_BASE_LEVEL, GL_TEXTURE_MAX_LEVEL, GL_TEXTURE_WRAP_S, GL_TEXTURE_WRAP_T, GL_TEXTURE_WRAP_R, GL_TEXTURE_PRIORITY, GL_TEXTURE_COMPARE_MODE, GL_TEXTURE_COMPARE_FUNC, GL_DEPTH_TEXTURE_MODE, or GL_GENERATE_MIPMAP.
-        /// </para>
-        /// </param>
-        /// <param name="param">
-        /// <para>
-        /// Specifies the value of pname.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glTexParameteriv")]
-        public static 
-        unsafe void TexParameter(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Int32* @params)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glTexParameteriv((OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.TextureParameterName)pname, (Int32*)@params);
-            #if DEBUG
-            }
-            #endif
-        }
-
         
         /// <summary>
         /// Set texture parameters
@@ -71135,62 +71101,33 @@ namespace OpenTK.Graphics.OpenGL
 
         
         /// <summary>
-        /// Specify a one-dimensional texture subimage
+        /// Set texture parameters
         /// </summary>
         /// <param name="target">
         /// <para>
-        /// Specifies the target texture. Must be GL_TEXTURE_1D.
+        /// Specifies the target texture, which must be either GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, or GL_TEXTURE_CUBE_MAP.
         /// </para>
         /// </param>
-        /// <param name="level">
+        /// <param name="pname">
         /// <para>
-        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
+        /// Specifies the symbolic name of a single-valued texture parameter. pname can be one of the following: GL_TEXTURE_MIN_FILTER, GL_TEXTURE_MAG_FILTER, GL_TEXTURE_MIN_LOD, GL_TEXTURE_MAX_LOD, GL_TEXTURE_BASE_LEVEL, GL_TEXTURE_MAX_LEVEL, GL_TEXTURE_WRAP_S, GL_TEXTURE_WRAP_T, GL_TEXTURE_WRAP_R, GL_TEXTURE_PRIORITY, GL_TEXTURE_COMPARE_MODE, GL_TEXTURE_COMPARE_FUNC, GL_DEPTH_TEXTURE_MODE, or GL_GENERATE_MIPMAP.
         /// </para>
         /// </param>
-        /// <param name="xoffset">
+        /// <param name="param">
         /// <para>
-        /// Specifies a texel offset in the x direction within the texture array.
+        /// Specifies the value of pname.
         /// </para>
         /// </param>
-        /// <param name="width">
-        /// <para>
-        /// Specifies the width of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Specifies the format of the pixel data. The following symbolic values are accepted: GL_COLOR_INDEX, GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the data type of the pixel data. The following symbolic values are accepted: GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the image data in memory.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glTexSubImage1D")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10", Version = "1.0", EntryPoint = "glTexParameteriv")]
         public static 
-        void TexSubImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T6 pixels)
-            where T6 : struct
+        unsafe void TexParameter(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Int32* @params)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glTexSubImage1D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                pixels = (T6)pixels_ptr.Target;
-            }
-            finally
-            {
-                pixels_ptr.Free();
-            }
+            Delegates.glTexParameteriv((OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.TextureParameterName)pname, (Int32*)@params);
             #if DEBUG
             }
             #endif
@@ -71237,7 +71174,60 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glTexSubImage1D")]
         public static 
-        void TexSubImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[,,] pixels)
+        void TexSubImage1D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glTexSubImage1D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Specify a one-dimensional texture subimage
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target texture. Must be GL_TEXTURE_1D.
+        /// </para>
+        /// </param>
+        /// <param name="level">
+        /// <para>
+        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
+        /// </para>
+        /// </param>
+        /// <param name="xoffset">
+        /// <para>
+        /// Specifies a texel offset in the x direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// Specifies the width of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Specifies the format of the pixel data. The following symbolic values are accepted: GL_COLOR_INDEX, GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the data type of the pixel data. The following symbolic values are accepted: GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the image data in memory.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glTexSubImage1D")]
+        public static 
+        void TexSubImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[] pixels)
             where T6 : struct
         {
             #if DEBUG
@@ -71361,7 +71351,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glTexSubImage1D")]
         public static 
-        void TexSubImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[] pixels)
+        void TexSubImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[,,] pixels)
             where T6 : struct
         {
             #if DEBUG
@@ -71423,71 +71413,8 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glTexSubImage1D")]
         public static 
-        void TexSubImage1D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glTexSubImage1D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Specify a two-dimensional texture subimage
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target texture. Must be GL_TEXTURE_2D, GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, or GL_TEXTURE_CUBE_MAP_NEGATIVE_Z.
-        /// </para>
-        /// </param>
-        /// <param name="level">
-        /// <para>
-        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
-        /// </para>
-        /// </param>
-        /// <param name="xoffset">
-        /// <para>
-        /// Specifies a texel offset in the x direction within the texture array.
-        /// </para>
-        /// </param>
-        /// <param name="yoffset">
-        /// <para>
-        /// Specifies a texel offset in the y direction within the texture array.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// Specifies the width of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="height">
-        /// <para>
-        /// Specifies the height of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Specifies the format of the pixel data. The following symbolic values are accepted: GL_COLOR_INDEX, GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the data type of the pixel data. The following symbolic values are accepted: GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the image data in memory.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glTexSubImage2D")]
-        public static 
-        void TexSubImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T8 pixels)
-            where T8 : struct
+        void TexSubImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T6 pixels)
+            where T6 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -71496,8 +71423,8 @@ namespace OpenTK.Graphics.OpenGL
             GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
             try
             {
-                Delegates.glTexSubImage2D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                pixels = (T8)pixels_ptr.Target;
+                Delegates.glTexSubImage1D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                pixels = (T6)pixels_ptr.Target;
             }
             finally
             {
@@ -71559,7 +71486,70 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glTexSubImage2D")]
         public static 
-        void TexSubImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T8[,,] pixels)
+        void TexSubImage2D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glTexSubImage2D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Specify a two-dimensional texture subimage
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target texture. Must be GL_TEXTURE_2D, GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, or GL_TEXTURE_CUBE_MAP_NEGATIVE_Z.
+        /// </para>
+        /// </param>
+        /// <param name="level">
+        /// <para>
+        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
+        /// </para>
+        /// </param>
+        /// <param name="xoffset">
+        /// <para>
+        /// Specifies a texel offset in the x direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="yoffset">
+        /// <para>
+        /// Specifies a texel offset in the y direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// Specifies the width of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="height">
+        /// <para>
+        /// Specifies the height of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Specifies the format of the pixel data. The following symbolic values are accepted: GL_COLOR_INDEX, GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the data type of the pixel data. The following symbolic values are accepted: GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the image data in memory.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glTexSubImage2D")]
+        public static 
+        void TexSubImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T8[] pixels)
             where T8 : struct
         {
             #if DEBUG
@@ -71703,7 +71693,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glTexSubImage2D")]
         public static 
-        void TexSubImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T8[] pixels)
+        void TexSubImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T8[,,] pixels)
             where T8 : struct
         {
             #if DEBUG
@@ -71775,81 +71765,8 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11", Version = "1.1", EntryPoint = "glTexSubImage2D")]
         public static 
-        void TexSubImage2D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glTexSubImage2D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Specify a three-dimensional texture subimage
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target texture. Must be GL_TEXTURE_3D.
-        /// </para>
-        /// </param>
-        /// <param name="level">
-        /// <para>
-        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
-        /// </para>
-        /// </param>
-        /// <param name="xoffset">
-        /// <para>
-        /// Specifies a texel offset in the x direction within the texture array.
-        /// </para>
-        /// </param>
-        /// <param name="yoffset">
-        /// <para>
-        /// Specifies a texel offset in the y direction within the texture array.
-        /// </para>
-        /// </param>
-        /// <param name="zoffset">
-        /// <para>
-        /// Specifies a texel offset in the z direction within the texture array.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// Specifies the width of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="height">
-        /// <para>
-        /// Specifies the height of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="depth">
-        /// <para>
-        /// Specifies the depth of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Specifies the format of the pixel data. The following symbolic values are accepted: GL_COLOR_INDEX, GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the data type of the pixel data. The following symbolic values are accepted: GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the image data in memory.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version12", Version = "1.2", EntryPoint = "glTexSubImage3D")]
-        public static 
-        void TexSubImage3D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T10 pixels)
-            where T10 : struct
+        void TexSubImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T8 pixels)
+            where T8 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -71858,8 +71775,8 @@ namespace OpenTK.Graphics.OpenGL
             GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
             try
             {
-                Delegates.glTexSubImage3D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                pixels = (T10)pixels_ptr.Target;
+                Delegates.glTexSubImage2D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                pixels = (T8)pixels_ptr.Target;
             }
             finally
             {
@@ -71931,7 +71848,80 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12", Version = "1.2", EntryPoint = "glTexSubImage3D")]
         public static 
-        void TexSubImage3D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T10[,,] pixels)
+        void TexSubImage3D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glTexSubImage3D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Specify a three-dimensional texture subimage
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target texture. Must be GL_TEXTURE_3D.
+        /// </para>
+        /// </param>
+        /// <param name="level">
+        /// <para>
+        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
+        /// </para>
+        /// </param>
+        /// <param name="xoffset">
+        /// <para>
+        /// Specifies a texel offset in the x direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="yoffset">
+        /// <para>
+        /// Specifies a texel offset in the y direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="zoffset">
+        /// <para>
+        /// Specifies a texel offset in the z direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// Specifies the width of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="height">
+        /// <para>
+        /// Specifies the height of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="depth">
+        /// <para>
+        /// Specifies the depth of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Specifies the format of the pixel data. The following symbolic values are accepted: GL_COLOR_INDEX, GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the data type of the pixel data. The following symbolic values are accepted: GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the image data in memory.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version12", Version = "1.2", EntryPoint = "glTexSubImage3D")]
+        public static 
+        void TexSubImage3D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T10[] pixels)
             where T10 : struct
         {
             #if DEBUG
@@ -72095,7 +72085,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12", Version = "1.2", EntryPoint = "glTexSubImage3D")]
         public static 
-        void TexSubImage3D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T10[] pixels)
+        void TexSubImage3D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T10[,,] pixels)
             where T10 : struct
         {
             #if DEBUG
@@ -72177,13 +72167,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version12", Version = "1.2", EntryPoint = "glTexSubImage3D")]
         public static 
-        void TexSubImage3D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+        void TexSubImage3D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T10 pixels)
+            where T10 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glTexSubImage3D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+            GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glTexSubImage3D((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                pixels = (T10)pixels_ptr.Target;
+            }
+            finally
+            {
+                pixels_ptr.Free();
+            }
             #if DEBUG
             }
             #endif
@@ -72293,6 +72293,40 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glUniform1fv")]
+        public static 
+        void Uniform1(Int32 location, Int32 count, Single[] value)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* value_ptr = value)
+                {
+                    Delegates.glUniform1fv((Int32)location, (Int32)count, (Single*)value_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -72356,40 +72390,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glUniform1fv")]
-        public static 
-        void Uniform1(Int32 location, Int32 count, Single[] value)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* value_ptr = value)
-                {
-                    Delegates.glUniform1fv((Int32)location, (Int32)count, (Single*)value_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -72418,35 +72418,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glUniform1iv")]
-        public static 
-        unsafe void Uniform1(Int32 location, Int32 count, Int32* value)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glUniform1iv((Int32)location, (Int32)count, (Int32*)value);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -72515,6 +72486,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glUniform1iv")]
+        public static 
+        unsafe void Uniform1(Int32 location, Int32 count, Int32* value)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glUniform1iv((Int32)location, (Int32)count, (Int32*)value);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -72544,6 +72544,41 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glUniform1uiv")]
+        public static 
+        void Uniform1(Int32 location, Int32 count, UInt32[] value)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* value_ptr = value)
+                {
+                    Delegates.glUniform1uiv((Int32)location, (Int32)count, (UInt32*)value_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -72621,22 +72656,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the new values to be used for the specified uniform variable.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glUniform1uiv")]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glUniform2f")]
         public static 
-        void Uniform1(Int32 location, Int32 count, UInt32[] value)
+        void Uniform2(Int32 location, Single v0, Single v1)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            unsafe
-            {
-                fixed (UInt32* value_ptr = value)
-                {
-                    Delegates.glUniform1uiv((Int32)location, (Int32)count, (UInt32*)value_ptr);
-                }
-            }
+            Delegates.glUniform2f((Int32)location, (Single)v0, (Single)v1);
             #if DEBUG
             }
             #endif
@@ -72656,15 +72684,21 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the new values to be used for the specified uniform variable.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glUniform2f")]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glUniform2fv")]
         public static 
-        void Uniform2(Int32 location, Single v0, Single v1)
+        void Uniform2(Int32 location, Int32 count, Single[] value)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glUniform2f((Int32)location, (Single)v0, (Single)v1);
+            unsafe
+            {
+                fixed (Single* value_ptr = value)
+                {
+                    Delegates.glUniform2fv((Int32)location, (Int32)count, (Single*)value_ptr);
+                }
+            }
             #if DEBUG
             }
             #endif
@@ -72734,40 +72768,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glUniform2fv")]
-        public static 
-        void Uniform2(Int32 location, Int32 count, Single[] value)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* value_ptr = value)
-                {
-                    Delegates.glUniform2fv((Int32)location, (Int32)count, (Single*)value_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -72796,35 +72796,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glUniform2iv")]
-        public static 
-        unsafe void Uniform2(Int32 location, Int32 count, Int32* value)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glUniform2iv((Int32)location, (Int32)count, (Int32*)value);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -72859,6 +72830,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glUniform2iv")]
+        public static 
+        unsafe void Uniform2(Int32 location, Int32 count, Int32* value)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glUniform2iv((Int32)location, (Int32)count, (Int32*)value);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -72888,6 +72888,41 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glUniform2uiv")]
+        public static 
+        void Uniform2(Int32 location, Int32 count, UInt32[] value)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* value_ptr = value)
+                {
+                    Delegates.glUniform2uiv((Int32)location, (Int32)count, (UInt32*)value_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -72965,22 +73000,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the new values to be used for the specified uniform variable.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glUniform2uiv")]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glUniform3f")]
         public static 
-        void Uniform2(Int32 location, Int32 count, UInt32[] value)
+        void Uniform3(Int32 location, Single v0, Single v1, Single v2)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            unsafe
-            {
-                fixed (UInt32* value_ptr = value)
-                {
-                    Delegates.glUniform2uiv((Int32)location, (Int32)count, (UInt32*)value_ptr);
-                }
-            }
+            Delegates.glUniform3f((Int32)location, (Single)v0, (Single)v1, (Single)v2);
             #if DEBUG
             }
             #endif
@@ -73000,15 +73028,21 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the new values to be used for the specified uniform variable.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glUniform3f")]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glUniform3fv")]
         public static 
-        void Uniform3(Int32 location, Single v0, Single v1, Single v2)
+        void Uniform3(Int32 location, Int32 count, Single[] value)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glUniform3f((Int32)location, (Single)v0, (Single)v1, (Single)v2);
+            unsafe
+            {
+                fixed (Single* value_ptr = value)
+                {
+                    Delegates.glUniform3fv((Int32)location, (Int32)count, (Single*)value_ptr);
+                }
+            }
             #if DEBUG
             }
             #endif
@@ -73078,40 +73112,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glUniform3fv")]
-        public static 
-        void Uniform3(Int32 location, Int32 count, Single[] value)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* value_ptr = value)
-                {
-                    Delegates.glUniform3fv((Int32)location, (Int32)count, (Single*)value_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -73140,35 +73140,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glUniform3iv")]
-        public static 
-        unsafe void Uniform3(Int32 location, Int32 count, Int32* value)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glUniform3iv((Int32)location, (Int32)count, (Int32*)value);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -73237,6 +73208,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glUniform3iv")]
+        public static 
+        unsafe void Uniform3(Int32 location, Int32 count, Int32* value)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glUniform3iv((Int32)location, (Int32)count, (Int32*)value);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -73266,6 +73266,41 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glUniform3uiv")]
+        public static 
+        void Uniform3(Int32 location, Int32 count, UInt32[] value)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* value_ptr = value)
+                {
+                    Delegates.glUniform3uiv((Int32)location, (Int32)count, (UInt32*)value_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -73343,22 +73378,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the new values to be used for the specified uniform variable.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glUniform3uiv")]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glUniform4f")]
         public static 
-        void Uniform3(Int32 location, Int32 count, UInt32[] value)
+        void Uniform4(Int32 location, Single v0, Single v1, Single v2, Single v3)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            unsafe
-            {
-                fixed (UInt32* value_ptr = value)
-                {
-                    Delegates.glUniform3uiv((Int32)location, (Int32)count, (UInt32*)value_ptr);
-                }
-            }
+            Delegates.glUniform4f((Int32)location, (Single)v0, (Single)v1, (Single)v2, (Single)v3);
             #if DEBUG
             }
             #endif
@@ -73378,15 +73406,21 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the new values to be used for the specified uniform variable.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glUniform4f")]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glUniform4fv")]
         public static 
-        void Uniform4(Int32 location, Single v0, Single v1, Single v2, Single v3)
+        void Uniform4(Int32 location, Int32 count, Single[] value)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glUniform4f((Int32)location, (Single)v0, (Single)v1, (Single)v2, (Single)v3);
+            unsafe
+            {
+                fixed (Single* value_ptr = value)
+                {
+                    Delegates.glUniform4fv((Int32)location, (Int32)count, (Single*)value_ptr);
+                }
+            }
             #if DEBUG
             }
             #endif
@@ -73456,40 +73490,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glUniform4fv")]
-        public static 
-        void Uniform4(Int32 location, Int32 count, Single[] value)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* value_ptr = value)
-                {
-                    Delegates.glUniform4fv((Int32)location, (Int32)count, (Single*)value_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -73518,35 +73518,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glUniform4iv")]
-        public static 
-        unsafe void Uniform4(Int32 location, Int32 count, Int32* value)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glUniform4iv((Int32)location, (Int32)count, (Int32*)value);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -73615,6 +73586,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glUniform4iv")]
+        public static 
+        unsafe void Uniform4(Int32 location, Int32 count, Int32* value)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glUniform4iv((Int32)location, (Int32)count, (Int32*)value);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -73644,6 +73644,41 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glUniform4uiv")]
+        public static 
+        void Uniform4(Int32 location, Int32 count, UInt32[] value)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* value_ptr = value)
+                {
+                    Delegates.glUniform4uiv((Int32)location, (Int32)count, (UInt32*)value_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -73707,41 +73742,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glUniform4uiv")]
-        public static 
-        void Uniform4(Int32 location, Int32 count, UInt32[] value)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* value_ptr = value)
-                {
-                    Delegates.glUniform4uiv((Int32)location, (Int32)count, (UInt32*)value_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "ArbUniformBufferObject", Version = "2.0", EntryPoint = "glUniformBlockBinding")]
         public static 
         void UniformBlockBinding(Int32 program, Int32 uniformBlockIndex, Int32 uniformBlockBinding)
@@ -73771,6 +73771,26 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glUniformMatrix2fv")]
+        public static 
+        void UniformMatrix2(Int32 location, Int32 count, bool transpose, Single[] value)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* value_ptr = value)
+                {
+                    Delegates.glUniformMatrix2fv((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glUniformMatrix2fv")]
         public static 
         void UniformMatrix2(Int32 location, Int32 count, bool transpose, ref Single value)
@@ -73806,9 +73826,9 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glUniformMatrix2fv")]
+        [AutoGenerated(Category = "Version21", Version = "2.1", EntryPoint = "glUniformMatrix2x3fv")]
         public static 
-        void UniformMatrix2(Int32 location, Int32 count, bool transpose, Single[] value)
+        void UniformMatrix2x3(Int32 location, Int32 count, bool transpose, Single[] value)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -73818,7 +73838,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Single* value_ptr = value)
                 {
-                    Delegates.glUniformMatrix2fv((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
+                    Delegates.glUniformMatrix2x3fv((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
                 }
             }
             #if DEBUG
@@ -73861,9 +73881,9 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [AutoGenerated(Category = "Version21", Version = "2.1", EntryPoint = "glUniformMatrix2x3fv")]
+        [AutoGenerated(Category = "Version21", Version = "2.1", EntryPoint = "glUniformMatrix2x4fv")]
         public static 
-        void UniformMatrix2x3(Int32 location, Int32 count, bool transpose, Single[] value)
+        void UniformMatrix2x4(Int32 location, Int32 count, bool transpose, Single[] value)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -73873,7 +73893,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Single* value_ptr = value)
                 {
-                    Delegates.glUniformMatrix2x3fv((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
+                    Delegates.glUniformMatrix2x4fv((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
                 }
             }
             #if DEBUG
@@ -73916,9 +73936,9 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [AutoGenerated(Category = "Version21", Version = "2.1", EntryPoint = "glUniformMatrix2x4fv")]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glUniformMatrix3fv")]
         public static 
-        void UniformMatrix2x4(Int32 location, Int32 count, bool transpose, Single[] value)
+        void UniformMatrix3(Int32 location, Int32 count, bool transpose, Single[] value)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -73928,7 +73948,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Single* value_ptr = value)
                 {
-                    Delegates.glUniformMatrix2x4fv((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
+                    Delegates.glUniformMatrix3fv((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
                 }
             }
             #if DEBUG
@@ -73971,9 +73991,9 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glUniformMatrix3fv")]
+        [AutoGenerated(Category = "Version21", Version = "2.1", EntryPoint = "glUniformMatrix3x2fv")]
         public static 
-        void UniformMatrix3(Int32 location, Int32 count, bool transpose, Single[] value)
+        void UniformMatrix3x2(Int32 location, Int32 count, bool transpose, Single[] value)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -73983,7 +74003,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Single* value_ptr = value)
                 {
-                    Delegates.glUniformMatrix3fv((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
+                    Delegates.glUniformMatrix3x2fv((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
                 }
             }
             #if DEBUG
@@ -74026,9 +74046,9 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [AutoGenerated(Category = "Version21", Version = "2.1", EntryPoint = "glUniformMatrix3x2fv")]
+        [AutoGenerated(Category = "Version21", Version = "2.1", EntryPoint = "glUniformMatrix3x4fv")]
         public static 
-        void UniformMatrix3x2(Int32 location, Int32 count, bool transpose, Single[] value)
+        void UniformMatrix3x4(Int32 location, Int32 count, bool transpose, Single[] value)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -74038,7 +74058,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Single* value_ptr = value)
                 {
-                    Delegates.glUniformMatrix3x2fv((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
+                    Delegates.glUniformMatrix3x4fv((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
                 }
             }
             #if DEBUG
@@ -74081,9 +74101,9 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [AutoGenerated(Category = "Version21", Version = "2.1", EntryPoint = "glUniformMatrix3x4fv")]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glUniformMatrix4fv")]
         public static 
-        void UniformMatrix3x4(Int32 location, Int32 count, bool transpose, Single[] value)
+        void UniformMatrix4(Int32 location, Int32 count, bool transpose, Single[] value)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -74093,7 +74113,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Single* value_ptr = value)
                 {
-                    Delegates.glUniformMatrix3x4fv((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
+                    Delegates.glUniformMatrix4fv((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
                 }
             }
             #if DEBUG
@@ -74136,9 +74156,9 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glUniformMatrix4fv")]
+        [AutoGenerated(Category = "Version21", Version = "2.1", EntryPoint = "glUniformMatrix4x2fv")]
         public static 
-        void UniformMatrix4(Int32 location, Int32 count, bool transpose, Single[] value)
+        void UniformMatrix4x2(Int32 location, Int32 count, bool transpose, Single[] value)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -74148,7 +74168,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Single* value_ptr = value)
                 {
-                    Delegates.glUniformMatrix4fv((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
+                    Delegates.glUniformMatrix4x2fv((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
                 }
             }
             #if DEBUG
@@ -74191,9 +74211,9 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [AutoGenerated(Category = "Version21", Version = "2.1", EntryPoint = "glUniformMatrix4x2fv")]
+        [AutoGenerated(Category = "Version21", Version = "2.1", EntryPoint = "glUniformMatrix4x3fv")]
         public static 
-        void UniformMatrix4x2(Int32 location, Int32 count, bool transpose, Single[] value)
+        void UniformMatrix4x3(Int32 location, Int32 count, bool transpose, Single[] value)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -74203,7 +74223,7 @@ namespace OpenTK.Graphics.OpenGL
             {
                 fixed (Single* value_ptr = value)
                 {
-                    Delegates.glUniformMatrix4x2fv((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
+                    Delegates.glUniformMatrix4x3fv((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
                 }
             }
             #if DEBUG
@@ -74246,26 +74266,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [AutoGenerated(Category = "Version21", Version = "2.1", EntryPoint = "glUniformMatrix4x3fv")]
-        public static 
-        void UniformMatrix4x3(Int32 location, Int32 count, bool transpose, Single[] value)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* value_ptr = value)
-                {
-                    Delegates.glUniformMatrix4x3fv((Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "Version15", Version = "1.5", EntryPoint = "glUnmapBuffer")]
         public static 
         bool UnmapBuffer(OpenTK.Graphics.OpenGL.BufferTarget target)
@@ -74398,30 +74398,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specify a vertex
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify x, y, z, and w coordinates of a vertex. Not all parameters are present in all forms of the command.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex2dv")]
-        public static 
-        unsafe void Vertex2(Double* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glVertex2dv((Double*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify a vertex
         /// </summary>
@@ -74480,6 +74456,30 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specify a vertex
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify x, y, z, and w coordinates of a vertex. Not all parameters are present in all forms of the command.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex2dv")]
+        public static 
+        unsafe void Vertex2(Double* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glVertex2dv((Double*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify a vertex
         /// </summary>
@@ -74503,6 +74503,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specify a vertex
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify x, y, z, and w coordinates of a vertex. Not all parameters are present in all forms of the command.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex2fv")]
+        public static 
+        void Vertex2(Single[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* v_ptr = v)
+                {
+                    Delegates.glVertex2fv((Single*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify a vertex
         /// </summary>
@@ -74556,35 +74585,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specify a vertex
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify x, y, z, and w coordinates of a vertex. Not all parameters are present in all forms of the command.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex2fv")]
-        public static 
-        void Vertex2(Single[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* v_ptr = v)
-                {
-                    Delegates.glVertex2fv((Single*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify a vertex
         /// </summary>
@@ -74608,30 +74608,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specify a vertex
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify x, y, z, and w coordinates of a vertex. Not all parameters are present in all forms of the command.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex2iv")]
-        public static 
-        unsafe void Vertex2(Int32* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glVertex2iv((Int32*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify a vertex
         /// </summary>
@@ -74698,15 +74674,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify x, y, z, and w coordinates of a vertex. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex2s")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex2iv")]
         public static 
-        void Vertex2(Int16 x, Int16 y)
+        unsafe void Vertex2(Int32* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glVertex2s((Int16)x, (Int16)y);
+            Delegates.glVertex2iv((Int32*)v);
             #if DEBUG
             }
             #endif
@@ -74721,16 +74698,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify x, y, z, and w coordinates of a vertex. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex2sv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex2s")]
         public static 
-        unsafe void Vertex2(Int16* v)
+        void Vertex2(Int16 x, Int16 y)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glVertex2sv((Int16*)v);
+            Delegates.glVertex2s((Int16)x, (Int16)y);
             #if DEBUG
             }
             #endif
@@ -74803,15 +74779,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify x, y, z, and w coordinates of a vertex. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex3d")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex2sv")]
         public static 
-        void Vertex3(Double x, Double y, Double z)
+        unsafe void Vertex2(Int16* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glVertex3d((Double)x, (Double)y, (Double)z);
+            Delegates.glVertex2sv((Int16*)v);
             #if DEBUG
             }
             #endif
@@ -74826,16 +74803,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify x, y, z, and w coordinates of a vertex. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex3dv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex3d")]
         public static 
-        unsafe void Vertex3(Double* v)
+        void Vertex3(Double x, Double y, Double z)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glVertex3dv((Double*)v);
+            Delegates.glVertex3d((Double)x, (Double)y, (Double)z);
             #if DEBUG
             }
             #endif
@@ -74900,6 +74876,30 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specify a vertex
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify x, y, z, and w coordinates of a vertex. Not all parameters are present in all forms of the command.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex3dv")]
+        public static 
+        unsafe void Vertex3(Double* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glVertex3dv((Double*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify a vertex
         /// </summary>
@@ -74923,6 +74923,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specify a vertex
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify x, y, z, and w coordinates of a vertex. Not all parameters are present in all forms of the command.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex3fv")]
+        public static 
+        void Vertex3(Single[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* v_ptr = v)
+                {
+                    Delegates.glVertex3fv((Single*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify a vertex
         /// </summary>
@@ -74976,35 +75005,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specify a vertex
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify x, y, z, and w coordinates of a vertex. Not all parameters are present in all forms of the command.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex3fv")]
-        public static 
-        void Vertex3(Single[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* v_ptr = v)
-                {
-                    Delegates.glVertex3fv((Single*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify a vertex
         /// </summary>
@@ -75028,30 +75028,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specify a vertex
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify x, y, z, and w coordinates of a vertex. Not all parameters are present in all forms of the command.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex3iv")]
-        public static 
-        unsafe void Vertex3(Int32* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glVertex3iv((Int32*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify a vertex
         /// </summary>
@@ -75118,15 +75094,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify x, y, z, and w coordinates of a vertex. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex3s")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex3iv")]
         public static 
-        void Vertex3(Int16 x, Int16 y, Int16 z)
+        unsafe void Vertex3(Int32* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glVertex3s((Int16)x, (Int16)y, (Int16)z);
+            Delegates.glVertex3iv((Int32*)v);
             #if DEBUG
             }
             #endif
@@ -75141,16 +75118,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify x, y, z, and w coordinates of a vertex. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex3sv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex3s")]
         public static 
-        unsafe void Vertex3(Int16* v)
+        void Vertex3(Int16 x, Int16 y, Int16 z)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glVertex3sv((Int16*)v);
+            Delegates.glVertex3s((Int16)x, (Int16)y, (Int16)z);
             #if DEBUG
             }
             #endif
@@ -75223,15 +75199,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify x, y, z, and w coordinates of a vertex. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex4d")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex3sv")]
         public static 
-        void Vertex4(Double x, Double y, Double z, Double w)
+        unsafe void Vertex3(Int16* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glVertex4d((Double)x, (Double)y, (Double)z, (Double)w);
+            Delegates.glVertex3sv((Int16*)v);
             #if DEBUG
             }
             #endif
@@ -75246,16 +75223,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify x, y, z, and w coordinates of a vertex. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex4dv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex4d")]
         public static 
-        unsafe void Vertex4(Double* v)
+        void Vertex4(Double x, Double y, Double z, Double w)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glVertex4dv((Double*)v);
+            Delegates.glVertex4d((Double)x, (Double)y, (Double)z, (Double)w);
             #if DEBUG
             }
             #endif
@@ -75320,6 +75296,30 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specify a vertex
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify x, y, z, and w coordinates of a vertex. Not all parameters are present in all forms of the command.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex4dv")]
+        public static 
+        unsafe void Vertex4(Double* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glVertex4dv((Double*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify a vertex
         /// </summary>
@@ -75343,6 +75343,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specify a vertex
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify x, y, z, and w coordinates of a vertex. Not all parameters are present in all forms of the command.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex4fv")]
+        public static 
+        void Vertex4(Single[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* v_ptr = v)
+                {
+                    Delegates.glVertex4fv((Single*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify a vertex
         /// </summary>
@@ -75396,35 +75425,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specify a vertex
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify x, y, z, and w coordinates of a vertex. Not all parameters are present in all forms of the command.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex4fv")]
-        public static 
-        void Vertex4(Single[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* v_ptr = v)
-                {
-                    Delegates.glVertex4fv((Single*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify a vertex
         /// </summary>
@@ -75448,30 +75448,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specify a vertex
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify x, y, z, and w coordinates of a vertex. Not all parameters are present in all forms of the command.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex4iv")]
-        public static 
-        unsafe void Vertex4(Int32* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glVertex4iv((Int32*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify a vertex
         /// </summary>
@@ -75538,15 +75514,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify x, y, z, and w coordinates of a vertex. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex4s")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex4iv")]
         public static 
-        void Vertex4(Int16 x, Int16 y, Int16 z, Int16 w)
+        unsafe void Vertex4(Int32* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glVertex4s((Int16)x, (Int16)y, (Int16)z, (Int16)w);
+            Delegates.glVertex4iv((Int32*)v);
             #if DEBUG
             }
             #endif
@@ -75561,16 +75538,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify x, y, z, and w coordinates of a vertex. Not all parameters are present in all forms of the command.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex4sv")]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex4s")]
         public static 
-        unsafe void Vertex4(Int16* v)
+        void Vertex4(Int16 x, Int16 y, Int16 z, Int16 w)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glVertex4sv((Int16*)v);
+            Delegates.glVertex4s((Int16)x, (Int16)y, (Int16)z, (Int16)w);
             #if DEBUG
             }
             #endif
@@ -75635,6 +75611,30 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specify a vertex
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify x, y, z, and w coordinates of a vertex. Not all parameters are present in all forms of the command.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version10Deprecated", Version = "1.0", EntryPoint = "glVertex4sv")]
+        public static 
+        unsafe void Vertex4(Int16* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glVertex4sv((Int16*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -76037,35 +76037,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib2dv")]
-        public static 
-        unsafe void VertexAttrib2(Int32 index, Double* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glVertexAttrib2dv((UInt32)index, (Double*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -76150,7 +76121,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib2dv")]
         public static 
-        unsafe void VertexAttrib2(UInt32 index, Double* v)
+        unsafe void VertexAttrib2(Int32 index, Double* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -76233,6 +76204,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib2dv")]
+        public static 
+        unsafe void VertexAttrib2(UInt32 index, Double* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glVertexAttrib2dv((UInt32)index, (Double*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -76290,6 +76290,40 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib2fv")]
+        public static 
+        void VertexAttrib2(Int32 index, Single[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* v_ptr = v)
+                {
+                    Delegates.glVertexAttrib2fv((UInt32)index, (Single*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -76366,9 +76400,10 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the new values to be used for the specified vertex attribute.
         /// </para>
         /// </param>
+        [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib2fv")]
         public static 
-        void VertexAttrib2(Int32 index, Single[] v)
+        void VertexAttrib2(UInt32 index, Single[] v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -76451,41 +76486,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib2fv")]
-        public static 
-        void VertexAttrib2(UInt32 index, Single[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* v_ptr = v)
-                {
-                    Delegates.glVertexAttrib2fv((UInt32)index, (Single*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -76543,35 +76543,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib2sv")]
-        public static 
-        unsafe void VertexAttrib2(Int32 index, Int16* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glVertexAttrib2sv((UInt32)index, (Int16*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -76656,7 +76627,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib2sv")]
         public static 
-        unsafe void VertexAttrib2(UInt32 index, Int16* v)
+        unsafe void VertexAttrib2(Int32 index, Int16* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -76739,6 +76710,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib2sv")]
+        public static 
+        unsafe void VertexAttrib2(UInt32 index, Int16* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glVertexAttrib2sv((UInt32)index, (Int16*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -76796,35 +76796,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib3dv")]
-        public static 
-        unsafe void VertexAttrib3(Int32 index, Double* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glVertexAttrib3dv((UInt32)index, (Double*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -76909,7 +76880,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib3dv")]
         public static 
-        unsafe void VertexAttrib3(UInt32 index, Double* v)
+        unsafe void VertexAttrib3(Int32 index, Double* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -76992,6 +76963,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib3dv")]
+        public static 
+        unsafe void VertexAttrib3(UInt32 index, Double* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glVertexAttrib3dv((UInt32)index, (Double*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -77049,6 +77049,40 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib3fv")]
+        public static 
+        void VertexAttrib3(Int32 index, Single[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* v_ptr = v)
+                {
+                    Delegates.glVertexAttrib3fv((UInt32)index, (Single*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -77125,9 +77159,10 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the new values to be used for the specified vertex attribute.
         /// </para>
         /// </param>
+        [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib3fv")]
         public static 
-        void VertexAttrib3(Int32 index, Single[] v)
+        void VertexAttrib3(UInt32 index, Single[] v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -77210,41 +77245,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib3fv")]
-        public static 
-        void VertexAttrib3(UInt32 index, Single[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* v_ptr = v)
-                {
-                    Delegates.glVertexAttrib3fv((UInt32)index, (Single*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -77302,35 +77302,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib3sv")]
-        public static 
-        unsafe void VertexAttrib3(Int32 index, Int16* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glVertexAttrib3sv((UInt32)index, (Int16*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -77415,7 +77386,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib3sv")]
         public static 
-        unsafe void VertexAttrib3(UInt32 index, Int16* v)
+        unsafe void VertexAttrib3(Int32 index, Int16* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -77498,6 +77469,70 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib3sv")]
+        public static 
+        unsafe void VertexAttrib3(UInt32 index, Int16* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glVertexAttrib3sv((UInt32)index, (Int16*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4bv")]
+        public static 
+        void VertexAttrib4(UInt32 index, SByte[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (SByte* v_ptr = v)
+                {
+                    Delegates.glVertexAttrib4bv((UInt32)index, (SByte*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -77562,41 +77597,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4bv")]
-        public static 
-        void VertexAttrib4(UInt32 index, SByte[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (SByte* v_ptr = v)
-                {
-                    Delegates.glVertexAttrib4bv((UInt32)index, (SByte*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -77654,35 +77654,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4dv")]
-        public static 
-        unsafe void VertexAttrib4(Int32 index, Double* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glVertexAttrib4dv((UInt32)index, (Double*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -77767,7 +77738,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4dv")]
         public static 
-        unsafe void VertexAttrib4(UInt32 index, Double* v)
+        unsafe void VertexAttrib4(Int32 index, Double* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -77850,6 +77821,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4dv")]
+        public static 
+        unsafe void VertexAttrib4(UInt32 index, Double* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glVertexAttrib4dv((UInt32)index, (Double*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -77907,6 +77907,40 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4fv")]
+        public static 
+        void VertexAttrib4(Int32 index, Single[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* v_ptr = v)
+                {
+                    Delegates.glVertexAttrib4fv((UInt32)index, (Single*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -77983,9 +78017,10 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the new values to be used for the specified vertex attribute.
         /// </para>
         /// </param>
+        [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4fv")]
         public static 
-        void VertexAttrib4(Int32 index, Single[] v)
+        void VertexAttrib4(UInt32 index, Single[] v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -78068,70 +78103,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4fv")]
-        public static 
-        void VertexAttrib4(UInt32 index, Single[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* v_ptr = v)
-                {
-                    Delegates.glVertexAttrib4fv((UInt32)index, (Single*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4iv")]
-        public static 
-        unsafe void VertexAttrib4(Int32 index, Int32* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glVertexAttrib4iv((UInt32)index, (Int32*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -78216,7 +78187,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4iv")]
         public static 
-        unsafe void VertexAttrib4(UInt32 index, Int32* v)
+        unsafe void VertexAttrib4(Int32 index, Int32* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -78298,6 +78269,56 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4iv")]
+        public static 
+        unsafe void VertexAttrib4(UInt32 index, Int32* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glVertexAttrib4iv((UInt32)index, (Int32*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Nbv")]
+        public static 
+        void VertexAttrib4N(UInt32 index, SByte[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (SByte* v_ptr = v)
+                {
+                    Delegates.glVertexAttrib4Nbv((UInt32)index, (SByte*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Nbv")]
         public static 
@@ -78334,42 +78355,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Nbv")]
-        public static 
-        void VertexAttrib4N(UInt32 index, SByte[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (SByte* v_ptr = v)
-                {
-                    Delegates.glVertexAttrib4Nbv((UInt32)index, (SByte*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Niv")]
-        public static 
-        unsafe void VertexAttrib4N(Int32 index, Int32* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glVertexAttrib4Niv((UInt32)index, (Int32*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Niv")]
         public static 
         void VertexAttrib4N(Int32 index, Int32[] v)
@@ -78413,7 +78398,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Niv")]
         public static 
-        unsafe void VertexAttrib4N(UInt32 index, Int32* v)
+        unsafe void VertexAttrib4N(Int32 index, Int32* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -78468,15 +78453,15 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Nsv")]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Niv")]
         public static 
-        unsafe void VertexAttrib4N(Int32 index, Int16* v)
+        unsafe void VertexAttrib4N(UInt32 index, Int32* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glVertexAttrib4Nsv((UInt32)index, (Int16*)v);
+            Delegates.glVertexAttrib4Niv((UInt32)index, (Int32*)v);
             #if DEBUG
             }
             #endif
@@ -78525,7 +78510,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Nsv")]
         public static 
-        unsafe void VertexAttrib4N(UInt32 index, Int16* v)
+        unsafe void VertexAttrib4N(Int32 index, Int16* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -78579,6 +78564,21 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Nsv")]
+        public static 
+        unsafe void VertexAttrib4N(UInt32 index, Int16* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glVertexAttrib4Nsv((UInt32)index, (Int16*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Nub")]
         public static 
         void VertexAttrib4N(Int32 index, Byte x, Byte y, Byte z, Byte w)
@@ -78608,21 +78608,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Nubv")]
-        public static 
-        unsafe void VertexAttrib4N(Int32 index, Byte* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glVertexAttrib4Nubv((UInt32)index, (Byte*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Nubv")]
         public static 
         void VertexAttrib4N(Int32 index, Byte[] v)
@@ -78666,7 +78651,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Nubv")]
         public static 
-        unsafe void VertexAttrib4N(UInt32 index, Byte* v)
+        unsafe void VertexAttrib4N(Int32 index, Byte* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -78720,6 +78705,42 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Nubv")]
+        public static 
+        unsafe void VertexAttrib4N(UInt32 index, Byte* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glVertexAttrib4Nubv((UInt32)index, (Byte*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Nuiv")]
+        public static 
+        void VertexAttrib4N(UInt32 index, UInt32[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* v_ptr = v)
+                {
+                    Delegates.glVertexAttrib4Nuiv((UInt32)index, (UInt32*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Nuiv")]
         public static 
@@ -78757,9 +78778,9 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Nuiv")]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Nusv")]
         public static 
-        void VertexAttrib4N(UInt32 index, UInt32[] v)
+        void VertexAttrib4N(UInt32 index, UInt16[] v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -78767,9 +78788,9 @@ namespace OpenTK.Graphics.OpenGL
             #endif
             unsafe
             {
-                fixed (UInt32* v_ptr = v)
+                fixed (UInt16* v_ptr = v)
                 {
-                    Delegates.glVertexAttrib4Nuiv((UInt32)index, (UInt32*)v_ptr);
+                    Delegates.glVertexAttrib4Nusv((UInt32)index, (UInt16*)v_ptr);
                 }
             }
             #if DEBUG
@@ -78813,27 +78834,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4Nusv")]
-        public static 
-        void VertexAttrib4N(UInt32 index, UInt16[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt16* v_ptr = v)
-                {
-                    Delegates.glVertexAttrib4Nusv((UInt32)index, (UInt16*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
         
         /// <summary>
         /// Specifies the value of a generic vertex attribute
@@ -78892,35 +78892,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4sv")]
-        public static 
-        unsafe void VertexAttrib4(Int32 index, Int16* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glVertexAttrib4sv((UInt32)index, (Int16*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -79005,7 +78976,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4sv")]
         public static 
-        unsafe void VertexAttrib4(UInt32 index, Int16* v)
+        unsafe void VertexAttrib4(Int32 index, Int16* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -79102,15 +79073,15 @@ namespace OpenTK.Graphics.OpenGL
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4ubv")]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4sv")]
         public static 
-        unsafe void VertexAttrib4(Int32 index, Byte* v)
+        unsafe void VertexAttrib4(UInt32 index, Int16* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glVertexAttrib4ubv((UInt32)index, (Byte*)v);
+            Delegates.glVertexAttrib4sv((UInt32)index, (Int16*)v);
             #if DEBUG
             }
             #endif
@@ -79201,7 +79172,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4ubv")]
         public static 
-        unsafe void VertexAttrib4(UInt32 index, Byte* v)
+        unsafe void VertexAttrib4(Int32 index, Byte* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -79284,6 +79255,70 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4ubv")]
+        public static 
+        unsafe void VertexAttrib4(UInt32 index, Byte* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glVertexAttrib4ubv((UInt32)index, (Byte*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4uiv")]
+        public static 
+        void VertexAttrib4(UInt32 index, UInt32[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* v_ptr = v)
+                {
+                    Delegates.glVertexAttrib4uiv((UInt32)index, (UInt32*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -79362,9 +79397,9 @@ namespace OpenTK.Graphics.OpenGL
         /// </para>
         /// </param>
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4uiv")]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4usv")]
         public static 
-        void VertexAttrib4(UInt32 index, UInt32[] v)
+        void VertexAttrib4(UInt32 index, UInt16[] v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -79372,9 +79407,9 @@ namespace OpenTK.Graphics.OpenGL
             #endif
             unsafe
             {
-                fixed (UInt32* v_ptr = v)
+                fixed (UInt16* v_ptr = v)
                 {
-                    Delegates.glVertexAttrib4uiv((UInt32)index, (UInt32*)v_ptr);
+                    Delegates.glVertexAttrib4usv((UInt32)index, (UInt16*)v_ptr);
                 }
             }
             #if DEBUG
@@ -79446,41 +79481,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttrib4usv")]
-        public static 
-        void VertexAttrib4(UInt32 index, UInt16[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt16* v_ptr = v)
-                {
-                    Delegates.glVertexAttrib4usv((UInt32)index, (UInt16*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI1i")]
         public static 
         void VertexAttribI1(Int32 index, Int32 x)
@@ -79599,21 +79599,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI2iv")]
-        public static 
-        unsafe void VertexAttribI2(Int32 index, Int32* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glVertexAttribI2iv((UInt32)index, (Int32*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI2iv")]
         public static 
         void VertexAttribI2(Int32 index, Int32[] v)
@@ -79657,7 +79642,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI2iv")]
         public static 
-        unsafe void VertexAttribI2(UInt32 index, Int32* v)
+        unsafe void VertexAttribI2(Int32 index, Int32* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -79711,6 +79696,21 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI2iv")]
+        public static 
+        unsafe void VertexAttribI2(UInt32 index, Int32* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glVertexAttribI2iv((UInt32)index, (Int32*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI2ui")]
         public static 
@@ -79726,6 +79726,27 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI2uiv")]
+        public static 
+        void VertexAttribI2(UInt32 index, UInt32[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* v_ptr = v)
+                {
+                    Delegates.glVertexAttribI2uiv((UInt32)index, (UInt32*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI2uiv")]
         public static 
@@ -79762,27 +79783,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI2uiv")]
-        public static 
-        void VertexAttribI2(UInt32 index, UInt32[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (UInt32* v_ptr = v)
-                {
-                    Delegates.glVertexAttribI2uiv((UInt32)index, (UInt32*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI3i")]
         public static 
         void VertexAttribI3(Int32 index, Int32 x, Int32 y, Int32 z)
@@ -79812,21 +79812,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI3iv")]
-        public static 
-        unsafe void VertexAttribI3(Int32 index, Int32* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glVertexAttribI3iv((UInt32)index, (Int32*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI3iv")]
         public static 
         void VertexAttribI3(Int32 index, Int32[] v)
@@ -79870,7 +79855,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI3iv")]
         public static 
-        unsafe void VertexAttribI3(UInt32 index, Int32* v)
+        unsafe void VertexAttribI3(Int32 index, Int32* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -79924,6 +79909,21 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI3iv")]
+        public static 
+        unsafe void VertexAttribI3(UInt32 index, Int32* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glVertexAttribI3iv((UInt32)index, (Int32*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI3ui")]
         public static 
@@ -79939,6 +79939,27 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI3uiv")]
+        public static 
+        void VertexAttribI3(UInt32 index, UInt32[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* v_ptr = v)
+                {
+                    Delegates.glVertexAttribI3uiv((UInt32)index, (UInt32*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI3uiv")]
         public static 
@@ -79976,9 +79997,9 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI3uiv")]
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4bv")]
         public static 
-        void VertexAttribI3(UInt32 index, UInt32[] v)
+        void VertexAttribI4(UInt32 index, SByte[] v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -79986,9 +80007,9 @@ namespace OpenTK.Graphics.OpenGL
             #endif
             unsafe
             {
-                fixed (UInt32* v_ptr = v)
+                fixed (SByte* v_ptr = v)
                 {
-                    Delegates.glVertexAttribI3uiv((UInt32)index, (UInt32*)v_ptr);
+                    Delegates.glVertexAttribI4bv((UInt32)index, (SByte*)v_ptr);
                 }
             }
             #if DEBUG
@@ -80032,27 +80053,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4bv")]
-        public static 
-        void VertexAttribI4(UInt32 index, SByte[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (SByte* v_ptr = v)
-                {
-                    Delegates.glVertexAttribI4bv((UInt32)index, (SByte*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4i")]
         public static 
         void VertexAttribI4(Int32 index, Int32 x, Int32 y, Int32 z, Int32 w)
@@ -80082,21 +80082,6 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4iv")]
-        public static 
-        unsafe void VertexAttribI4(Int32 index, Int32* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glVertexAttribI4iv((UInt32)index, (Int32*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4iv")]
         public static 
         void VertexAttribI4(Int32 index, Int32[] v)
@@ -80140,7 +80125,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4iv")]
         public static 
-        unsafe void VertexAttribI4(UInt32 index, Int32* v)
+        unsafe void VertexAttribI4(Int32 index, Int32* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -80195,15 +80180,15 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4sv")]
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4iv")]
         public static 
-        unsafe void VertexAttribI4(Int32 index, Int16* v)
+        unsafe void VertexAttribI4(UInt32 index, Int32* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glVertexAttribI4sv((UInt32)index, (Int16*)v);
+            Delegates.glVertexAttribI4iv((UInt32)index, (Int32*)v);
             #if DEBUG
             }
             #endif
@@ -80252,7 +80237,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4sv")]
         public static 
-        unsafe void VertexAttribI4(UInt32 index, Int16* v)
+        unsafe void VertexAttribI4(Int32 index, Int16* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -80307,15 +80292,15 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4ubv")]
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4sv")]
         public static 
-        unsafe void VertexAttribI4(Int32 index, Byte* v)
+        unsafe void VertexAttribI4(UInt32 index, Int16* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glVertexAttribI4ubv((UInt32)index, (Byte*)v);
+            Delegates.glVertexAttribI4sv((UInt32)index, (Int16*)v);
             #if DEBUG
             }
             #endif
@@ -80364,7 +80349,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4ubv")]
         public static 
-        unsafe void VertexAttribI4(UInt32 index, Byte* v)
+        unsafe void VertexAttribI4(Int32 index, Byte* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -80418,6 +80403,21 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4ubv")]
+        public static 
+        unsafe void VertexAttribI4(UInt32 index, Byte* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glVertexAttribI4ubv((UInt32)index, (Byte*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4ui")]
         public static 
@@ -80433,6 +80433,27 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4uiv")]
+        public static 
+        void VertexAttribI4(UInt32 index, UInt32[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (UInt32* v_ptr = v)
+                {
+                    Delegates.glVertexAttribI4uiv((UInt32)index, (UInt32*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4uiv")]
         public static 
@@ -80470,9 +80491,9 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4uiv")]
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4usv")]
         public static 
-        void VertexAttribI4(UInt32 index, UInt32[] v)
+        void VertexAttribI4(UInt32 index, UInt16[] v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -80480,9 +80501,9 @@ namespace OpenTK.Graphics.OpenGL
             #endif
             unsafe
             {
-                fixed (UInt32* v_ptr = v)
+                fixed (UInt16* v_ptr = v)
                 {
-                    Delegates.glVertexAttribI4uiv((UInt32)index, (UInt32*)v_ptr);
+                    Delegates.glVertexAttribI4usv((UInt32)index, (UInt16*)v_ptr);
                 }
             }
             #if DEBUG
@@ -80526,22 +80547,15 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribI4usv")]
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribIPointer")]
         public static 
-        void VertexAttribI4(UInt32 index, UInt16[] v)
+        void VertexAttribIPointer(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribIPointerType type, Int32 stride, IntPtr pointer)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            unsafe
-            {
-                fixed (UInt16* v_ptr = v)
-                {
-                    Delegates.glVertexAttribI4usv((UInt32)index, (UInt16*)v_ptr);
-                }
-            }
+            Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.OpenGL.VertexAttribIPointerType)type, (Int32)stride, (IntPtr)pointer);
             #if DEBUG
             }
             #endif
@@ -80549,31 +80563,7 @@ namespace OpenTK.Graphics.OpenGL
 
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribIPointer")]
         public static 
-        void VertexAttribIPointer<T4>(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribIPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T4 pointer)
-            where T4 : struct
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-            try
-            {
-                Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.OpenGL.VertexAttribIPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                pointer = (T4)pointer_ptr.Target;
-            }
-            finally
-            {
-                pointer_ptr.Free();
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribIPointer")]
-        public static 
-        void VertexAttribIPointer<T4>(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribIPointerType type, Int32 stride, [InAttribute, OutAttribute] T4[,,] pointer)
+        void VertexAttribIPointer<T4>(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribIPointerType type, Int32 stride, [InAttribute, OutAttribute] T4[] pointer)
             where T4 : struct
         {
             #if DEBUG
@@ -80619,7 +80609,7 @@ namespace OpenTK.Graphics.OpenGL
 
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribIPointer")]
         public static 
-        void VertexAttribIPointer<T4>(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribIPointerType type, Int32 stride, [InAttribute, OutAttribute] T4[] pointer)
+        void VertexAttribIPointer<T4>(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribIPointerType type, Int32 stride, [InAttribute, OutAttribute] T4[,,] pointer)
             where T4 : struct
         {
             #if DEBUG
@@ -80642,22 +80632,7 @@ namespace OpenTK.Graphics.OpenGL
 
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribIPointer")]
         public static 
-        void VertexAttribIPointer(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribIPointerType type, Int32 stride, IntPtr pointer)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.OpenGL.VertexAttribIPointerType)type, (Int32)stride, (IntPtr)pointer);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribIPointer")]
-        public static 
-        void VertexAttribIPointer<T4>(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribIPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T4 pointer)
+        void VertexAttribIPointer<T4>(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribIPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T4 pointer)
             where T4 : struct
         {
             #if DEBUG
@@ -80682,7 +80657,22 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribIPointer")]
         public static 
-        void VertexAttribIPointer<T4>(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribIPointerType type, Int32 stride, [InAttribute, OutAttribute] T4[,,] pointer)
+        void VertexAttribIPointer(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribIPointerType type, Int32 stride, IntPtr pointer)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.OpenGL.VertexAttribIPointerType)type, (Int32)stride, (IntPtr)pointer);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribIPointer")]
+        public static 
+        void VertexAttribIPointer<T4>(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribIPointerType type, Int32 stride, [InAttribute, OutAttribute] T4[] pointer)
             where T4 : struct
         {
             #if DEBUG
@@ -80730,7 +80720,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribIPointer")]
         public static 
-        void VertexAttribIPointer<T4>(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribIPointerType type, Int32 stride, [InAttribute, OutAttribute] T4[] pointer)
+        void VertexAttribIPointer<T4>(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribIPointerType type, Int32 stride, [InAttribute, OutAttribute] T4[,,] pointer)
             where T4 : struct
         {
             #if DEBUG
@@ -80754,56 +80744,8 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version30", Version = "3.0", EntryPoint = "glVertexAttribIPointer")]
         public static 
-        void VertexAttribIPointer(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribIPointerType type, Int32 stride, IntPtr pointer)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.OpenGL.VertexAttribIPointerType)type, (Int32)stride, (IntPtr)pointer);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Define an array of generic vertex attribute data
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="size">
-        /// <para>
-        /// Specifies the number of components per generic vertex attribute. Must be 1, 2, 3, or 4. The initial value is 4.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the data type of each component in the array. Symbolic constants GL_BYTE, GL_UNSIGNED_BYTE, GL_SHORT, GL_UNSIGNED_SHORT, GL_INT, GL_UNSIGNED_INT, GL_FLOAT, or GL_DOUBLE are accepted. The initial value is GL_FLOAT.
-        /// </para>
-        /// </param>
-        /// <param name="normalized">
-        /// <para>
-        /// Specifies whether fixed-point data values should be normalized (GL_TRUE) or converted directly as fixed-point values (GL_FALSE) when they are accessed.
-        /// </para>
-        /// </param>
-        /// <param name="stride">
-        /// <para>
-        /// Specifies the byte offset between consecutive generic vertex attributes. If stride is 0, the generic vertex attributes are understood to be tightly packed in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-        /// <param name="pointer">
-        /// <para>
-        /// Specifies a pointer to the first component of the first generic vertex attribute in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
-        public static 
-        void VertexAttribPointer<T5>(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] ref T5 pointer)
-            where T5 : struct
+        void VertexAttribIPointer<T4>(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribIPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T4 pointer)
+            where T4 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -80812,8 +80754,8 @@ namespace OpenTK.Graphics.OpenGL
             GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
             try
             {
-                Delegates.glVertexAttribPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.OpenGL.VertexAttribPointerType)type, (bool)normalized, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                pointer = (T5)pointer_ptr.Target;
+                Delegates.glVertexAttribIPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.OpenGL.VertexAttribIPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                pointer = (T4)pointer_ptr.Target;
             }
             finally
             {
@@ -80860,7 +80802,55 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
         public static 
-        void VertexAttribPointer<T5>(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[,,] pointer)
+        void VertexAttribPointer(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerType type, bool normalized, Int32 stride, IntPtr pointer)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glVertexAttribPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.OpenGL.VertexAttribPointerType)type, (bool)normalized, (Int32)stride, (IntPtr)pointer);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Define an array of generic vertex attribute data
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="size">
+        /// <para>
+        /// Specifies the number of components per generic vertex attribute. Must be 1, 2, 3, or 4. The initial value is 4.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the data type of each component in the array. Symbolic constants GL_BYTE, GL_UNSIGNED_BYTE, GL_SHORT, GL_UNSIGNED_SHORT, GL_INT, GL_UNSIGNED_INT, GL_FLOAT, or GL_DOUBLE are accepted. The initial value is GL_FLOAT.
+        /// </para>
+        /// </param>
+        /// <param name="normalized">
+        /// <para>
+        /// Specifies whether fixed-point data values should be normalized (GL_TRUE) or converted directly as fixed-point values (GL_FALSE) when they are accessed.
+        /// </para>
+        /// </param>
+        /// <param name="stride">
+        /// <para>
+        /// Specifies the byte offset between consecutive generic vertex attributes. If stride is 0, the generic vertex attributes are understood to be tightly packed in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+        /// <param name="pointer">
+        /// <para>
+        /// Specifies a pointer to the first component of the first generic vertex attribute in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
+        public static 
+        void VertexAttribPointer<T5>(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[] pointer)
             where T5 : struct
         {
             #if DEBUG
@@ -80974,7 +80964,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
         public static 
-        void VertexAttribPointer<T5>(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[] pointer)
+        void VertexAttribPointer<T5>(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[,,] pointer)
             where T5 : struct
         {
             #if DEBUG
@@ -81031,56 +81021,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
         public static 
-        void VertexAttribPointer(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerType type, bool normalized, Int32 stride, IntPtr pointer)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glVertexAttribPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.OpenGL.VertexAttribPointerType)type, (bool)normalized, (Int32)stride, (IntPtr)pointer);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Define an array of generic vertex attribute data
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="size">
-        /// <para>
-        /// Specifies the number of components per generic vertex attribute. Must be 1, 2, 3, or 4. The initial value is 4.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the data type of each component in the array. Symbolic constants GL_BYTE, GL_UNSIGNED_BYTE, GL_SHORT, GL_UNSIGNED_SHORT, GL_INT, GL_UNSIGNED_INT, GL_FLOAT, or GL_DOUBLE are accepted. The initial value is GL_FLOAT.
-        /// </para>
-        /// </param>
-        /// <param name="normalized">
-        /// <para>
-        /// Specifies whether fixed-point data values should be normalized (GL_TRUE) or converted directly as fixed-point values (GL_FALSE) when they are accessed.
-        /// </para>
-        /// </param>
-        /// <param name="stride">
-        /// <para>
-        /// Specifies the byte offset between consecutive generic vertex attributes. If stride is 0, the generic vertex attributes are understood to be tightly packed in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-        /// <param name="pointer">
-        /// <para>
-        /// Specifies a pointer to the first component of the first generic vertex attribute in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
-        public static 
-        void VertexAttribPointer<T5>(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] ref T5 pointer)
+        void VertexAttribPointer<T5>(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] ref T5 pointer)
             where T5 : struct
         {
             #if DEBUG
@@ -81139,7 +81080,56 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
         public static 
-        void VertexAttribPointer<T5>(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[,,] pointer)
+        void VertexAttribPointer(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerType type, bool normalized, Int32 stride, IntPtr pointer)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glVertexAttribPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.OpenGL.VertexAttribPointerType)type, (bool)normalized, (Int32)stride, (IntPtr)pointer);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Define an array of generic vertex attribute data
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="size">
+        /// <para>
+        /// Specifies the number of components per generic vertex attribute. Must be 1, 2, 3, or 4. The initial value is 4.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the data type of each component in the array. Symbolic constants GL_BYTE, GL_UNSIGNED_BYTE, GL_SHORT, GL_UNSIGNED_SHORT, GL_INT, GL_UNSIGNED_INT, GL_FLOAT, or GL_DOUBLE are accepted. The initial value is GL_FLOAT.
+        /// </para>
+        /// </param>
+        /// <param name="normalized">
+        /// <para>
+        /// Specifies whether fixed-point data values should be normalized (GL_TRUE) or converted directly as fixed-point values (GL_FALSE) when they are accessed.
+        /// </para>
+        /// </param>
+        /// <param name="stride">
+        /// <para>
+        /// Specifies the byte offset between consecutive generic vertex attributes. If stride is 0, the generic vertex attributes are understood to be tightly packed in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+        /// <param name="pointer">
+        /// <para>
+        /// Specifies a pointer to the first component of the first generic vertex attribute in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
+        public static 
+        void VertexAttribPointer<T5>(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[] pointer)
             where T5 : struct
         {
             #if DEBUG
@@ -81255,7 +81245,7 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
         public static 
-        void VertexAttribPointer<T5>(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[] pointer)
+        void VertexAttribPointer<T5>(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] T5[,,] pointer)
             where T5 : struct
         {
             #if DEBUG
@@ -81313,46 +81303,8 @@ namespace OpenTK.Graphics.OpenGL
         [System.CLSCompliant(false)]
         [AutoGenerated(Category = "Version20", Version = "2.0", EntryPoint = "glVertexAttribPointer")]
         public static 
-        void VertexAttribPointer(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerType type, bool normalized, Int32 stride, IntPtr pointer)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glVertexAttribPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.OpenGL.VertexAttribPointerType)type, (bool)normalized, (Int32)stride, (IntPtr)pointer);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
-        /// <summary>
-        /// Define an array of vertex data
-        /// </summary>
-        /// <param name="size">
-        /// <para>
-        /// Specifies the number of coordinates per vertex. Must be 2, 3, or 4. The initial value is 4.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the data type of each coordinate in the array. Symbolic constants GL_SHORT, GL_INT, GL_FLOAT, or GL_DOUBLE are accepted. The initial value is GL_FLOAT.
-        /// </para>
-        /// </param>
-        /// <param name="stride">
-        /// <para>
-        /// Specifies the byte offset between consecutive vertices. If stride is 0, the vertices are understood to be tightly packed in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-        /// <param name="pointer">
-        /// <para>
-        /// Specifies a pointer to the first coordinate of the first vertex in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glVertexPointer")]
-        public static 
-        void VertexPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T3 pointer)
-            where T3 : struct
+        void VertexAttribPointer<T5>(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.VertexAttribPointerType type, bool normalized, Int32 stride, [InAttribute, OutAttribute] ref T5 pointer)
+            where T5 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -81361,8 +81313,8 @@ namespace OpenTK.Graphics.OpenGL
             GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
             try
             {
-                Delegates.glVertexPointer((Int32)size, (OpenTK.Graphics.OpenGL.VertexPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                pointer = (T3)pointer_ptr.Target;
+                Delegates.glVertexAttribPointer((UInt32)index, (Int32)size, (OpenTK.Graphics.OpenGL.VertexAttribPointerType)type, (bool)normalized, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                pointer = (T5)pointer_ptr.Target;
             }
             finally
             {
@@ -81399,7 +81351,45 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glVertexPointer")]
         public static 
-        void VertexPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[,,] pointer)
+        void VertexPointer(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, Int32 stride, IntPtr pointer)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glVertexPointer((Int32)size, (OpenTK.Graphics.OpenGL.VertexPointerType)type, (Int32)stride, (IntPtr)pointer);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
+        /// <summary>
+        /// Define an array of vertex data
+        /// </summary>
+        /// <param name="size">
+        /// <para>
+        /// Specifies the number of coordinates per vertex. Must be 2, 3, or 4. The initial value is 4.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the data type of each coordinate in the array. Symbolic constants GL_SHORT, GL_INT, GL_FLOAT, or GL_DOUBLE are accepted. The initial value is GL_FLOAT.
+        /// </para>
+        /// </param>
+        /// <param name="stride">
+        /// <para>
+        /// Specifies the byte offset between consecutive vertices. If stride is 0, the vertices are understood to be tightly packed in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+        /// <param name="pointer">
+        /// <para>
+        /// Specifies a pointer to the first coordinate of the first vertex in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glVertexPointer")]
+        public static 
+        void VertexPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[] pointer)
             where T3 : struct
         {
             #if DEBUG
@@ -81493,7 +81483,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glVertexPointer")]
         public static 
-        void VertexPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[] pointer)
+        void VertexPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[,,] pointer)
             where T3 : struct
         {
             #if DEBUG
@@ -81540,13 +81530,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "Version11Deprecated", Version = "1.1", EntryPoint = "glVertexPointer")]
         public static 
-        void VertexPointer(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, Int32 stride, IntPtr pointer)
+        void VertexPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T3 pointer)
+            where T3 : struct
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glVertexPointer((Int32)size, (OpenTK.Graphics.OpenGL.VertexPointerType)type, (Int32)stride, (IntPtr)pointer);
+            GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+            try
+            {
+                Delegates.glVertexPointer((Int32)size, (OpenTK.Graphics.OpenGL.VertexPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                pointer = (T3)pointer_ptr.Target;
+            }
+            finally
+            {
+                pointer_ptr.Free();
+            }
             #if DEBUG
             }
             #endif
@@ -81633,30 +81633,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specify the raster position in window coordinates for pixel operations
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify the , , coordinates for the raster position.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glWindowPos2dv")]
-        public static 
-        unsafe void WindowPos2(Double* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glWindowPos2dv((Double*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -81715,6 +81691,30 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specify the raster position in window coordinates for pixel operations
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify the , , coordinates for the raster position.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glWindowPos2dv")]
+        public static 
+        unsafe void WindowPos2(Double* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glWindowPos2dv((Double*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -81738,6 +81738,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specify the raster position in window coordinates for pixel operations
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify the , , coordinates for the raster position.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glWindowPos2fv")]
+        public static 
+        void WindowPos2(Single[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* v_ptr = v)
+                {
+                    Delegates.glWindowPos2fv((Single*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -81791,35 +81820,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specify the raster position in window coordinates for pixel operations
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify the , , coordinates for the raster position.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glWindowPos2fv")]
-        public static 
-        void WindowPos2(Single[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* v_ptr = v)
-                {
-                    Delegates.glWindowPos2fv((Single*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -81843,30 +81843,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specify the raster position in window coordinates for pixel operations
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify the , , coordinates for the raster position.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glWindowPos2iv")]
-        public static 
-        unsafe void WindowPos2(Int32* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glWindowPos2iv((Int32*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -81933,15 +81909,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , coordinates for the raster position.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glWindowPos2s")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glWindowPos2iv")]
         public static 
-        void WindowPos2(Int16 x, Int16 y)
+        unsafe void WindowPos2(Int32* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glWindowPos2s((Int16)x, (Int16)y);
+            Delegates.glWindowPos2iv((Int32*)v);
             #if DEBUG
             }
             #endif
@@ -81956,16 +81933,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , coordinates for the raster position.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glWindowPos2sv")]
+        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glWindowPos2s")]
         public static 
-        unsafe void WindowPos2(Int16* v)
+        void WindowPos2(Int16 x, Int16 y)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glWindowPos2sv((Int16*)v);
+            Delegates.glWindowPos2s((Int16)x, (Int16)y);
             #if DEBUG
             }
             #endif
@@ -82038,15 +82014,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , coordinates for the raster position.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glWindowPos3d")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glWindowPos2sv")]
         public static 
-        void WindowPos3(Double x, Double y, Double z)
+        unsafe void WindowPos2(Int16* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glWindowPos3d((Double)x, (Double)y, (Double)z);
+            Delegates.glWindowPos2sv((Int16*)v);
             #if DEBUG
             }
             #endif
@@ -82061,16 +82038,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , coordinates for the raster position.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glWindowPos3dv")]
+        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glWindowPos3d")]
         public static 
-        unsafe void WindowPos3(Double* v)
+        void WindowPos3(Double x, Double y, Double z)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glWindowPos3dv((Double*)v);
+            Delegates.glWindowPos3d((Double)x, (Double)y, (Double)z);
             #if DEBUG
             }
             #endif
@@ -82135,6 +82111,30 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specify the raster position in window coordinates for pixel operations
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify the , , coordinates for the raster position.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glWindowPos3dv")]
+        public static 
+        unsafe void WindowPos3(Double* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glWindowPos3dv((Double*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -82158,6 +82158,35 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
+        /// <summary>
+        /// Specify the raster position in window coordinates for pixel operations
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify the , , coordinates for the raster position.
+        /// </para>
+        /// </param>
+        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glWindowPos3fv")]
+        public static 
+        void WindowPos3(Single[] v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            unsafe
+            {
+                fixed (Single* v_ptr = v)
+                {
+                    Delegates.glWindowPos3fv((Single*)v_ptr);
+                }
+            }
+            #if DEBUG
+            }
+            #endif
+        }
+
+        
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -82211,35 +82240,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specify the raster position in window coordinates for pixel operations
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify the , , coordinates for the raster position.
-        /// </para>
-        /// </param>
-        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glWindowPos3fv")]
-        public static 
-        void WindowPos3(Single[] v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            unsafe
-            {
-                fixed (Single* v_ptr = v)
-                {
-                    Delegates.glWindowPos3fv((Single*)v_ptr);
-                }
-            }
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -82263,30 +82263,6 @@ namespace OpenTK.Graphics.OpenGL
         }
 
         
-        /// <summary>
-        /// Specify the raster position in window coordinates for pixel operations
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify the , , coordinates for the raster position.
-        /// </para>
-        /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glWindowPos3iv")]
-        public static 
-        unsafe void WindowPos3(Int32* v)
-        {
-            #if DEBUG
-            using (new ErrorHelper(GraphicsContext.CurrentContext))
-            {
-            #endif
-            Delegates.glWindowPos3iv((Int32*)v);
-            #if DEBUG
-            }
-            #endif
-        }
-
-        
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -82353,15 +82329,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , coordinates for the raster position.
         /// </para>
         /// </param>
-        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glWindowPos3s")]
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glWindowPos3iv")]
         public static 
-        void WindowPos3(Int16 x, Int16 y, Int16 z)
+        unsafe void WindowPos3(Int32* v)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glWindowPos3s((Int16)x, (Int16)y, (Int16)z);
+            Delegates.glWindowPos3iv((Int32*)v);
             #if DEBUG
             }
             #endif
@@ -82376,16 +82353,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , coordinates for the raster position.
         /// </para>
         /// </param>
-        [System.CLSCompliant(false)]
-        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glWindowPos3sv")]
+        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glWindowPos3s")]
         public static 
-        unsafe void WindowPos3(Int16* v)
+        void WindowPos3(Int16 x, Int16 y, Int16 z)
         {
             #if DEBUG
             using (new ErrorHelper(GraphicsContext.CurrentContext))
             {
             #endif
-            Delegates.glWindowPos3sv((Int16*)v);
+            Delegates.glWindowPos3s((Int16)x, (Int16)y, (Int16)z);
             #if DEBUG
             }
             #endif
@@ -82449,6 +82425,30 @@ namespace OpenTK.Graphics.OpenGL
             #endif
         }
 
+        
+        /// <summary>
+        /// Specify the raster position in window coordinates for pixel operations
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify the , , coordinates for the raster position.
+        /// </para>
+        /// </param>
+        [System.CLSCompliant(false)]
+        [AutoGenerated(Category = "Version14Deprecated", Version = "1.4", EntryPoint = "glWindowPos3sv")]
+        public static 
+        unsafe void WindowPos3(Int16* v)
+        {
+            #if DEBUG
+            using (new ErrorHelper(GraphicsContext.CurrentContext))
+            {
+            #endif
+            Delegates.glWindowPos3sv((Int16*)v);
+            #if DEBUG
+            }
+            #endif
+        }
+
         public static partial class Ext
         {
             [AutoGenerated(Category = "ExtStencilTwoSide", Version = "1.3", EntryPoint = "glActiveStencilFaceEXT")]
@@ -82480,40 +82480,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Determine if textures are loaded in texture memory
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of textures to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="textures">
-        /// <para>
-        /// Specifies an array containing the names of the textures to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="residences">
-        /// <para>
-        /// Specifies an array in which the texture residence status is returned. The residence status of a texture named by an element of textures is returned in the corresponding element of residences.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtTextureObject", Version = "1.0", EntryPoint = "glAreTexturesResidentEXT")]
-            public static 
-            unsafe bool AreTexturesResident(Int32 n, Int32* textures, [OutAttribute] bool* residences)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                return Delegates.glAreTexturesResidentEXT((Int32)n, (UInt32*)textures, (bool*)residences);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Determine if textures are loaded in texture memory
         /// </summary>
@@ -82596,6 +82562,81 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Determine if textures are loaded in texture memory
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of textures to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="textures">
+        /// <para>
+        /// Specifies an array containing the names of the textures to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="residences">
+        /// <para>
+        /// Specifies an array in which the texture residence status is returned. The residence status of a texture named by an element of textures is returned in the corresponding element of residences.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtTextureObject", Version = "1.0", EntryPoint = "glAreTexturesResidentEXT")]
+            public static 
+            unsafe bool AreTexturesResident(Int32 n, Int32* textures, [OutAttribute] bool* residences)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                return Delegates.glAreTexturesResidentEXT((Int32)n, (UInt32*)textures, (bool*)residences);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Determine if textures are loaded in texture memory
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of textures to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="textures">
+        /// <para>
+        /// Specifies an array containing the names of the textures to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="residences">
+        /// <para>
+        /// Specifies an array in which the texture residence status is returned. The residence status of a texture named by an element of textures is returned in the corresponding element of residences.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtTextureObject", Version = "1.0", EntryPoint = "glAreTexturesResidentEXT")]
+            public static 
+            bool AreTexturesResident(Int32 n, UInt32[] textures, [OutAttribute] bool[] residences)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* textures_ptr = textures)
+                    fixed (bool* residences_ptr = residences)
+                    {
+                        return Delegates.glAreTexturesResidentEXT((Int32)n, (UInt32*)textures_ptr, (bool*)residences_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Determine if textures are loaded in texture memory
         /// </summary>
@@ -82673,47 +82714,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Determine if textures are loaded in texture memory
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of textures to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="textures">
-        /// <para>
-        /// Specifies an array containing the names of the textures to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="residences">
-        /// <para>
-        /// Specifies an array in which the texture residence status is returned. The residence status of a texture named by an element of textures is returned in the corresponding element of residences.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtTextureObject", Version = "1.0", EntryPoint = "glAreTexturesResidentEXT")]
-            public static 
-            bool AreTexturesResident(Int32 n, UInt32[] textures, [OutAttribute] bool[] residences)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* textures_ptr = textures)
-                    fixed (bool* residences_ptr = residences)
-                    {
-                        return Delegates.glAreTexturesResidentEXT((Int32)n, (UInt32*)textures_ptr, (bool*)residences_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Render a vertex using the specified vertex array element
         /// </summary>
@@ -83152,21 +83152,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormal3bvEXT")]
-            public static 
-            unsafe void Binormal3(Byte* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glBinormal3bvEXT((SByte*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormal3bvEXT")]
             public static 
             void Binormal3(Byte[] v)
@@ -83207,6 +83192,42 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormal3bvEXT")]
+            public static 
+            unsafe void Binormal3(Byte* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glBinormal3bvEXT((SByte*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormal3bvEXT")]
+            public static 
+            void Binormal3(SByte[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (SByte* v_ptr = v)
+                    {
+                        Delegates.glBinormal3bvEXT((SByte*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormal3bvEXT")]
             public static 
@@ -83243,27 +83264,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormal3bvEXT")]
-            public static 
-            void Binormal3(SByte[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (SByte* v_ptr = v)
-                    {
-                        Delegates.glBinormal3bvEXT((SByte*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormal3dEXT")]
             public static 
             void Binormal3(Double bx, Double by, Double bz)
@@ -83278,21 +83278,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormal3dvEXT")]
-            public static 
-            unsafe void Binormal3(Double* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glBinormal3dvEXT((Double*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormal3dvEXT")]
             public static 
             void Binormal3(Double[] v)
@@ -83333,6 +83318,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormal3dvEXT")]
+            public static 
+            unsafe void Binormal3(Double* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glBinormal3dvEXT((Double*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormal3fEXT")]
             public static 
             void Binormal3(Single bx, Single by, Single bz)
@@ -83347,6 +83347,26 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormal3fvEXT")]
+            public static 
+            void Binormal3(Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glBinormal3fvEXT((Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormal3fvEXT")]
             public static 
             void Binormal3(ref Single v)
@@ -83382,26 +83402,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormal3fvEXT")]
-            public static 
-            void Binormal3(Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glBinormal3fvEXT((Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormal3iEXT")]
             public static 
             void Binormal3(Int32 bx, Int32 by, Int32 bz)
@@ -83416,21 +83416,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormal3ivEXT")]
-            public static 
-            unsafe void Binormal3(Int32* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glBinormal3ivEXT((Int32*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormal3ivEXT")]
             public static 
             void Binormal3(Int32[] v)
@@ -83471,6 +83456,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormal3ivEXT")]
+            public static 
+            unsafe void Binormal3(Int32* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glBinormal3ivEXT((Int32*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormal3sEXT")]
             public static 
             void Binormal3(Int16 bx, Int16 by, Int16 bz)
@@ -83485,21 +83485,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormal3svEXT")]
-            public static 
-            unsafe void Binormal3(Int16* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glBinormal3svEXT((Int16*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormal3svEXT")]
             public static 
             void Binormal3(Int16[] v)
@@ -83540,25 +83525,16 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormalPointerEXT")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormal3svEXT")]
             public static 
-            void BinormalPointer<T2>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T2 pointer)
-                where T2 : struct
+            unsafe void Binormal3(Int16* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glBinormalPointerEXT((OpenTK.Graphics.OpenGL.NormalPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                    pointer = (T2)pointer_ptr.Target;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
+                Delegates.glBinormal3svEXT((Int16*)v);
                 #if DEBUG
                 }
                 #endif
@@ -83566,7 +83542,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormalPointerEXT")]
             public static 
-            void BinormalPointer<T2>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, [InAttribute, OutAttribute] T2[,,] pointer)
+            void BinormalPointer(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, IntPtr pointer)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glBinormalPointerEXT((OpenTK.Graphics.OpenGL.NormalPointerType)type, (Int32)stride, (IntPtr)pointer);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormalPointerEXT")]
+            public static 
+            void BinormalPointer<T2>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, [InAttribute, OutAttribute] T2[] pointer)
                 where T2 : struct
             {
                 #if DEBUG
@@ -83612,7 +83602,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormalPointerEXT")]
             public static 
-            void BinormalPointer<T2>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, [InAttribute, OutAttribute] T2[] pointer)
+            void BinormalPointer<T2>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, [InAttribute, OutAttribute] T2[,,] pointer)
                 where T2 : struct
             {
                 #if DEBUG
@@ -83635,13 +83625,23 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glBinormalPointerEXT")]
             public static 
-            void BinormalPointer(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, IntPtr pointer)
+            void BinormalPointer<T2>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T2 pointer)
+                where T2 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glBinormalPointerEXT((OpenTK.Graphics.OpenGL.NormalPointerType)type, (Int32)stride, (IntPtr)pointer);
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glBinormalPointerEXT((OpenTK.Graphics.OpenGL.NormalPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    pointer = (T2)pointer_ptr.Target;
+                }
+                finally
+                {
+                    pointer_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -83914,23 +83914,13 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtVertexArray", Version = "1.0", EntryPoint = "glColorPointerEXT")]
             public static 
-            void ColorPointer<T4>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] ref T4 pointer)
-                where T4 : struct
+            void ColorPointer(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, Int32 count, IntPtr pointer)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glColorPointerEXT((Int32)size, (OpenTK.Graphics.OpenGL.ColorPointerType)type, (Int32)stride, (Int32)count, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                    pointer = (T4)pointer_ptr.Target;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
+                Delegates.glColorPointerEXT((Int32)size, (OpenTK.Graphics.OpenGL.ColorPointerType)type, (Int32)stride, (Int32)count, (IntPtr)pointer);
                 #if DEBUG
                 }
                 #endif
@@ -83962,7 +83952,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtVertexArray", Version = "1.0", EntryPoint = "glColorPointerEXT")]
             public static 
-            void ColorPointer<T4>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] T4[,,] pointer)
+            void ColorPointer<T4>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] T4[] pointer)
                 where T4 : struct
             {
                 #if DEBUG
@@ -84056,7 +84046,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtVertexArray", Version = "1.0", EntryPoint = "glColorPointerEXT")]
             public static 
-            void ColorPointer<T4>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] T4[] pointer)
+            void ColorPointer<T4>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] T4[,,] pointer)
                 where T4 : struct
             {
                 #if DEBUG
@@ -84103,70 +84093,22 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtVertexArray", Version = "1.0", EntryPoint = "glColorPointerEXT")]
             public static 
-            void ColorPointer(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, Int32 count, IntPtr pointer)
+            void ColorPointer<T4>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] ref T4 pointer)
+                where T4 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glColorPointerEXT((Int32)size, (OpenTK.Graphics.OpenGL.ColorPointerType)type, (Int32)stride, (Int32)count, (IntPtr)pointer);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Respecify a portion of a color table
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Must be one of GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, or GL_POST_COLOR_MATRIX_COLOR_TABLE.
-        /// </para>
-        /// </param>
-        /// <param name="start">
-        /// <para>
-        /// The starting index of the portion of the color table to be replaced.
-        /// </para>
-        /// </param>
-        /// <param name="count">
-        /// <para>
-        /// The number of table entries to replace.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// The format of the pixel data in data. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_RGB, GL_BGR, GL_RGBA, and GL_BGRA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// The type of the pixel data in data. The allowable values are GL_UNSIGNED_BYTE, GL_BYTE, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Pointer to a one-dimensional array of pixel data that is processed to replace the specified region of the color table.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtColorSubtable", Version = "1.2", EntryPoint = "glColorSubTableEXT")]
-            public static 
-            void ColorSubTable<T5>(OpenTK.Graphics.OpenGL.ColorTableTarget target, Int32 start, Int32 count, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T5 data)
-                where T5 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glColorSubTableEXT((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (Int32)start, (Int32)count, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)data_ptr.AddrOfPinnedObject());
-                    data = (T5)data_ptr.Target;
+                    Delegates.glColorPointerEXT((Int32)size, (OpenTK.Graphics.OpenGL.ColorPointerType)type, (Int32)stride, (Int32)count, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    pointer = (T4)pointer_ptr.Target;
                 }
                 finally
                 {
-                    data_ptr.Free();
+                    pointer_ptr.Free();
                 }
                 #if DEBUG
                 }
@@ -84209,7 +84151,55 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtColorSubtable", Version = "1.2", EntryPoint = "glColorSubTableEXT")]
             public static 
-            void ColorSubTable<T5>(OpenTK.Graphics.OpenGL.ColorTableTarget target, Int32 start, Int32 count, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[,,] data)
+            void ColorSubTable(OpenTK.Graphics.OpenGL.ColorTableTarget target, Int32 start, Int32 count, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr data)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glColorSubTableEXT((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (Int32)start, (Int32)count, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)data);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Respecify a portion of a color table
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be one of GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, or GL_POST_COLOR_MATRIX_COLOR_TABLE.
+        /// </para>
+        /// </param>
+        /// <param name="start">
+        /// <para>
+        /// The starting index of the portion of the color table to be replaced.
+        /// </para>
+        /// </param>
+        /// <param name="count">
+        /// <para>
+        /// The number of table entries to replace.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// The format of the pixel data in data. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_RGB, GL_BGR, GL_RGBA, and GL_BGRA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// The type of the pixel data in data. The allowable values are GL_UNSIGNED_BYTE, GL_BYTE, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Pointer to a one-dimensional array of pixel data that is processed to replace the specified region of the color table.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtColorSubtable", Version = "1.2", EntryPoint = "glColorSubTableEXT")]
+            public static 
+            void ColorSubTable<T5>(OpenTK.Graphics.OpenGL.ColorTableTarget target, Int32 start, Int32 count, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[] data)
                 where T5 : struct
             {
                 #if DEBUG
@@ -84323,7 +84313,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtColorSubtable", Version = "1.2", EntryPoint = "glColorSubTableEXT")]
             public static 
-            void ColorSubTable<T5>(OpenTK.Graphics.OpenGL.ColorTableTarget target, Int32 start, Int32 count, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[] data)
+            void ColorSubTable<T5>(OpenTK.Graphics.OpenGL.ColorTableTarget target, Int32 start, Int32 count, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[,,] data)
                 where T5 : struct
             {
                 #if DEBUG
@@ -84380,70 +84370,22 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtColorSubtable", Version = "1.2", EntryPoint = "glColorSubTableEXT")]
             public static 
-            void ColorSubTable(OpenTK.Graphics.OpenGL.ColorTableTarget target, Int32 start, Int32 count, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr data)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glColorSubTableEXT((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (Int32)start, (Int32)count, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)data);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Define a color lookup table
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Must be one of GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, GL_POST_COLOR_MATRIX_COLOR_TABLE, GL_PROXY_COLOR_TABLE, GL_PROXY_POST_CONVOLUTION_COLOR_TABLE, or GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE.
-        /// </para>
-        /// </param>
-        /// <param name="internalformat">
-        /// <para>
-        /// The internal format of the color table. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, and GL_RGBA16.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// The number of entries in the color lookup table specified by data.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// The format of the pixel data in data. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_RGB, GL_BGR, GL_RGBA, and GL_BGRA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// The type of the pixel data in data. The allowable values are GL_UNSIGNED_BYTE, GL_BYTE, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Pointer to a one-dimensional array of pixel data that is processed to build the color table.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtPalettedTexture", Version = "1.1", EntryPoint = "glColorTableEXT")]
-            public static 
-            void ColorTable<T5>(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalFormat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T5 table)
+            void ColorSubTable<T5>(OpenTK.Graphics.OpenGL.ColorTableTarget target, Int32 start, Int32 count, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T5 data)
                 where T5 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle table_ptr = GCHandle.Alloc(table, GCHandleType.Pinned);
+                GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glColorTableEXT((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalFormat, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)table_ptr.AddrOfPinnedObject());
-                    table = (T5)table_ptr.Target;
+                    Delegates.glColorSubTableEXT((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (Int32)start, (Int32)count, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)data_ptr.AddrOfPinnedObject());
+                    data = (T5)data_ptr.Target;
                 }
                 finally
                 {
-                    table_ptr.Free();
+                    data_ptr.Free();
                 }
                 #if DEBUG
                 }
@@ -84486,7 +84428,55 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtPalettedTexture", Version = "1.1", EntryPoint = "glColorTableEXT")]
             public static 
-            void ColorTable<T5>(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalFormat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[,,] table)
+            void ColorTable(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalFormat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr table)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glColorTableEXT((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalFormat, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)table);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Define a color lookup table
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be one of GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, GL_POST_COLOR_MATRIX_COLOR_TABLE, GL_PROXY_COLOR_TABLE, GL_PROXY_POST_CONVOLUTION_COLOR_TABLE, or GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE.
+        /// </para>
+        /// </param>
+        /// <param name="internalformat">
+        /// <para>
+        /// The internal format of the color table. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, and GL_RGBA16.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// The number of entries in the color lookup table specified by data.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// The format of the pixel data in data. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_RGB, GL_BGR, GL_RGBA, and GL_BGRA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// The type of the pixel data in data. The allowable values are GL_UNSIGNED_BYTE, GL_BYTE, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Pointer to a one-dimensional array of pixel data that is processed to build the color table.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtPalettedTexture", Version = "1.1", EntryPoint = "glColorTableEXT")]
+            public static 
+            void ColorTable<T5>(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalFormat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[] table)
                 where T5 : struct
             {
                 #if DEBUG
@@ -84600,7 +84590,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtPalettedTexture", Version = "1.1", EntryPoint = "glColorTableEXT")]
             public static 
-            void ColorTable<T5>(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalFormat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[] table)
+            void ColorTable<T5>(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalFormat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[,,] table)
                 where T5 : struct
             {
                 #if DEBUG
@@ -84657,36 +84647,22 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtPalettedTexture", Version = "1.1", EntryPoint = "glColorTableEXT")]
             public static 
-            void ColorTable(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalFormat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr table)
+            void ColorTable<T5>(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalFormat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T5 table)
+                where T5 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glColorTableEXT((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalFormat, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)table);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexImage1DEXT")]
-            public static 
-            void CompressedMultiTexImage1D<T7>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T7 bits)
-                where T7 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle bits_ptr = GCHandle.Alloc(bits, GCHandleType.Pinned);
+                GCHandle table_ptr = GCHandle.Alloc(table, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glCompressedMultiTexImage1DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)border, (Int32)imageSize, (IntPtr)bits_ptr.AddrOfPinnedObject());
-                    bits = (T7)bits_ptr.Target;
+                    Delegates.glColorTableEXT((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalFormat, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)table_ptr.AddrOfPinnedObject());
+                    table = (T5)table_ptr.Target;
                 }
                 finally
                 {
-                    bits_ptr.Free();
+                    table_ptr.Free();
                 }
                 #if DEBUG
                 }
@@ -84695,7 +84671,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexImage1DEXT")]
             public static 
-            void CompressedMultiTexImage1D<T7>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[,,] bits)
+            void CompressedMultiTexImage1D(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, Int32 imageSize, IntPtr bits)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glCompressedMultiTexImage1DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)border, (Int32)imageSize, (IntPtr)bits);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexImage1DEXT")]
+            public static 
+            void CompressedMultiTexImage1D<T7>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[] bits)
                 where T7 : struct
             {
                 #if DEBUG
@@ -84741,7 +84731,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexImage1DEXT")]
             public static 
-            void CompressedMultiTexImage1D<T7>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[] bits)
+            void CompressedMultiTexImage1D<T7>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[,,] bits)
                 where T7 : struct
             {
                 #if DEBUG
@@ -84764,22 +84754,8 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexImage1DEXT")]
             public static 
-            void CompressedMultiTexImage1D(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, Int32 imageSize, IntPtr bits)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glCompressedMultiTexImage1DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)border, (Int32)imageSize, (IntPtr)bits);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexImage2DEXT")]
-            public static 
-            void CompressedMultiTexImage2D<T8>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T8 bits)
-                where T8 : struct
+            void CompressedMultiTexImage1D<T7>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T7 bits)
+                where T7 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -84788,8 +84764,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle bits_ptr = GCHandle.Alloc(bits, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glCompressedMultiTexImage2DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)bits_ptr.AddrOfPinnedObject());
-                    bits = (T8)bits_ptr.Target;
+                    Delegates.glCompressedMultiTexImage1DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)border, (Int32)imageSize, (IntPtr)bits_ptr.AddrOfPinnedObject());
+                    bits = (T7)bits_ptr.Target;
                 }
                 finally
                 {
@@ -84802,7 +84778,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexImage2DEXT")]
             public static 
-            void CompressedMultiTexImage2D<T8>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[,,] bits)
+            void CompressedMultiTexImage2D(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, IntPtr bits)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glCompressedMultiTexImage2DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)bits);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexImage2DEXT")]
+            public static 
+            void CompressedMultiTexImage2D<T8>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[] bits)
                 where T8 : struct
             {
                 #if DEBUG
@@ -84848,7 +84838,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexImage2DEXT")]
             public static 
-            void CompressedMultiTexImage2D<T8>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[] bits)
+            void CompressedMultiTexImage2D<T8>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[,,] bits)
                 where T8 : struct
             {
                 #if DEBUG
@@ -84871,22 +84861,8 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexImage2DEXT")]
             public static 
-            void CompressedMultiTexImage2D(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, IntPtr bits)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glCompressedMultiTexImage2DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)bits);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexImage3DEXT")]
-            public static 
-            void CompressedMultiTexImage3D<T9>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T9 bits)
-                where T9 : struct
+            void CompressedMultiTexImage2D<T8>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T8 bits)
+                where T8 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -84895,8 +84871,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle bits_ptr = GCHandle.Alloc(bits, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glCompressedMultiTexImage3DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)bits_ptr.AddrOfPinnedObject());
-                    bits = (T9)bits_ptr.Target;
+                    Delegates.glCompressedMultiTexImage2DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)bits_ptr.AddrOfPinnedObject());
+                    bits = (T8)bits_ptr.Target;
                 }
                 finally
                 {
@@ -84909,7 +84885,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexImage3DEXT")]
             public static 
-            void CompressedMultiTexImage3D<T9>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T9[,,] bits)
+            void CompressedMultiTexImage3D(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, IntPtr bits)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glCompressedMultiTexImage3DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)bits);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexImage3DEXT")]
+            public static 
+            void CompressedMultiTexImage3D<T9>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T9[] bits)
                 where T9 : struct
             {
                 #if DEBUG
@@ -84955,7 +84945,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexImage3DEXT")]
             public static 
-            void CompressedMultiTexImage3D<T9>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T9[] bits)
+            void CompressedMultiTexImage3D<T9>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T9[,,] bits)
                 where T9 : struct
             {
                 #if DEBUG
@@ -84978,22 +84968,8 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexImage3DEXT")]
             public static 
-            void CompressedMultiTexImage3D(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, IntPtr bits)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glCompressedMultiTexImage3DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)bits);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexSubImage1DEXT")]
-            public static 
-            void CompressedMultiTexSubImage1D<T7>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T7 bits)
-                where T7 : struct
+            void CompressedMultiTexImage3D<T9>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T9 bits)
+                where T9 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -85002,8 +84978,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle bits_ptr = GCHandle.Alloc(bits, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glCompressedMultiTexSubImage1DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits_ptr.AddrOfPinnedObject());
-                    bits = (T7)bits_ptr.Target;
+                    Delegates.glCompressedMultiTexImage3DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)bits_ptr.AddrOfPinnedObject());
+                    bits = (T9)bits_ptr.Target;
                 }
                 finally
                 {
@@ -85016,7 +84992,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexSubImage1DEXT")]
             public static 
-            void CompressedMultiTexSubImage1D<T7>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T7[,,] bits)
+            void CompressedMultiTexSubImage1D(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr bits)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glCompressedMultiTexSubImage1DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexSubImage1DEXT")]
+            public static 
+            void CompressedMultiTexSubImage1D<T7>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T7[] bits)
                 where T7 : struct
             {
                 #if DEBUG
@@ -85062,7 +85052,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexSubImage1DEXT")]
             public static 
-            void CompressedMultiTexSubImage1D<T7>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T7[] bits)
+            void CompressedMultiTexSubImage1D<T7>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T7[,,] bits)
                 where T7 : struct
             {
                 #if DEBUG
@@ -85085,22 +85075,8 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexSubImage1DEXT")]
             public static 
-            void CompressedMultiTexSubImage1D(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr bits)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glCompressedMultiTexSubImage1DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexSubImage2DEXT")]
-            public static 
-            void CompressedMultiTexSubImage2D<T9>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T9 bits)
-                where T9 : struct
+            void CompressedMultiTexSubImage1D<T7>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T7 bits)
+                where T7 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -85109,8 +85085,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle bits_ptr = GCHandle.Alloc(bits, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glCompressedMultiTexSubImage2DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits_ptr.AddrOfPinnedObject());
-                    bits = (T9)bits_ptr.Target;
+                    Delegates.glCompressedMultiTexSubImage1DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits_ptr.AddrOfPinnedObject());
+                    bits = (T7)bits_ptr.Target;
                 }
                 finally
                 {
@@ -85123,7 +85099,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexSubImage2DEXT")]
             public static 
-            void CompressedMultiTexSubImage2D<T9>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T9[,,] bits)
+            void CompressedMultiTexSubImage2D(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr bits)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glCompressedMultiTexSubImage2DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexSubImage2DEXT")]
+            public static 
+            void CompressedMultiTexSubImage2D<T9>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T9[] bits)
                 where T9 : struct
             {
                 #if DEBUG
@@ -85169,7 +85159,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexSubImage2DEXT")]
             public static 
-            void CompressedMultiTexSubImage2D<T9>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T9[] bits)
+            void CompressedMultiTexSubImage2D<T9>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T9[,,] bits)
                 where T9 : struct
             {
                 #if DEBUG
@@ -85192,22 +85182,8 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexSubImage2DEXT")]
             public static 
-            void CompressedMultiTexSubImage2D(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr bits)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glCompressedMultiTexSubImage2DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexSubImage3DEXT")]
-            public static 
-            void CompressedMultiTexSubImage3D<T11>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T11 bits)
-                where T11 : struct
+            void CompressedMultiTexSubImage2D<T9>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T9 bits)
+                where T9 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -85216,8 +85192,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle bits_ptr = GCHandle.Alloc(bits, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glCompressedMultiTexSubImage3DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits_ptr.AddrOfPinnedObject());
-                    bits = (T11)bits_ptr.Target;
+                    Delegates.glCompressedMultiTexSubImage2DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits_ptr.AddrOfPinnedObject());
+                    bits = (T9)bits_ptr.Target;
                 }
                 finally
                 {
@@ -85230,7 +85206,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexSubImage3DEXT")]
             public static 
-            void CompressedMultiTexSubImage3D<T11>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T11[,,] bits)
+            void CompressedMultiTexSubImage3D(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr bits)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glCompressedMultiTexSubImage3DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexSubImage3DEXT")]
+            public static 
+            void CompressedMultiTexSubImage3D<T11>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T11[] bits)
                 where T11 : struct
             {
                 #if DEBUG
@@ -85276,7 +85266,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexSubImage3DEXT")]
             public static 
-            void CompressedMultiTexSubImage3D<T11>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T11[] bits)
+            void CompressedMultiTexSubImage3D<T11>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T11[,,] bits)
                 where T11 : struct
             {
                 #if DEBUG
@@ -85299,22 +85289,8 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedMultiTexSubImage3DEXT")]
             public static 
-            void CompressedMultiTexSubImage3D(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr bits)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glCompressedMultiTexSubImage3DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage1DEXT")]
-            public static 
-            void CompressedTextureImage1D<T7>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T7 bits)
-                where T7 : struct
+            void CompressedMultiTexSubImage3D<T11>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T11 bits)
+                where T11 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -85323,8 +85299,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle bits_ptr = GCHandle.Alloc(bits, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glCompressedTextureImage1DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)border, (Int32)imageSize, (IntPtr)bits_ptr.AddrOfPinnedObject());
-                    bits = (T7)bits_ptr.Target;
+                    Delegates.glCompressedMultiTexSubImage3DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits_ptr.AddrOfPinnedObject());
+                    bits = (T11)bits_ptr.Target;
                 }
                 finally
                 {
@@ -85337,7 +85313,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage1DEXT")]
             public static 
-            void CompressedTextureImage1D<T7>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[,,] bits)
+            void CompressedTextureImage1D(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, Int32 imageSize, IntPtr bits)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glCompressedTextureImage1DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)border, (Int32)imageSize, (IntPtr)bits);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage1DEXT")]
+            public static 
+            void CompressedTextureImage1D<T7>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[] bits)
                 where T7 : struct
             {
                 #if DEBUG
@@ -85383,7 +85373,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage1DEXT")]
             public static 
-            void CompressedTextureImage1D<T7>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[] bits)
+            void CompressedTextureImage1D<T7>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[,,] bits)
                 where T7 : struct
             {
                 #if DEBUG
@@ -85406,22 +85396,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage1DEXT")]
             public static 
-            void CompressedTextureImage1D(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, Int32 imageSize, IntPtr bits)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glCompressedTextureImage1DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)border, (Int32)imageSize, (IntPtr)bits);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage1DEXT")]
-            public static 
-            void CompressedTextureImage1D<T7>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T7 bits)
+            void CompressedTextureImage1D<T7>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T7 bits)
                 where T7 : struct
             {
                 #if DEBUG
@@ -85446,7 +85421,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage1DEXT")]
             public static 
-            void CompressedTextureImage1D<T7>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[,,] bits)
+            void CompressedTextureImage1D(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, Int32 imageSize, IntPtr bits)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glCompressedTextureImage1DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)border, (Int32)imageSize, (IntPtr)bits);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage1DEXT")]
+            public static 
+            void CompressedTextureImage1D<T7>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[] bits)
                 where T7 : struct
             {
                 #if DEBUG
@@ -85494,7 +85484,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage1DEXT")]
             public static 
-            void CompressedTextureImage1D<T7>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[] bits)
+            void CompressedTextureImage1D<T7>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T7[,,] bits)
                 where T7 : struct
             {
                 #if DEBUG
@@ -85518,22 +85508,8 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage1DEXT")]
             public static 
-            void CompressedTextureImage1D(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, Int32 imageSize, IntPtr bits)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glCompressedTextureImage1DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)border, (Int32)imageSize, (IntPtr)bits);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage2DEXT")]
-            public static 
-            void CompressedTextureImage2D<T8>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T8 bits)
-                where T8 : struct
+            void CompressedTextureImage1D<T7>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T7 bits)
+                where T7 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -85542,8 +85518,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle bits_ptr = GCHandle.Alloc(bits, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glCompressedTextureImage2DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)bits_ptr.AddrOfPinnedObject());
-                    bits = (T8)bits_ptr.Target;
+                    Delegates.glCompressedTextureImage1DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)border, (Int32)imageSize, (IntPtr)bits_ptr.AddrOfPinnedObject());
+                    bits = (T7)bits_ptr.Target;
                 }
                 finally
                 {
@@ -85556,7 +85532,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage2DEXT")]
             public static 
-            void CompressedTextureImage2D<T8>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[,,] bits)
+            void CompressedTextureImage2D(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, IntPtr bits)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glCompressedTextureImage2DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)bits);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage2DEXT")]
+            public static 
+            void CompressedTextureImage2D<T8>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[] bits)
                 where T8 : struct
             {
                 #if DEBUG
@@ -85602,7 +85592,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage2DEXT")]
             public static 
-            void CompressedTextureImage2D<T8>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[] bits)
+            void CompressedTextureImage2D<T8>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[,,] bits)
                 where T8 : struct
             {
                 #if DEBUG
@@ -85625,22 +85615,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage2DEXT")]
             public static 
-            void CompressedTextureImage2D(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, IntPtr bits)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glCompressedTextureImage2DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)bits);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage2DEXT")]
-            public static 
-            void CompressedTextureImage2D<T8>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T8 bits)
+            void CompressedTextureImage2D<T8>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T8 bits)
                 where T8 : struct
             {
                 #if DEBUG
@@ -85665,7 +85640,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage2DEXT")]
             public static 
-            void CompressedTextureImage2D<T8>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[,,] bits)
+            void CompressedTextureImage2D(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, IntPtr bits)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glCompressedTextureImage2DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)bits);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage2DEXT")]
+            public static 
+            void CompressedTextureImage2D<T8>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[] bits)
                 where T8 : struct
             {
                 #if DEBUG
@@ -85713,7 +85703,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage2DEXT")]
             public static 
-            void CompressedTextureImage2D<T8>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[] bits)
+            void CompressedTextureImage2D<T8>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T8[,,] bits)
                 where T8 : struct
             {
                 #if DEBUG
@@ -85737,22 +85727,8 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage2DEXT")]
             public static 
-            void CompressedTextureImage2D(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, IntPtr bits)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glCompressedTextureImage2DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)bits);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage3DEXT")]
-            public static 
-            void CompressedTextureImage3D<T9>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T9 bits)
-                where T9 : struct
+            void CompressedTextureImage2D<T8>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T8 bits)
+                where T8 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -85761,8 +85737,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle bits_ptr = GCHandle.Alloc(bits, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glCompressedTextureImage3DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)bits_ptr.AddrOfPinnedObject());
-                    bits = (T9)bits_ptr.Target;
+                    Delegates.glCompressedTextureImage2DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)border, (Int32)imageSize, (IntPtr)bits_ptr.AddrOfPinnedObject());
+                    bits = (T8)bits_ptr.Target;
                 }
                 finally
                 {
@@ -85775,7 +85751,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage3DEXT")]
             public static 
-            void CompressedTextureImage3D<T9>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T9[,,] bits)
+            void CompressedTextureImage3D(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, IntPtr bits)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glCompressedTextureImage3DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)bits);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage3DEXT")]
+            public static 
+            void CompressedTextureImage3D<T9>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T9[] bits)
                 where T9 : struct
             {
                 #if DEBUG
@@ -85821,7 +85811,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage3DEXT")]
             public static 
-            void CompressedTextureImage3D<T9>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T9[] bits)
+            void CompressedTextureImage3D<T9>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T9[,,] bits)
                 where T9 : struct
             {
                 #if DEBUG
@@ -85844,22 +85834,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage3DEXT")]
             public static 
-            void CompressedTextureImage3D(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, IntPtr bits)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glCompressedTextureImage3DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)bits);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage3DEXT")]
-            public static 
-            void CompressedTextureImage3D<T9>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T9 bits)
+            void CompressedTextureImage3D<T9>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T9 bits)
                 where T9 : struct
             {
                 #if DEBUG
@@ -85884,7 +85859,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage3DEXT")]
             public static 
-            void CompressedTextureImage3D<T9>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T9[,,] bits)
+            void CompressedTextureImage3D(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, IntPtr bits)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glCompressedTextureImage3DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)bits);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage3DEXT")]
+            public static 
+            void CompressedTextureImage3D<T9>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T9[] bits)
                 where T9 : struct
             {
                 #if DEBUG
@@ -85932,7 +85922,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage3DEXT")]
             public static 
-            void CompressedTextureImage3D<T9>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T9[] bits)
+            void CompressedTextureImage3D<T9>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] T9[,,] bits)
                 where T9 : struct
             {
                 #if DEBUG
@@ -85956,22 +85946,8 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureImage3DEXT")]
             public static 
-            void CompressedTextureImage3D(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, IntPtr bits)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glCompressedTextureImage3DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)bits);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage1DEXT")]
-            public static 
-            void CompressedTextureSubImage1D<T7>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T7 bits)
-                where T7 : struct
+            void CompressedTextureImage3D<T9>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, Int32 imageSize, [InAttribute, OutAttribute] ref T9 bits)
+                where T9 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -85980,8 +85956,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle bits_ptr = GCHandle.Alloc(bits, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glCompressedTextureSubImage1DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits_ptr.AddrOfPinnedObject());
-                    bits = (T7)bits_ptr.Target;
+                    Delegates.glCompressedTextureImage3DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (Int32)imageSize, (IntPtr)bits_ptr.AddrOfPinnedObject());
+                    bits = (T9)bits_ptr.Target;
                 }
                 finally
                 {
@@ -85994,7 +85970,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage1DEXT")]
             public static 
-            void CompressedTextureSubImage1D<T7>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T7[,,] bits)
+            void CompressedTextureSubImage1D(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr bits)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glCompressedTextureSubImage1DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage1DEXT")]
+            public static 
+            void CompressedTextureSubImage1D<T7>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T7[] bits)
                 where T7 : struct
             {
                 #if DEBUG
@@ -86040,7 +86030,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage1DEXT")]
             public static 
-            void CompressedTextureSubImage1D<T7>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T7[] bits)
+            void CompressedTextureSubImage1D<T7>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T7[,,] bits)
                 where T7 : struct
             {
                 #if DEBUG
@@ -86063,22 +86053,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage1DEXT")]
             public static 
-            void CompressedTextureSubImage1D(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr bits)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glCompressedTextureSubImage1DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage1DEXT")]
-            public static 
-            void CompressedTextureSubImage1D<T7>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T7 bits)
+            void CompressedTextureSubImage1D<T7>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T7 bits)
                 where T7 : struct
             {
                 #if DEBUG
@@ -86103,7 +86078,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage1DEXT")]
             public static 
-            void CompressedTextureSubImage1D<T7>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T7[,,] bits)
+            void CompressedTextureSubImage1D(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr bits)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glCompressedTextureSubImage1DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage1DEXT")]
+            public static 
+            void CompressedTextureSubImage1D<T7>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T7[] bits)
                 where T7 : struct
             {
                 #if DEBUG
@@ -86151,7 +86141,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage1DEXT")]
             public static 
-            void CompressedTextureSubImage1D<T7>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T7[] bits)
+            void CompressedTextureSubImage1D<T7>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T7[,,] bits)
                 where T7 : struct
             {
                 #if DEBUG
@@ -86175,22 +86165,8 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage1DEXT")]
             public static 
-            void CompressedTextureSubImage1D(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr bits)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glCompressedTextureSubImage1DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage2DEXT")]
-            public static 
-            void CompressedTextureSubImage2D<T9>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T9 bits)
-                where T9 : struct
+            void CompressedTextureSubImage1D<T7>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T7 bits)
+                where T7 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -86199,8 +86175,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle bits_ptr = GCHandle.Alloc(bits, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glCompressedTextureSubImage2DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits_ptr.AddrOfPinnedObject());
-                    bits = (T9)bits_ptr.Target;
+                    Delegates.glCompressedTextureSubImage1DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits_ptr.AddrOfPinnedObject());
+                    bits = (T7)bits_ptr.Target;
                 }
                 finally
                 {
@@ -86213,7 +86189,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage2DEXT")]
             public static 
-            void CompressedTextureSubImage2D<T9>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T9[,,] bits)
+            void CompressedTextureSubImage2D(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr bits)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glCompressedTextureSubImage2DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage2DEXT")]
+            public static 
+            void CompressedTextureSubImage2D<T9>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T9[] bits)
                 where T9 : struct
             {
                 #if DEBUG
@@ -86259,7 +86249,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage2DEXT")]
             public static 
-            void CompressedTextureSubImage2D<T9>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T9[] bits)
+            void CompressedTextureSubImage2D<T9>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T9[,,] bits)
                 where T9 : struct
             {
                 #if DEBUG
@@ -86282,22 +86272,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage2DEXT")]
             public static 
-            void CompressedTextureSubImage2D(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr bits)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glCompressedTextureSubImage2DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage2DEXT")]
-            public static 
-            void CompressedTextureSubImage2D<T9>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T9 bits)
+            void CompressedTextureSubImage2D<T9>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T9 bits)
                 where T9 : struct
             {
                 #if DEBUG
@@ -86322,7 +86297,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage2DEXT")]
             public static 
-            void CompressedTextureSubImage2D<T9>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T9[,,] bits)
+            void CompressedTextureSubImage2D(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr bits)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glCompressedTextureSubImage2DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage2DEXT")]
+            public static 
+            void CompressedTextureSubImage2D<T9>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T9[] bits)
                 where T9 : struct
             {
                 #if DEBUG
@@ -86370,7 +86360,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage2DEXT")]
             public static 
-            void CompressedTextureSubImage2D<T9>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T9[] bits)
+            void CompressedTextureSubImage2D<T9>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T9[,,] bits)
                 where T9 : struct
             {
                 #if DEBUG
@@ -86394,22 +86384,8 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage2DEXT")]
             public static 
-            void CompressedTextureSubImage2D(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr bits)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glCompressedTextureSubImage2DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage3DEXT")]
-            public static 
-            void CompressedTextureSubImage3D<T11>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T11 bits)
-                where T11 : struct
+            void CompressedTextureSubImage2D<T9>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T9 bits)
+                where T9 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -86418,8 +86394,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle bits_ptr = GCHandle.Alloc(bits, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glCompressedTextureSubImage3DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits_ptr.AddrOfPinnedObject());
-                    bits = (T11)bits_ptr.Target;
+                    Delegates.glCompressedTextureSubImage2DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits_ptr.AddrOfPinnedObject());
+                    bits = (T9)bits_ptr.Target;
                 }
                 finally
                 {
@@ -86432,7 +86408,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage3DEXT")]
             public static 
-            void CompressedTextureSubImage3D<T11>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T11[,,] bits)
+            void CompressedTextureSubImage3D(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr bits)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glCompressedTextureSubImage3DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage3DEXT")]
+            public static 
+            void CompressedTextureSubImage3D<T11>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T11[] bits)
                 where T11 : struct
             {
                 #if DEBUG
@@ -86478,7 +86468,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage3DEXT")]
             public static 
-            void CompressedTextureSubImage3D<T11>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T11[] bits)
+            void CompressedTextureSubImage3D<T11>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T11[,,] bits)
                 where T11 : struct
             {
                 #if DEBUG
@@ -86501,22 +86491,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage3DEXT")]
             public static 
-            void CompressedTextureSubImage3D(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr bits)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glCompressedTextureSubImage3DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage3DEXT")]
-            public static 
-            void CompressedTextureSubImage3D<T11>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T11 bits)
+            void CompressedTextureSubImage3D<T11>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T11 bits)
                 where T11 : struct
             {
                 #if DEBUG
@@ -86541,7 +86516,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage3DEXT")]
             public static 
-            void CompressedTextureSubImage3D<T11>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T11[,,] bits)
+            void CompressedTextureSubImage3D(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr bits)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glCompressedTextureSubImage3DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage3DEXT")]
+            public static 
+            void CompressedTextureSubImage3D<T11>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T11[] bits)
                 where T11 : struct
             {
                 #if DEBUG
@@ -86589,7 +86579,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage3DEXT")]
             public static 
-            void CompressedTextureSubImage3D<T11>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T11[] bits)
+            void CompressedTextureSubImage3D<T11>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] T11[,,] bits)
                 where T11 : struct
             {
                 #if DEBUG
@@ -86613,70 +86603,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glCompressedTextureSubImage3DEXT")]
             public static 
-            void CompressedTextureSubImage3D(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, IntPtr bits)
+            void CompressedTextureSubImage3D<T11>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, Int32 imageSize, [InAttribute, OutAttribute] ref T11 bits)
+                where T11 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glCompressedTextureSubImage3DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Define a one-dimensional convolution filter
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Must be GL_CONVOLUTION_1D.
-        /// </para>
-        /// </param>
-        /// <param name="internalformat">
-        /// <para>
-        /// The internal format of the convolution filter kernel. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, or GL_RGBA16.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// The width of the pixel array referenced by data.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// The format of the pixel data in data. The allowable values are GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_INTENSITY, GL_RGB, and GL_RGBA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// The type of the pixel data in data. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Pointer to a one-dimensional array of pixel data that is processed to build the convolution filter kernel.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glConvolutionFilter1DEXT")]
-            public static 
-            void ConvolutionFilter1D<T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T5 image)
-                where T5 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle image_ptr = GCHandle.Alloc(image, GCHandleType.Pinned);
+                GCHandle bits_ptr = GCHandle.Alloc(bits, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glConvolutionFilter1DEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)image_ptr.AddrOfPinnedObject());
-                    image = (T5)image_ptr.Target;
+                    Delegates.glCompressedTextureSubImage3DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (Int32)imageSize, (IntPtr)bits_ptr.AddrOfPinnedObject());
+                    bits = (T11)bits_ptr.Target;
                 }
                 finally
                 {
-                    image_ptr.Free();
+                    bits_ptr.Free();
                 }
                 #if DEBUG
                 }
@@ -86719,7 +86661,55 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glConvolutionFilter1DEXT")]
             public static 
-            void ConvolutionFilter1D<T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[,,] image)
+            void ConvolutionFilter1D(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr image)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glConvolutionFilter1DEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)image);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Define a one-dimensional convolution filter
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be GL_CONVOLUTION_1D.
+        /// </para>
+        /// </param>
+        /// <param name="internalformat">
+        /// <para>
+        /// The internal format of the convolution filter kernel. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, or GL_RGBA16.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// The width of the pixel array referenced by data.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// The format of the pixel data in data. The allowable values are GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_INTENSITY, GL_RGB, and GL_RGBA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// The type of the pixel data in data. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Pointer to a one-dimensional array of pixel data that is processed to build the convolution filter kernel.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glConvolutionFilter1DEXT")]
+            public static 
+            void ConvolutionFilter1D<T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[] image)
                 where T5 : struct
             {
                 #if DEBUG
@@ -86833,7 +86823,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glConvolutionFilter1DEXT")]
             public static 
-            void ConvolutionFilter1D<T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[] image)
+            void ConvolutionFilter1D<T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[,,] image)
                 where T5 : struct
             {
                 #if DEBUG
@@ -86890,61 +86880,8 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glConvolutionFilter1DEXT")]
             public static 
-            void ConvolutionFilter1D(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr image)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glConvolutionFilter1DEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)image);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Define a two-dimensional convolution filter
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Must be GL_CONVOLUTION_2D.
-        /// </para>
-        /// </param>
-        /// <param name="internalformat">
-        /// <para>
-        /// The internal format of the convolution filter kernel. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, or GL_RGBA16.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// The width of the pixel array referenced by data.
-        /// </para>
-        /// </param>
-        /// <param name="height">
-        /// <para>
-        /// The height of the pixel array referenced by data.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// The format of the pixel data in data. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// The type of the pixel data in data. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Pointer to a two-dimensional array of pixel data that is processed to build the convolution filter kernel.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glConvolutionFilter2DEXT")]
-            public static 
-            void ConvolutionFilter2D<T6>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T6 image)
-                where T6 : struct
+            void ConvolutionFilter1D<T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T5 image)
+                where T5 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -86953,8 +86890,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle image_ptr = GCHandle.Alloc(image, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glConvolutionFilter2DEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)image_ptr.AddrOfPinnedObject());
-                    image = (T6)image_ptr.Target;
+                    Delegates.glConvolutionFilter1DEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)image_ptr.AddrOfPinnedObject());
+                    image = (T5)image_ptr.Target;
                 }
                 finally
                 {
@@ -87006,7 +86943,60 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glConvolutionFilter2DEXT")]
             public static 
-            void ConvolutionFilter2D<T6>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[,,] image)
+            void ConvolutionFilter2D(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr image)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glConvolutionFilter2DEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)image);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Define a two-dimensional convolution filter
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be GL_CONVOLUTION_2D.
+        /// </para>
+        /// </param>
+        /// <param name="internalformat">
+        /// <para>
+        /// The internal format of the convolution filter kernel. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, or GL_RGBA16.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// The width of the pixel array referenced by data.
+        /// </para>
+        /// </param>
+        /// <param name="height">
+        /// <para>
+        /// The height of the pixel array referenced by data.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// The format of the pixel data in data. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// The type of the pixel data in data. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Pointer to a two-dimensional array of pixel data that is processed to build the convolution filter kernel.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glConvolutionFilter2DEXT")]
+            public static 
+            void ConvolutionFilter2D<T6>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[] image)
                 where T6 : struct
             {
                 #if DEBUG
@@ -87130,7 +87120,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glConvolutionFilter2DEXT")]
             public static 
-            void ConvolutionFilter2D<T6>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[] image)
+            void ConvolutionFilter2D<T6>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[,,] image)
                 where T6 : struct
             {
                 #if DEBUG
@@ -87192,13 +87182,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glConvolutionFilter2DEXT")]
             public static 
-            void ConvolutionFilter2D(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr image)
+            void ConvolutionFilter2D<T6>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T6 image)
+                where T6 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glConvolutionFilter2DEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)image);
+                GCHandle image_ptr = GCHandle.Alloc(image, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glConvolutionFilter2DEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)image_ptr.AddrOfPinnedObject());
+                    image = (T6)image_ptr.Target;
+                }
+                finally
+                {
+                    image_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -87241,43 +87241,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Set convolution parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The target for the convolution parameter. Must be one of GL_CONVOLUTION_1D, GL_CONVOLUTION_2D, or GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// The parameter to be set. Must be GL_CONVOLUTION_BORDER_MODE.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// The parameter value. Must be one of GL_REDUCE, GL_CONSTANT_BORDER, GL_REPLICATE_BORDER.
-        /// </para>
-        /// <para>
-        /// 
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glConvolutionParameterfvEXT")]
-            public static 
-            unsafe void ConvolutionParameter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.ExtConvolution pname, Single* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glConvolutionParameterfvEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.ExtConvolution)pname, (Single*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Set convolution parameters
         /// </summary>
@@ -87341,15 +87304,16 @@ namespace OpenTK.Graphics.OpenGL
         /// 
         /// </para>
         /// </param>
-            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glConvolutionParameteriEXT")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glConvolutionParameterfvEXT")]
             public static 
-            void ConvolutionParameter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.ExtConvolution pname, Int32 @params)
+            unsafe void ConvolutionParameter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.ExtConvolution pname, Single* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glConvolutionParameteriEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.ExtConvolution)pname, (Int32)@params);
+                Delegates.glConvolutionParameterfvEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.ExtConvolution)pname, (Single*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -87377,16 +87341,15 @@ namespace OpenTK.Graphics.OpenGL
         /// 
         /// </para>
         /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glConvolutionParameterivEXT")]
+            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glConvolutionParameteriEXT")]
             public static 
-            unsafe void ConvolutionParameter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.ExtConvolution pname, Int32* @params)
+            void ConvolutionParameter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.ExtConvolution pname, Int32 @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glConvolutionParameterivEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.ExtConvolution)pname, (Int32*)@params);
+                Delegates.glConvolutionParameteriEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.ExtConvolution)pname, (Int32)@params);
                 #if DEBUG
                 }
                 #endif
@@ -87435,6 +87398,43 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Set convolution parameters
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The target for the convolution parameter. Must be one of GL_CONVOLUTION_1D, GL_CONVOLUTION_2D, or GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// The parameter to be set. Must be GL_CONVOLUTION_BORDER_MODE.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// The parameter value. Must be one of GL_REDUCE, GL_CONSTANT_BORDER, GL_REPLICATE_BORDER.
+        /// </para>
+        /// <para>
+        /// 
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glConvolutionParameterivEXT")]
+            public static 
+            unsafe void ConvolutionParameter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.ExtConvolution pname, Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glConvolutionParameterivEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.ExtConvolution)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Respecify a portion of a color table
         /// </summary>
@@ -88023,21 +88023,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtCullVertex", Version = "1.1", EntryPoint = "glCullParameterdvEXT")]
-            public static 
-            unsafe void CullParameter(OpenTK.Graphics.OpenGL.ExtCullVertex pname, [OutAttribute] Double* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glCullParameterdvEXT((OpenTK.Graphics.OpenGL.ExtCullVertex)pname, (Double*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtCullVertex", Version = "1.1", EntryPoint = "glCullParameterdvEXT")]
             public static 
             void CullParameter(OpenTK.Graphics.OpenGL.ExtCullVertex pname, [OutAttribute] Double[] @params)
@@ -88079,6 +88064,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtCullVertex", Version = "1.1", EntryPoint = "glCullParameterdvEXT")]
+            public static 
+            unsafe void CullParameter(OpenTK.Graphics.OpenGL.ExtCullVertex pname, [OutAttribute] Double* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glCullParameterdvEXT((OpenTK.Graphics.OpenGL.ExtCullVertex)pname, (Double*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtCullVertex", Version = "1.1", EntryPoint = "glCullParameterfvEXT")]
+            public static 
+            void CullParameter(OpenTK.Graphics.OpenGL.ExtCullVertex pname, [OutAttribute] Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glCullParameterfvEXT((OpenTK.Graphics.OpenGL.ExtCullVertex)pname, (Single*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtCullVertex", Version = "1.1", EntryPoint = "glCullParameterfvEXT")]
             public static 
             void CullParameter(OpenTK.Graphics.OpenGL.ExtCullVertex pname, [OutAttribute] out Single @params)
@@ -88115,41 +88135,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "ExtCullVertex", Version = "1.1", EntryPoint = "glCullParameterfvEXT")]
-            public static 
-            void CullParameter(OpenTK.Graphics.OpenGL.ExtCullVertex pname, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glCullParameterfvEXT((OpenTK.Graphics.OpenGL.ExtCullVertex)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtFramebufferObject", Version = "1.2", EntryPoint = "glDeleteFramebuffersEXT")]
-            public static 
-            unsafe void DeleteFramebuffers(Int32 n, Int32* framebuffers)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glDeleteFramebuffersEXT((Int32)n, (UInt32*)framebuffers);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtFramebufferObject", Version = "1.2", EntryPoint = "glDeleteFramebuffersEXT")]
             public static 
             void DeleteFramebuffers(Int32 n, Int32[] framebuffers)
@@ -88193,28 +88178,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtFramebufferObject", Version = "1.2", EntryPoint = "glDeleteFramebuffersEXT")]
             public static 
-            void DeleteFramebuffers(Int32 n, ref UInt32 framebuffers)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* framebuffers_ptr = &framebuffers)
-                    {
-                        Delegates.glDeleteFramebuffersEXT((Int32)n, (UInt32*)framebuffers_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtFramebufferObject", Version = "1.2", EntryPoint = "glDeleteFramebuffersEXT")]
-            public static 
-            unsafe void DeleteFramebuffers(Int32 n, UInt32* framebuffers)
+            unsafe void DeleteFramebuffers(Int32 n, Int32* framebuffers)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -88248,15 +88212,36 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtFramebufferObject", Version = "1.2", EntryPoint = "glDeleteRenderbuffersEXT")]
+            [AutoGenerated(Category = "ExtFramebufferObject", Version = "1.2", EntryPoint = "glDeleteFramebuffersEXT")]
             public static 
-            unsafe void DeleteRenderbuffers(Int32 n, Int32* renderbuffers)
+            void DeleteFramebuffers(Int32 n, ref UInt32 framebuffers)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glDeleteRenderbuffersEXT((Int32)n, (UInt32*)renderbuffers);
+                unsafe
+                {
+                    fixed (UInt32* framebuffers_ptr = &framebuffers)
+                    {
+                        Delegates.glDeleteFramebuffersEXT((Int32)n, (UInt32*)framebuffers_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtFramebufferObject", Version = "1.2", EntryPoint = "glDeleteFramebuffersEXT")]
+            public static 
+            unsafe void DeleteFramebuffers(Int32 n, UInt32* framebuffers)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glDeleteFramebuffersEXT((Int32)n, (UInt32*)framebuffers);
                 #if DEBUG
                 }
                 #endif
@@ -88305,28 +88290,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtFramebufferObject", Version = "1.2", EntryPoint = "glDeleteRenderbuffersEXT")]
             public static 
-            void DeleteRenderbuffers(Int32 n, ref UInt32 renderbuffers)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* renderbuffers_ptr = &renderbuffers)
-                    {
-                        Delegates.glDeleteRenderbuffersEXT((Int32)n, (UInt32*)renderbuffers_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtFramebufferObject", Version = "1.2", EntryPoint = "glDeleteRenderbuffersEXT")]
-            public static 
-            unsafe void DeleteRenderbuffers(Int32 n, UInt32* renderbuffers)
+            unsafe void DeleteRenderbuffers(Int32 n, Int32* renderbuffers)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -88359,30 +88323,37 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            
-        /// <summary>
-        /// Delete named textures
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of textures to be deleted.
-        /// </para>
-        /// </param>
-        /// <param name="textures">
-        /// <para>
-        /// Specifies an array of textures to be deleted.
-        /// </para>
-        /// </param>
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtTextureObject", Version = "1.0", EntryPoint = "glDeleteTexturesEXT")]
+            [AutoGenerated(Category = "ExtFramebufferObject", Version = "1.2", EntryPoint = "glDeleteRenderbuffersEXT")]
             public static 
-            unsafe void DeleteTextures(Int32 n, Int32* textures)
+            void DeleteRenderbuffers(Int32 n, ref UInt32 renderbuffers)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glDeleteTexturesEXT((Int32)n, (UInt32*)textures);
+                unsafe
+                {
+                    fixed (UInt32* renderbuffers_ptr = &renderbuffers)
+                    {
+                        Delegates.glDeleteRenderbuffersEXT((Int32)n, (UInt32*)renderbuffers_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtFramebufferObject", Version = "1.2", EntryPoint = "glDeleteRenderbuffersEXT")]
+            public static 
+            unsafe void DeleteRenderbuffers(Int32 n, UInt32* renderbuffers)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glDeleteRenderbuffersEXT((Int32)n, (UInt32*)renderbuffers);
                 #if DEBUG
                 }
                 #endif
@@ -88457,6 +88428,70 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Delete named textures
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of textures to be deleted.
+        /// </para>
+        /// </param>
+        /// <param name="textures">
+        /// <para>
+        /// Specifies an array of textures to be deleted.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtTextureObject", Version = "1.0", EntryPoint = "glDeleteTexturesEXT")]
+            public static 
+            unsafe void DeleteTextures(Int32 n, Int32* textures)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glDeleteTexturesEXT((Int32)n, (UInt32*)textures);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Delete named textures
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of textures to be deleted.
+        /// </para>
+        /// </param>
+        /// <param name="textures">
+        /// <para>
+        /// Specifies an array of textures to be deleted.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtTextureObject", Version = "1.0", EntryPoint = "glDeleteTexturesEXT")]
+            public static 
+            void DeleteTextures(Int32 n, UInt32[] textures)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* textures_ptr = textures)
+                    {
+                        Delegates.glDeleteTexturesEXT((Int32)n, (UInt32*)textures_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Delete named textures
         /// </summary>
@@ -88520,41 +88555,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            
-        /// <summary>
-        /// Delete named textures
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of textures to be deleted.
-        /// </para>
-        /// </param>
-        /// <param name="textures">
-        /// <para>
-        /// Specifies an array of textures to be deleted.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtTextureObject", Version = "1.0", EntryPoint = "glDeleteTexturesEXT")]
-            public static 
-            void DeleteTextures(Int32 n, UInt32[] textures)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* textures_ptr = textures)
-                    {
-                        Delegates.glDeleteTexturesEXT((Int32)n, (UInt32*)textures_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glDeleteVertexShaderEXT")]
             public static 
             void DeleteVertexShader(Int32 id)
@@ -88734,23 +88734,13 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedEXT")]
             public static 
-            void DrawElementsInstanced<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount)
-                where T3 : struct
+            void DrawElementsInstanced(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glDrawElementsInstancedEXT((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
-                    indices = (T3)indices_ptr.Target;
-                }
-                finally
-                {
-                    indices_ptr.Free();
-                }
+                Delegates.glDrawElementsInstancedEXT((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount);
                 #if DEBUG
                 }
                 #endif
@@ -88758,7 +88748,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedEXT")]
             public static 
-            void DrawElementsInstanced<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount)
+            void DrawElementsInstanced<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount)
                 where T3 : struct
             {
                 #if DEBUG
@@ -88804,7 +88794,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedEXT")]
             public static 
-            void DrawElementsInstanced<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount)
+            void DrawElementsInstanced<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount)
                 where T3 : struct
             {
                 #if DEBUG
@@ -88827,56 +88817,8 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDrawInstanced", Version = "2.0", EntryPoint = "glDrawElementsInstancedEXT")]
             public static 
-            void DrawElementsInstanced(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glDrawElementsInstancedEXT((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Render primitives from array data
-        /// </summary>
-        /// <param name="mode">
-        /// <para>
-        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="start">
-        /// <para>
-        /// Specifies the minimum array index contained in indices.
-        /// </para>
-        /// </param>
-        /// <param name="end">
-        /// <para>
-        /// Specifies the maximum array index contained in indices.
-        /// </para>
-        /// </param>
-        /// <param name="count">
-        /// <para>
-        /// Specifies the number of elements to be rendered.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
-        /// </para>
-        /// </param>
-        /// <param name="indices">
-        /// <para>
-        /// Specifies a pointer to the location where the indices are stored.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtDrawRangeElements", Version = "1.1", EntryPoint = "glDrawRangeElementsEXT")]
-            public static 
-            void DrawRangeElements<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 start, Int32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T5 indices)
-                where T5 : struct
+            void DrawElementsInstanced<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount)
+                where T3 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -88885,8 +88827,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glDrawRangeElementsEXT((OpenTK.Graphics.OpenGL.BeginMode)mode, (UInt32)start, (UInt32)end, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject());
-                    indices = (T5)indices_ptr.Target;
+                    Delegates.glDrawElementsInstancedEXT((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
+                    indices = (T3)indices_ptr.Target;
                 }
                 finally
                 {
@@ -88933,7 +88875,55 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtDrawRangeElements", Version = "1.1", EntryPoint = "glDrawRangeElementsEXT")]
             public static 
-            void DrawRangeElements<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 start, Int32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T5[,,] indices)
+            void DrawRangeElements(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 start, Int32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glDrawRangeElementsEXT((OpenTK.Graphics.OpenGL.BeginMode)mode, (UInt32)start, (UInt32)end, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Render primitives from array data
+        /// </summary>
+        /// <param name="mode">
+        /// <para>
+        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="start">
+        /// <para>
+        /// Specifies the minimum array index contained in indices.
+        /// </para>
+        /// </param>
+        /// <param name="end">
+        /// <para>
+        /// Specifies the maximum array index contained in indices.
+        /// </para>
+        /// </param>
+        /// <param name="count">
+        /// <para>
+        /// Specifies the number of elements to be rendered.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
+        /// </para>
+        /// </param>
+        /// <param name="indices">
+        /// <para>
+        /// Specifies a pointer to the location where the indices are stored.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtDrawRangeElements", Version = "1.1", EntryPoint = "glDrawRangeElementsEXT")]
+            public static 
+            void DrawRangeElements<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 start, Int32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T5[] indices)
                 where T5 : struct
             {
                 #if DEBUG
@@ -89047,7 +89037,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtDrawRangeElements", Version = "1.1", EntryPoint = "glDrawRangeElementsEXT")]
             public static 
-            void DrawRangeElements<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 start, Int32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T5[] indices)
+            void DrawRangeElements<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 start, Int32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T5[,,] indices)
                 where T5 : struct
             {
                 #if DEBUG
@@ -89104,56 +89094,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtDrawRangeElements", Version = "1.1", EntryPoint = "glDrawRangeElementsEXT")]
             public static 
-            void DrawRangeElements(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 start, Int32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glDrawRangeElementsEXT((OpenTK.Graphics.OpenGL.BeginMode)mode, (UInt32)start, (UInt32)end, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Render primitives from array data
-        /// </summary>
-        /// <param name="mode">
-        /// <para>
-        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="start">
-        /// <para>
-        /// Specifies the minimum array index contained in indices.
-        /// </para>
-        /// </param>
-        /// <param name="end">
-        /// <para>
-        /// Specifies the maximum array index contained in indices.
-        /// </para>
-        /// </param>
-        /// <param name="count">
-        /// <para>
-        /// Specifies the number of elements to be rendered.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
-        /// </para>
-        /// </param>
-        /// <param name="indices">
-        /// <para>
-        /// Specifies a pointer to the location where the indices are stored.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDrawRangeElements", Version = "1.1", EntryPoint = "glDrawRangeElementsEXT")]
-            public static 
-            void DrawRangeElements<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, UInt32 start, UInt32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T5 indices)
+            void DrawRangeElements<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 start, Int32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T5 indices)
                 where T5 : struct
             {
                 #if DEBUG
@@ -89212,7 +89153,56 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDrawRangeElements", Version = "1.1", EntryPoint = "glDrawRangeElementsEXT")]
             public static 
-            void DrawRangeElements<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, UInt32 start, UInt32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T5[,,] indices)
+            void DrawRangeElements(OpenTK.Graphics.OpenGL.BeginMode mode, UInt32 start, UInt32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glDrawRangeElementsEXT((OpenTK.Graphics.OpenGL.BeginMode)mode, (UInt32)start, (UInt32)end, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Render primitives from array data
+        /// </summary>
+        /// <param name="mode">
+        /// <para>
+        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="start">
+        /// <para>
+        /// Specifies the minimum array index contained in indices.
+        /// </para>
+        /// </param>
+        /// <param name="end">
+        /// <para>
+        /// Specifies the maximum array index contained in indices.
+        /// </para>
+        /// </param>
+        /// <param name="count">
+        /// <para>
+        /// Specifies the number of elements to be rendered.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
+        /// </para>
+        /// </param>
+        /// <param name="indices">
+        /// <para>
+        /// Specifies a pointer to the location where the indices are stored.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDrawRangeElements", Version = "1.1", EntryPoint = "glDrawRangeElementsEXT")]
+            public static 
+            void DrawRangeElements<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, UInt32 start, UInt32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T5[] indices)
                 where T5 : struct
             {
                 #if DEBUG
@@ -89328,7 +89318,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDrawRangeElements", Version = "1.1", EntryPoint = "glDrawRangeElementsEXT")]
             public static 
-            void DrawRangeElements<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, UInt32 start, UInt32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T5[] indices)
+            void DrawRangeElements<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, UInt32 start, UInt32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T5[,,] indices)
                 where T5 : struct
             {
                 #if DEBUG
@@ -89386,42 +89376,23 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDrawRangeElements", Version = "1.1", EntryPoint = "glDrawRangeElementsEXT")]
             public static 
-            void DrawRangeElements(OpenTK.Graphics.OpenGL.BeginMode mode, UInt32 start, UInt32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices)
+            void DrawRangeElements<T5>(OpenTK.Graphics.OpenGL.BeginMode mode, UInt32 start, UInt32 end, Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T5 indices)
+                where T5 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glDrawRangeElementsEXT((OpenTK.Graphics.OpenGL.BeginMode)mode, (UInt32)start, (UInt32)end, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices);
-                #if DEBUG
+                GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glDrawRangeElementsEXT((OpenTK.Graphics.OpenGL.BeginMode)mode, (UInt32)start, (UInt32)end, (Int32)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject());
+                    indices = (T5)indices_ptr.Target;
                 }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Define an array of edge flags
-        /// </summary>
-        /// <param name="stride">
-        /// <para>
-        /// Specifies the byte offset between consecutive edge flags. If stride is 0, the edge flags are understood to be tightly packed in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-        /// <param name="pointer">
-        /// <para>
-        /// Specifies a pointer to the first edge flag in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtVertexArray", Version = "1.0", EntryPoint = "glEdgeFlagPointerEXT")]
-            public static 
-            unsafe void EdgeFlagPointer(Int32 stride, Int32 count, bool* pointer)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                finally
                 {
-                #endif
-                Delegates.glEdgeFlagPointerEXT((Int32)stride, (Int32)count, (bool*)pointer);
+                    indices_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -89495,6 +89466,35 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            
+        /// <summary>
+        /// Define an array of edge flags
+        /// </summary>
+        /// <param name="stride">
+        /// <para>
+        /// Specifies the byte offset between consecutive edge flags. If stride is 0, the edge flags are understood to be tightly packed in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+        /// <param name="pointer">
+        /// <para>
+        /// Specifies a pointer to the first edge flag in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtVertexArray", Version = "1.0", EntryPoint = "glEdgeFlagPointerEXT")]
+            public static 
+            unsafe void EdgeFlagPointer(Int32 stride, Int32 count, bool* pointer)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glEdgeFlagPointerEXT((Int32)stride, (Int32)count, (bool*)pointer);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glEnableClientStateIndexedEXT")]
             public static 
             void EnableClientStateIndexed(OpenTK.Graphics.OpenGL.EnableCap array, Int32 index)
@@ -89754,23 +89754,13 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtFogCoord", Version = "1.1", EntryPoint = "glFogCoordPointerEXT")]
             public static 
-            void FogCoordPointer<T2>(OpenTK.Graphics.OpenGL.ExtFogCoord type, Int32 stride, [InAttribute, OutAttribute] ref T2 pointer)
-                where T2 : struct
+            void FogCoordPointer(OpenTK.Graphics.OpenGL.ExtFogCoord type, Int32 stride, IntPtr pointer)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glFogCoordPointerEXT((OpenTK.Graphics.OpenGL.ExtFogCoord)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                    pointer = (T2)pointer_ptr.Target;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
+                Delegates.glFogCoordPointerEXT((OpenTK.Graphics.OpenGL.ExtFogCoord)type, (Int32)stride, (IntPtr)pointer);
                 #if DEBUG
                 }
                 #endif
@@ -89797,7 +89787,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtFogCoord", Version = "1.1", EntryPoint = "glFogCoordPointerEXT")]
             public static 
-            void FogCoordPointer<T2>(OpenTK.Graphics.OpenGL.ExtFogCoord type, Int32 stride, [InAttribute, OutAttribute] T2[,,] pointer)
+            void FogCoordPointer<T2>(OpenTK.Graphics.OpenGL.ExtFogCoord type, Int32 stride, [InAttribute, OutAttribute] T2[] pointer)
                 where T2 : struct
             {
                 #if DEBUG
@@ -89881,7 +89871,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtFogCoord", Version = "1.1", EntryPoint = "glFogCoordPointerEXT")]
             public static 
-            void FogCoordPointer<T2>(OpenTK.Graphics.OpenGL.ExtFogCoord type, Int32 stride, [InAttribute, OutAttribute] T2[] pointer)
+            void FogCoordPointer<T2>(OpenTK.Graphics.OpenGL.ExtFogCoord type, Int32 stride, [InAttribute, OutAttribute] T2[,,] pointer)
                 where T2 : struct
             {
                 #if DEBUG
@@ -89923,13 +89913,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtFogCoord", Version = "1.1", EntryPoint = "glFogCoordPointerEXT")]
             public static 
-            void FogCoordPointer(OpenTK.Graphics.OpenGL.ExtFogCoord type, Int32 stride, IntPtr pointer)
+            void FogCoordPointer<T2>(OpenTK.Graphics.OpenGL.ExtFogCoord type, Int32 stride, [InAttribute, OutAttribute] ref T2 pointer)
+                where T2 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glFogCoordPointerEXT((OpenTK.Graphics.OpenGL.ExtFogCoord)type, (Int32)stride, (IntPtr)pointer);
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glFogCoordPointerEXT((OpenTK.Graphics.OpenGL.ExtFogCoord)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    pointer = (T2)pointer_ptr.Target;
+                }
+                finally
+                {
+                    pointer_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -89964,21 +89964,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glFramebufferDrawBuffersEXT")]
-            public static 
-            unsafe void FramebufferDrawBuffers(Int32 framebuffer, Int32 n, OpenTK.Graphics.OpenGL.DrawBufferMode* bufs)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glFramebufferDrawBuffersEXT((UInt32)framebuffer, (Int32)n, (OpenTK.Graphics.OpenGL.DrawBufferMode*)bufs);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glFramebufferDrawBuffersEXT")]
             public static 
             void FramebufferDrawBuffers(Int32 framebuffer, Int32 n, OpenTK.Graphics.OpenGL.DrawBufferMode[] bufs)
@@ -90022,7 +90007,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glFramebufferDrawBuffersEXT")]
             public static 
-            unsafe void FramebufferDrawBuffers(UInt32 framebuffer, Int32 n, OpenTK.Graphics.OpenGL.DrawBufferMode* bufs)
+            unsafe void FramebufferDrawBuffers(Int32 framebuffer, Int32 n, OpenTK.Graphics.OpenGL.DrawBufferMode* bufs)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -90076,6 +90061,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glFramebufferDrawBuffersEXT")]
+            public static 
+            unsafe void FramebufferDrawBuffers(UInt32 framebuffer, Int32 n, OpenTK.Graphics.OpenGL.DrawBufferMode* bufs)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glFramebufferDrawBuffersEXT((UInt32)framebuffer, (Int32)n, (OpenTK.Graphics.OpenGL.DrawBufferMode*)bufs);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glFramebufferReadBufferEXT")]
             public static 
             void FramebufferReadBuffer(Int32 framebuffer, OpenTK.Graphics.OpenGL.ReadBufferMode mode)
@@ -90365,21 +90365,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtFramebufferObject", Version = "1.2", EntryPoint = "glGenFramebuffersEXT")]
-            public static 
-            unsafe void GenFramebuffers(Int32 n, [OutAttribute] Int32* framebuffers)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGenFramebuffersEXT((Int32)n, (UInt32*)framebuffers);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtFramebufferObject", Version = "1.2", EntryPoint = "glGenFramebuffersEXT")]
             public static 
             void GenFramebuffers(Int32 n, [OutAttribute] Int32[] framebuffers)
@@ -90424,29 +90409,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtFramebufferObject", Version = "1.2", EntryPoint = "glGenFramebuffersEXT")]
             public static 
-            void GenFramebuffers(Int32 n, [OutAttribute] out UInt32 framebuffers)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* framebuffers_ptr = &framebuffers)
-                    {
-                        Delegates.glGenFramebuffersEXT((Int32)n, (UInt32*)framebuffers_ptr);
-                        framebuffers = *framebuffers_ptr;
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtFramebufferObject", Version = "1.2", EntryPoint = "glGenFramebuffersEXT")]
-            public static 
-            unsafe void GenFramebuffers(Int32 n, [OutAttribute] UInt32* framebuffers)
+            unsafe void GenFramebuffers(Int32 n, [OutAttribute] Int32* framebuffers)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -90480,15 +90443,37 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtFramebufferObject", Version = "1.2", EntryPoint = "glGenRenderbuffersEXT")]
+            [AutoGenerated(Category = "ExtFramebufferObject", Version = "1.2", EntryPoint = "glGenFramebuffersEXT")]
             public static 
-            unsafe void GenRenderbuffers(Int32 n, [OutAttribute] Int32* renderbuffers)
+            void GenFramebuffers(Int32 n, [OutAttribute] out UInt32 framebuffers)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGenRenderbuffersEXT((Int32)n, (UInt32*)renderbuffers);
+                unsafe
+                {
+                    fixed (UInt32* framebuffers_ptr = &framebuffers)
+                    {
+                        Delegates.glGenFramebuffersEXT((Int32)n, (UInt32*)framebuffers_ptr);
+                        framebuffers = *framebuffers_ptr;
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtFramebufferObject", Version = "1.2", EntryPoint = "glGenFramebuffersEXT")]
+            public static 
+            unsafe void GenFramebuffers(Int32 n, [OutAttribute] UInt32* framebuffers)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGenFramebuffersEXT((Int32)n, (UInt32*)framebuffers);
                 #if DEBUG
                 }
                 #endif
@@ -90535,6 +90520,42 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtFramebufferObject", Version = "1.2", EntryPoint = "glGenRenderbuffersEXT")]
+            public static 
+            unsafe void GenRenderbuffers(Int32 n, [OutAttribute] Int32* renderbuffers)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGenRenderbuffersEXT((Int32)n, (UInt32*)renderbuffers);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtFramebufferObject", Version = "1.2", EntryPoint = "glGenRenderbuffersEXT")]
+            public static 
+            void GenRenderbuffers(Int32 n, [OutAttribute] UInt32[] renderbuffers)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* renderbuffers_ptr = renderbuffers)
+                    {
+                        Delegates.glGenRenderbuffersEXT((Int32)n, (UInt32*)renderbuffers_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtFramebufferObject", Version = "1.2", EntryPoint = "glGenRenderbuffersEXT")]
             public static 
@@ -90572,27 +90593,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtFramebufferObject", Version = "1.2", EntryPoint = "glGenRenderbuffersEXT")]
-            public static 
-            void GenRenderbuffers(Int32 n, [OutAttribute] UInt32[] renderbuffers)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* renderbuffers_ptr = renderbuffers)
-                    {
-                        Delegates.glGenRenderbuffersEXT((Int32)n, (UInt32*)renderbuffers_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGenSymbolsEXT")]
             public static 
             Int32 GenSymbol(OpenTK.Graphics.OpenGL.ExtVertexShader datatype, OpenTK.Graphics.OpenGL.ExtVertexShader storagetype, OpenTK.Graphics.OpenGL.ExtVertexShader range, Int32 components)
@@ -90623,35 +90623,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Generate texture names
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of texture names to be generated.
-        /// </para>
-        /// </param>
-        /// <param name="textures">
-        /// <para>
-        /// Specifies an array in which the generated texture names are stored.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtTextureObject", Version = "1.0", EntryPoint = "glGenTexturesEXT")]
-            public static 
-            unsafe void GenTextures(Int32 n, [OutAttribute] Int32* textures)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGenTexturesEXT((Int32)n, (UInt32*)textures);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Generate texture names
         /// </summary>
@@ -90721,6 +90692,70 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Generate texture names
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of texture names to be generated.
+        /// </para>
+        /// </param>
+        /// <param name="textures">
+        /// <para>
+        /// Specifies an array in which the generated texture names are stored.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtTextureObject", Version = "1.0", EntryPoint = "glGenTexturesEXT")]
+            public static 
+            unsafe void GenTextures(Int32 n, [OutAttribute] Int32* textures)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGenTexturesEXT((Int32)n, (UInt32*)textures);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Generate texture names
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of texture names to be generated.
+        /// </para>
+        /// </param>
+        /// <param name="textures">
+        /// <para>
+        /// Specifies an array in which the generated texture names are stored.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtTextureObject", Version = "1.0", EntryPoint = "glGenTexturesEXT")]
+            public static 
+            void GenTextures(Int32 n, [OutAttribute] UInt32[] textures)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* textures_ptr = textures)
+                    {
+                        Delegates.glGenTexturesEXT((Int32)n, (UInt32*)textures_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Generate texture names
         /// </summary>
@@ -90785,41 +90820,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            
-        /// <summary>
-        /// Generate texture names
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of texture names to be generated.
-        /// </para>
-        /// </param>
-        /// <param name="textures">
-        /// <para>
-        /// Specifies an array in which the generated texture names are stored.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtTextureObject", Version = "1.0", EntryPoint = "glGenTexturesEXT")]
-            public static 
-            void GenTextures(Int32 n, [OutAttribute] UInt32[] textures)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* textures_ptr = textures)
-                    {
-                        Delegates.glGenTexturesEXT((Int32)n, (UInt32*)textures_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGenVertexShadersEXT")]
             public static 
             Int32 GenVertexShaders(Int32 range)
@@ -90849,21 +90849,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDrawBuffers2", Version = "2.0", EntryPoint = "glGetBooleanIndexedvEXT")]
-            public static 
-            unsafe void GetBooleanIndexed(OpenTK.Graphics.OpenGL.ExtDrawBuffers2 target, Int32 index, [OutAttribute] bool* data)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetBooleanIndexedvEXT((OpenTK.Graphics.OpenGL.ExtDrawBuffers2)target, (UInt32)index, (bool*)data);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDrawBuffers2", Version = "2.0", EntryPoint = "glGetBooleanIndexedvEXT")]
             public static 
             void GetBooleanIndexed(OpenTK.Graphics.OpenGL.ExtDrawBuffers2 target, Int32 index, [OutAttribute] bool[] data)
@@ -90908,7 +90893,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDrawBuffers2", Version = "2.0", EntryPoint = "glGetBooleanIndexedvEXT")]
             public static 
-            unsafe void GetBooleanIndexed(OpenTK.Graphics.OpenGL.ExtDrawBuffers2 target, UInt32 index, [OutAttribute] bool* data)
+            unsafe void GetBooleanIndexed(OpenTK.Graphics.OpenGL.ExtDrawBuffers2 target, Int32 index, [OutAttribute] bool* data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -90963,49 +90948,16 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            
-        /// <summary>
-        /// Retrieve contents of a color lookup table
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Must be GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, or GL_POST_COLOR_MATRIX_COLOR_TABLE.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// The format of the pixel data in table. The possible values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_RGB, GL_BGR, GL_RGBA, and GL_BGRA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// The type of the pixel data in table. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="table">
-        /// <para>
-        /// Pointer to a one-dimensional array of pixel data containing the contents of the color table.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtPalettedTexture", Version = "1.1", EntryPoint = "glGetColorTableEXT")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDrawBuffers2", Version = "2.0", EntryPoint = "glGetBooleanIndexedvEXT")]
             public static 
-            void GetColorTable<T3>(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T3 data)
-                where T3 : struct
+            unsafe void GetBooleanIndexed(OpenTK.Graphics.OpenGL.ExtDrawBuffers2 target, UInt32 index, [OutAttribute] bool* data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetColorTableEXT((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)data_ptr.AddrOfPinnedObject());
-                    data = (T3)data_ptr.Target;
-                }
-                finally
-                {
-                    data_ptr.Free();
-                }
+                Delegates.glGetBooleanIndexedvEXT((OpenTK.Graphics.OpenGL.ExtDrawBuffers2)target, (UInt32)index, (bool*)data);
                 #if DEBUG
                 }
                 #endif
@@ -91037,7 +90989,45 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtPalettedTexture", Version = "1.1", EntryPoint = "glGetColorTableEXT")]
             public static 
-            void GetColorTable<T3>(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[,,] data)
+            void GetColorTable(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr data)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetColorTableEXT((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)data);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Retrieve contents of a color lookup table
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, or GL_POST_COLOR_MATRIX_COLOR_TABLE.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// The format of the pixel data in table. The possible values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_RGB, GL_BGR, GL_RGBA, and GL_BGRA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// The type of the pixel data in table. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="table">
+        /// <para>
+        /// Pointer to a one-dimensional array of pixel data containing the contents of the color table.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtPalettedTexture", Version = "1.1", EntryPoint = "glGetColorTableEXT")]
+            public static 
+            void GetColorTable<T3>(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[] data)
                 where T3 : struct
             {
                 #if DEBUG
@@ -91131,7 +91121,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtPalettedTexture", Version = "1.1", EntryPoint = "glGetColorTableEXT")]
             public static 
-            void GetColorTable<T3>(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[] data)
+            void GetColorTable<T3>(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[,,] data)
                 where T3 : struct
             {
                 #if DEBUG
@@ -91178,13 +91168,62 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtPalettedTexture", Version = "1.1", EntryPoint = "glGetColorTableEXT")]
             public static 
-            void GetColorTable(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr data)
+            void GetColorTable<T3>(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T3 data)
+                where T3 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetColorTableEXT((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)data);
+                GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetColorTableEXT((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)data_ptr.AddrOfPinnedObject());
+                    data = (T3)data_ptr.Target;
+                }
+                finally
+                {
+                    data_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Get color lookup table parameters
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The target color table. Must be GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, GL_POST_COLOR_MATRIX_COLOR_TABLE, GL_PROXY_COLOR_TABLE, GL_PROXY_POST_CONVOLUTION_COLOR_TABLE, or GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// The symbolic name of a color lookup table parameter. Must be one of GL_COLOR_TABLE_BIAS, GL_COLOR_TABLE_SCALE, GL_COLOR_TABLE_FORMAT, GL_COLOR_TABLE_WIDTH, GL_COLOR_TABLE_RED_SIZE, GL_COLOR_TABLE_GREEN_SIZE, GL_COLOR_TABLE_BLUE_SIZE, GL_COLOR_TABLE_ALPHA_SIZE, GL_COLOR_TABLE_LUMINANCE_SIZE, or GL_COLOR_TABLE_INTENSITY_SIZE.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// A pointer to an array where the values of the parameter will be stored.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtPalettedTexture", Version = "1.1", EntryPoint = "glGetColorTableParameterfvEXT")]
+            public static 
+            void GetColorTableParameter(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.GetColorTableParameterPName pname, [OutAttribute] Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glGetColorTableParameterfvEXT((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (OpenTK.Graphics.OpenGL.GetColorTableParameterPName)pname, (Single*)@params_ptr);
+                    }
+                }
                 #if DEBUG
                 }
                 #endif
@@ -91265,79 +91304,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Get color lookup table parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The target color table. Must be GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, GL_POST_COLOR_MATRIX_COLOR_TABLE, GL_PROXY_COLOR_TABLE, GL_PROXY_POST_CONVOLUTION_COLOR_TABLE, or GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// The symbolic name of a color lookup table parameter. Must be one of GL_COLOR_TABLE_BIAS, GL_COLOR_TABLE_SCALE, GL_COLOR_TABLE_FORMAT, GL_COLOR_TABLE_WIDTH, GL_COLOR_TABLE_RED_SIZE, GL_COLOR_TABLE_GREEN_SIZE, GL_COLOR_TABLE_BLUE_SIZE, GL_COLOR_TABLE_ALPHA_SIZE, GL_COLOR_TABLE_LUMINANCE_SIZE, or GL_COLOR_TABLE_INTENSITY_SIZE.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// A pointer to an array where the values of the parameter will be stored.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtPalettedTexture", Version = "1.1", EntryPoint = "glGetColorTableParameterfvEXT")]
-            public static 
-            void GetColorTableParameter(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.GetColorTableParameterPName pname, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetColorTableParameterfvEXT((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (OpenTK.Graphics.OpenGL.GetColorTableParameterPName)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Get color lookup table parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The target color table. Must be GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, GL_POST_COLOR_MATRIX_COLOR_TABLE, GL_PROXY_COLOR_TABLE, GL_PROXY_POST_CONVOLUTION_COLOR_TABLE, or GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// The symbolic name of a color lookup table parameter. Must be one of GL_COLOR_TABLE_BIAS, GL_COLOR_TABLE_SCALE, GL_COLOR_TABLE_FORMAT, GL_COLOR_TABLE_WIDTH, GL_COLOR_TABLE_RED_SIZE, GL_COLOR_TABLE_GREEN_SIZE, GL_COLOR_TABLE_BLUE_SIZE, GL_COLOR_TABLE_ALPHA_SIZE, GL_COLOR_TABLE_LUMINANCE_SIZE, or GL_COLOR_TABLE_INTENSITY_SIZE.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// A pointer to an array where the values of the parameter will be stored.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtPalettedTexture", Version = "1.1", EntryPoint = "glGetColorTableParameterivEXT")]
-            public static 
-            unsafe void GetColorTableParameter(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.GetColorTableParameterPName pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetColorTableParameterivEXT((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (OpenTK.Graphics.OpenGL.GetColorTableParameterPName)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Get color lookup table parameters
         /// </summary>
@@ -91416,25 +91382,35 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetCompressedMultiTexImageEXT")]
+            
+        /// <summary>
+        /// Get color lookup table parameters
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The target color table. Must be GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, GL_POST_COLOR_MATRIX_COLOR_TABLE, GL_PROXY_COLOR_TABLE, GL_PROXY_POST_CONVOLUTION_COLOR_TABLE, or GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// The symbolic name of a color lookup table parameter. Must be one of GL_COLOR_TABLE_BIAS, GL_COLOR_TABLE_SCALE, GL_COLOR_TABLE_FORMAT, GL_COLOR_TABLE_WIDTH, GL_COLOR_TABLE_RED_SIZE, GL_COLOR_TABLE_GREEN_SIZE, GL_COLOR_TABLE_BLUE_SIZE, GL_COLOR_TABLE_ALPHA_SIZE, GL_COLOR_TABLE_LUMINANCE_SIZE, or GL_COLOR_TABLE_INTENSITY_SIZE.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// A pointer to an array where the values of the parameter will be stored.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtPalettedTexture", Version = "1.1", EntryPoint = "glGetColorTableParameterivEXT")]
             public static 
-            void GetCompressedMultiTexImage<T3>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 lod, [InAttribute, OutAttribute] ref T3 img)
-                where T3 : struct
+            unsafe void GetColorTableParameter(OpenTK.Graphics.OpenGL.ColorTableTarget target, OpenTK.Graphics.OpenGL.GetColorTableParameterPName pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle img_ptr = GCHandle.Alloc(img, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetCompressedMultiTexImageEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)lod, (IntPtr)img_ptr.AddrOfPinnedObject());
-                    img = (T3)img_ptr.Target;
-                }
-                finally
-                {
-                    img_ptr.Free();
-                }
+                Delegates.glGetColorTableParameterivEXT((OpenTK.Graphics.OpenGL.ColorTableTarget)target, (OpenTK.Graphics.OpenGL.GetColorTableParameterPName)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -91442,7 +91418,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetCompressedMultiTexImageEXT")]
             public static 
-            void GetCompressedMultiTexImage<T3>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 lod, [InAttribute, OutAttribute] T3[,,] img)
+            void GetCompressedMultiTexImage(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 lod, [OutAttribute] IntPtr img)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetCompressedMultiTexImageEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)lod, (IntPtr)img);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetCompressedMultiTexImageEXT")]
+            public static 
+            void GetCompressedMultiTexImage<T3>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 lod, [InAttribute, OutAttribute] T3[] img)
                 where T3 : struct
             {
                 #if DEBUG
@@ -91488,7 +91478,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetCompressedMultiTexImageEXT")]
             public static 
-            void GetCompressedMultiTexImage<T3>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 lod, [InAttribute, OutAttribute] T3[] img)
+            void GetCompressedMultiTexImage<T3>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 lod, [InAttribute, OutAttribute] T3[,,] img)
                 where T3 : struct
             {
                 #if DEBUG
@@ -91511,21 +91501,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetCompressedMultiTexImageEXT")]
             public static 
-            void GetCompressedMultiTexImage(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 lod, [OutAttribute] IntPtr img)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetCompressedMultiTexImageEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)lod, (IntPtr)img);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetCompressedTextureImageEXT")]
-            public static 
-            void GetCompressedTextureImage<T3>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 lod, [InAttribute, OutAttribute] ref T3 img)
+            void GetCompressedMultiTexImage<T3>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 lod, [InAttribute, OutAttribute] ref T3 img)
                 where T3 : struct
             {
                 #if DEBUG
@@ -91535,7 +91511,7 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle img_ptr = GCHandle.Alloc(img, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glGetCompressedTextureImageEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)lod, (IntPtr)img_ptr.AddrOfPinnedObject());
+                    Delegates.glGetCompressedMultiTexImageEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)lod, (IntPtr)img_ptr.AddrOfPinnedObject());
                     img = (T3)img_ptr.Target;
                 }
                 finally
@@ -91549,7 +91525,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetCompressedTextureImageEXT")]
             public static 
-            void GetCompressedTextureImage<T3>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 lod, [InAttribute, OutAttribute] T3[,,] img)
+            void GetCompressedTextureImage(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 lod, [OutAttribute] IntPtr img)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetCompressedTextureImageEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)lod, (IntPtr)img);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetCompressedTextureImageEXT")]
+            public static 
+            void GetCompressedTextureImage<T3>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 lod, [InAttribute, OutAttribute] T3[] img)
                 where T3 : struct
             {
                 #if DEBUG
@@ -91595,7 +91585,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetCompressedTextureImageEXT")]
             public static 
-            void GetCompressedTextureImage<T3>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 lod, [InAttribute, OutAttribute] T3[] img)
+            void GetCompressedTextureImage<T3>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 lod, [InAttribute, OutAttribute] T3[,,] img)
                 where T3 : struct
             {
                 #if DEBUG
@@ -91618,22 +91608,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetCompressedTextureImageEXT")]
             public static 
-            void GetCompressedTextureImage(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 lod, [OutAttribute] IntPtr img)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetCompressedTextureImageEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)lod, (IntPtr)img);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetCompressedTextureImageEXT")]
-            public static 
-            void GetCompressedTextureImage<T3>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 lod, [InAttribute, OutAttribute] ref T3 img)
+            void GetCompressedTextureImage<T3>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 lod, [InAttribute, OutAttribute] ref T3 img)
                 where T3 : struct
             {
                 #if DEBUG
@@ -91658,7 +91633,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetCompressedTextureImageEXT")]
             public static 
-            void GetCompressedTextureImage<T3>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 lod, [InAttribute, OutAttribute] T3[,,] img)
+            void GetCompressedTextureImage(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 lod, [OutAttribute] IntPtr img)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetCompressedTextureImageEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)lod, (IntPtr)img);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetCompressedTextureImageEXT")]
+            public static 
+            void GetCompressedTextureImage<T3>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 lod, [InAttribute, OutAttribute] T3[] img)
                 where T3 : struct
             {
                 #if DEBUG
@@ -91706,7 +91696,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetCompressedTextureImageEXT")]
             public static 
-            void GetCompressedTextureImage<T3>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 lod, [InAttribute, OutAttribute] T3[] img)
+            void GetCompressedTextureImage<T3>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 lod, [InAttribute, OutAttribute] T3[,,] img)
                 where T3 : struct
             {
                 #if DEBUG
@@ -91730,60 +91720,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetCompressedTextureImageEXT")]
             public static 
-            void GetCompressedTextureImage(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 lod, [OutAttribute] IntPtr img)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetCompressedTextureImageEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)lod, (IntPtr)img);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Get current 1D or 2D convolution filter kernel
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The filter to be retrieved. Must be one of GL_CONVOLUTION_1D or GL_CONVOLUTION_2D.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Format of the output image. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Data type of components in the output image. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="image">
-        /// <para>
-        /// Pointer to storage for the output image.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetConvolutionFilterEXT")]
-            public static 
-            void GetConvolutionFilter<T3>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T3 image)
+            void GetCompressedTextureImage<T3>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 lod, [InAttribute, OutAttribute] ref T3 img)
                 where T3 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle image_ptr = GCHandle.Alloc(image, GCHandleType.Pinned);
+                GCHandle img_ptr = GCHandle.Alloc(img, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glGetConvolutionFilterEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)image_ptr.AddrOfPinnedObject());
-                    image = (T3)image_ptr.Target;
+                    Delegates.glGetCompressedTextureImageEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)lod, (IntPtr)img_ptr.AddrOfPinnedObject());
+                    img = (T3)img_ptr.Target;
                 }
                 finally
                 {
-                    image_ptr.Free();
+                    img_ptr.Free();
                 }
                 #if DEBUG
                 }
@@ -91816,7 +91768,45 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetConvolutionFilterEXT")]
             public static 
-            void GetConvolutionFilter<T3>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[,,] image)
+            void GetConvolutionFilter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr image)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetConvolutionFilterEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)image);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Get current 1D or 2D convolution filter kernel
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The filter to be retrieved. Must be one of GL_CONVOLUTION_1D or GL_CONVOLUTION_2D.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Format of the output image. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Data type of components in the output image. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="image">
+        /// <para>
+        /// Pointer to storage for the output image.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetConvolutionFilterEXT")]
+            public static 
+            void GetConvolutionFilter<T3>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[] image)
                 where T3 : struct
             {
                 #if DEBUG
@@ -91910,7 +91900,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetConvolutionFilterEXT")]
             public static 
-            void GetConvolutionFilter<T3>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[] image)
+            void GetConvolutionFilter<T3>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[,,] image)
                 where T3 : struct
             {
                 #if DEBUG
@@ -91957,13 +91947,62 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetConvolutionFilterEXT")]
             public static 
-            void GetConvolutionFilter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr image)
+            void GetConvolutionFilter<T3>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T3 image)
+                where T3 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetConvolutionFilterEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)image);
+                GCHandle image_ptr = GCHandle.Alloc(image, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetConvolutionFilterEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)image_ptr.AddrOfPinnedObject());
+                    image = (T3)image_ptr.Target;
+                }
+                finally
+                {
+                    image_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Get convolution parameters
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The filter whose parameters are to be retrieved. Must be one of GL_CONVOLUTION_1D, GL_CONVOLUTION_2D, or GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// The parameter to be retrieved. Must be one of GL_CONVOLUTION_BORDER_MODE, GL_CONVOLUTION_BORDER_COLOR, GL_CONVOLUTION_FILTER_SCALE, GL_CONVOLUTION_FILTER_BIAS, GL_CONVOLUTION_FORMAT, GL_CONVOLUTION_WIDTH, GL_CONVOLUTION_HEIGHT, GL_MAX_CONVOLUTION_WIDTH, or GL_MAX_CONVOLUTION_HEIGHT.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Pointer to storage for the parameters to be retrieved.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetConvolutionParameterfvEXT")]
+            public static 
+            void GetConvolutionParameter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.ExtConvolution pname, [OutAttribute] Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glGetConvolutionParameterfvEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.ExtConvolution)pname, (Single*)@params_ptr);
+                    }
+                }
                 #if DEBUG
                 }
                 #endif
@@ -92044,79 +92083,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Get convolution parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The filter whose parameters are to be retrieved. Must be one of GL_CONVOLUTION_1D, GL_CONVOLUTION_2D, or GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// The parameter to be retrieved. Must be one of GL_CONVOLUTION_BORDER_MODE, GL_CONVOLUTION_BORDER_COLOR, GL_CONVOLUTION_FILTER_SCALE, GL_CONVOLUTION_FILTER_BIAS, GL_CONVOLUTION_FORMAT, GL_CONVOLUTION_WIDTH, GL_CONVOLUTION_HEIGHT, GL_MAX_CONVOLUTION_WIDTH, or GL_MAX_CONVOLUTION_HEIGHT.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Pointer to storage for the parameters to be retrieved.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetConvolutionParameterfvEXT")]
-            public static 
-            void GetConvolutionParameter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.ExtConvolution pname, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetConvolutionParameterfvEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.ExtConvolution)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Get convolution parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The filter whose parameters are to be retrieved. Must be one of GL_CONVOLUTION_1D, GL_CONVOLUTION_2D, or GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// The parameter to be retrieved. Must be one of GL_CONVOLUTION_BORDER_MODE, GL_CONVOLUTION_BORDER_COLOR, GL_CONVOLUTION_FILTER_SCALE, GL_CONVOLUTION_FILTER_BIAS, GL_CONVOLUTION_FORMAT, GL_CONVOLUTION_WIDTH, GL_CONVOLUTION_HEIGHT, GL_MAX_CONVOLUTION_WIDTH, or GL_MAX_CONVOLUTION_HEIGHT.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Pointer to storage for the parameters to be retrieved.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetConvolutionParameterivEXT")]
-            public static 
-            unsafe void GetConvolutionParameter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.ExtConvolution pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetConvolutionParameterivEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.ExtConvolution)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Get convolution parameters
         /// </summary>
@@ -92195,16 +92161,35 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            
+        /// <summary>
+        /// Get convolution parameters
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The filter whose parameters are to be retrieved. Must be one of GL_CONVOLUTION_1D, GL_CONVOLUTION_2D, or GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// The parameter to be retrieved. Must be one of GL_CONVOLUTION_BORDER_MODE, GL_CONVOLUTION_BORDER_COLOR, GL_CONVOLUTION_FILTER_SCALE, GL_CONVOLUTION_FILTER_BIAS, GL_CONVOLUTION_FORMAT, GL_CONVOLUTION_WIDTH, GL_CONVOLUTION_HEIGHT, GL_MAX_CONVOLUTION_WIDTH, or GL_MAX_CONVOLUTION_HEIGHT.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Pointer to storage for the parameters to be retrieved.
+        /// </para>
+        /// </param>
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetDoubleIndexedvEXT")]
+            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetConvolutionParameterivEXT")]
             public static 
-            unsafe void GetDoubleIndexed(OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, [OutAttribute] Double* data)
+            unsafe void GetConvolutionParameter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.ExtConvolution pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetDoubleIndexedvEXT((OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (Double*)data);
+                Delegates.glGetConvolutionParameterivEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.ExtConvolution)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -92254,7 +92239,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetDoubleIndexedvEXT")]
             public static 
-            unsafe void GetDoubleIndexed(OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, [OutAttribute] Double* data)
+            unsafe void GetDoubleIndexed(OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, [OutAttribute] Double* data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -92309,6 +92294,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetDoubleIndexedvEXT")]
+            public static 
+            unsafe void GetDoubleIndexed(OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, [OutAttribute] Double* data)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetDoubleIndexedvEXT((OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (Double*)data);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetFloatIndexedvEXT")]
+            public static 
+            void GetFloatIndexed(OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, [OutAttribute] Single[] data)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* data_ptr = data)
+                    {
+                        Delegates.glGetFloatIndexedvEXT((OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (Single*)data_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetFloatIndexedvEXT")]
             public static 
             void GetFloatIndexed(OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, [OutAttribute] out Single data)
@@ -92345,9 +92365,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetFloatIndexedvEXT")]
             public static 
-            void GetFloatIndexed(OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, [OutAttribute] Single[] data)
+            void GetFloatIndexed(OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, [OutAttribute] Single[] data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -92402,27 +92423,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetFloatIndexedvEXT")]
-            public static 
-            void GetFloatIndexed(OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, [OutAttribute] Single[] data)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* data_ptr = data)
-                    {
-                        Delegates.glGetFloatIndexedvEXT((OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (Single*)data_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtGpuShader4", Version = "2.0", EntryPoint = "glGetFragDataLocationEXT")]
             public static 
             Int32 GetFragDataLocation(Int32 program, String name)
@@ -92452,21 +92452,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtFramebufferObject", Version = "1.2", EntryPoint = "glGetFramebufferAttachmentParameterivEXT")]
-            public static 
-            unsafe void GetFramebufferAttachmentParameter(OpenTK.Graphics.OpenGL.FramebufferTarget target, OpenTK.Graphics.OpenGL.FramebufferAttachment attachment, OpenTK.Graphics.OpenGL.FramebufferParameterName pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetFramebufferAttachmentParameterivEXT((OpenTK.Graphics.OpenGL.FramebufferTarget)target, (OpenTK.Graphics.OpenGL.FramebufferAttachment)attachment, (OpenTK.Graphics.OpenGL.FramebufferParameterName)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtFramebufferObject", Version = "1.2", EntryPoint = "glGetFramebufferAttachmentParameterivEXT")]
             public static 
             void GetFramebufferAttachmentParameter(OpenTK.Graphics.OpenGL.FramebufferTarget target, OpenTK.Graphics.OpenGL.FramebufferAttachment attachment, OpenTK.Graphics.OpenGL.FramebufferParameterName pname, [OutAttribute] Int32[] @params)
@@ -92509,15 +92494,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetFramebufferParameterivEXT")]
+            [AutoGenerated(Category = "ExtFramebufferObject", Version = "1.2", EntryPoint = "glGetFramebufferAttachmentParameterivEXT")]
             public static 
-            unsafe void GetFramebufferParameter(Int32 framebuffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] Int32* @params)
+            unsafe void GetFramebufferAttachmentParameter(OpenTK.Graphics.OpenGL.FramebufferTarget target, OpenTK.Graphics.OpenGL.FramebufferAttachment attachment, OpenTK.Graphics.OpenGL.FramebufferParameterName pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetFramebufferParameterivEXT((UInt32)framebuffer, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)pname, (Int32*)@params);
+                Delegates.glGetFramebufferAttachmentParameterivEXT((OpenTK.Graphics.OpenGL.FramebufferTarget)target, (OpenTK.Graphics.OpenGL.FramebufferAttachment)attachment, (OpenTK.Graphics.OpenGL.FramebufferParameterName)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -92567,7 +92552,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetFramebufferParameterivEXT")]
             public static 
-            unsafe void GetFramebufferParameter(UInt32 framebuffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] Int32* @params)
+            unsafe void GetFramebufferParameter(Int32 framebuffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -92622,54 +92607,16 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            
-        /// <summary>
-        /// Get histogram table
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Must be GL_HISTOGRAM.
-        /// </para>
-        /// </param>
-        /// <param name="reset">
-        /// <para>
-        /// If GL_TRUE, each component counter that is actually returned is reset to zero. (Other counters are unaffected.) If GL_FALSE, none of the counters in the histogram table is modified.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// The format of values to be returned in values. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// The type of values to be returned in values. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="values">
-        /// <para>
-        /// A pointer to storage for the returned histogram table.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtHistogram", Version = "1.0", EntryPoint = "glGetHistogramEXT")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetFramebufferParameterivEXT")]
             public static 
-            void GetHistogram<T4>(OpenTK.Graphics.OpenGL.ExtHistogram target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T4 values)
-                where T4 : struct
+            unsafe void GetFramebufferParameter(UInt32 framebuffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle values_ptr = GCHandle.Alloc(values, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetHistogramEXT((OpenTK.Graphics.OpenGL.ExtHistogram)target, (bool)reset, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)values_ptr.AddrOfPinnedObject());
-                    values = (T4)values_ptr.Target;
-                }
-                finally
-                {
-                    values_ptr.Free();
-                }
+                Delegates.glGetFramebufferParameterivEXT((UInt32)framebuffer, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -92706,7 +92653,50 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtHistogram", Version = "1.0", EntryPoint = "glGetHistogramEXT")]
             public static 
-            void GetHistogram<T4>(OpenTK.Graphics.OpenGL.ExtHistogram target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[,,] values)
+            void GetHistogram(OpenTK.Graphics.OpenGL.ExtHistogram target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr values)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetHistogramEXT((OpenTK.Graphics.OpenGL.ExtHistogram)target, (bool)reset, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)values);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Get histogram table
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be GL_HISTOGRAM.
+        /// </para>
+        /// </param>
+        /// <param name="reset">
+        /// <para>
+        /// If GL_TRUE, each component counter that is actually returned is reset to zero. (Other counters are unaffected.) If GL_FALSE, none of the counters in the histogram table is modified.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// The format of values to be returned in values. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// The type of values to be returned in values. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="values">
+        /// <para>
+        /// A pointer to storage for the returned histogram table.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtHistogram", Version = "1.0", EntryPoint = "glGetHistogramEXT")]
+            public static 
+            void GetHistogram<T4>(OpenTK.Graphics.OpenGL.ExtHistogram target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[] values)
                 where T4 : struct
             {
                 #if DEBUG
@@ -92810,7 +92800,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtHistogram", Version = "1.0", EntryPoint = "glGetHistogramEXT")]
             public static 
-            void GetHistogram<T4>(OpenTK.Graphics.OpenGL.ExtHistogram target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[] values)
+            void GetHistogram<T4>(OpenTK.Graphics.OpenGL.ExtHistogram target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[,,] values)
                 where T4 : struct
             {
                 #if DEBUG
@@ -92862,13 +92852,62 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtHistogram", Version = "1.0", EntryPoint = "glGetHistogramEXT")]
             public static 
-            void GetHistogram(OpenTK.Graphics.OpenGL.ExtHistogram target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr values)
+            void GetHistogram<T4>(OpenTK.Graphics.OpenGL.ExtHistogram target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T4 values)
+                where T4 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetHistogramEXT((OpenTK.Graphics.OpenGL.ExtHistogram)target, (bool)reset, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)values);
+                GCHandle values_ptr = GCHandle.Alloc(values, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetHistogramEXT((OpenTK.Graphics.OpenGL.ExtHistogram)target, (bool)reset, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)values_ptr.AddrOfPinnedObject());
+                    values = (T4)values_ptr.Target;
+                }
+                finally
+                {
+                    values_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Get histogram parameters
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be one of GL_HISTOGRAM or GL_PROXY_HISTOGRAM.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// The name of the parameter to be retrieved. Must be one of GL_HISTOGRAM_WIDTH, GL_HISTOGRAM_FORMAT, GL_HISTOGRAM_RED_SIZE, GL_HISTOGRAM_GREEN_SIZE, GL_HISTOGRAM_BLUE_SIZE, GL_HISTOGRAM_ALPHA_SIZE, GL_HISTOGRAM_LUMINANCE_SIZE, or GL_HISTOGRAM_SINK.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Pointer to storage for the returned values.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtHistogram", Version = "1.0", EntryPoint = "glGetHistogramParameterfvEXT")]
+            public static 
+            void GetHistogramParameter(OpenTK.Graphics.OpenGL.ExtHistogram target, OpenTK.Graphics.OpenGL.ExtHistogram pname, [OutAttribute] Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glGetHistogramParameterfvEXT((OpenTK.Graphics.OpenGL.ExtHistogram)target, (OpenTK.Graphics.OpenGL.ExtHistogram)pname, (Single*)@params_ptr);
+                    }
+                }
                 #if DEBUG
                 }
                 #endif
@@ -92949,79 +92988,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Get histogram parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Must be one of GL_HISTOGRAM or GL_PROXY_HISTOGRAM.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// The name of the parameter to be retrieved. Must be one of GL_HISTOGRAM_WIDTH, GL_HISTOGRAM_FORMAT, GL_HISTOGRAM_RED_SIZE, GL_HISTOGRAM_GREEN_SIZE, GL_HISTOGRAM_BLUE_SIZE, GL_HISTOGRAM_ALPHA_SIZE, GL_HISTOGRAM_LUMINANCE_SIZE, or GL_HISTOGRAM_SINK.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Pointer to storage for the returned values.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtHistogram", Version = "1.0", EntryPoint = "glGetHistogramParameterfvEXT")]
-            public static 
-            void GetHistogramParameter(OpenTK.Graphics.OpenGL.ExtHistogram target, OpenTK.Graphics.OpenGL.ExtHistogram pname, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetHistogramParameterfvEXT((OpenTK.Graphics.OpenGL.ExtHistogram)target, (OpenTK.Graphics.OpenGL.ExtHistogram)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Get histogram parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Must be one of GL_HISTOGRAM or GL_PROXY_HISTOGRAM.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// The name of the parameter to be retrieved. Must be one of GL_HISTOGRAM_WIDTH, GL_HISTOGRAM_FORMAT, GL_HISTOGRAM_RED_SIZE, GL_HISTOGRAM_GREEN_SIZE, GL_HISTOGRAM_BLUE_SIZE, GL_HISTOGRAM_ALPHA_SIZE, GL_HISTOGRAM_LUMINANCE_SIZE, or GL_HISTOGRAM_SINK.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Pointer to storage for the returned values.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtHistogram", Version = "1.0", EntryPoint = "glGetHistogramParameterivEXT")]
-            public static 
-            unsafe void GetHistogramParameter(OpenTK.Graphics.OpenGL.ExtHistogram target, OpenTK.Graphics.OpenGL.ExtHistogram pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetHistogramParameterivEXT((OpenTK.Graphics.OpenGL.ExtHistogram)target, (OpenTK.Graphics.OpenGL.ExtHistogram)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Get histogram parameters
         /// </summary>
@@ -93100,16 +93066,35 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            
+        /// <summary>
+        /// Get histogram parameters
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be one of GL_HISTOGRAM or GL_PROXY_HISTOGRAM.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// The name of the parameter to be retrieved. Must be one of GL_HISTOGRAM_WIDTH, GL_HISTOGRAM_FORMAT, GL_HISTOGRAM_RED_SIZE, GL_HISTOGRAM_GREEN_SIZE, GL_HISTOGRAM_BLUE_SIZE, GL_HISTOGRAM_ALPHA_SIZE, GL_HISTOGRAM_LUMINANCE_SIZE, or GL_HISTOGRAM_SINK.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Pointer to storage for the returned values.
+        /// </para>
+        /// </param>
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDrawBuffers2", Version = "2.0", EntryPoint = "glGetIntegerIndexedvEXT")]
+            [AutoGenerated(Category = "ExtHistogram", Version = "1.0", EntryPoint = "glGetHistogramParameterivEXT")]
             public static 
-            unsafe void GetIntegerIndexed(OpenTK.Graphics.OpenGL.ExtDrawBuffers2 target, Int32 index, [OutAttribute] Int32* data)
+            unsafe void GetHistogramParameter(OpenTK.Graphics.OpenGL.ExtHistogram target, OpenTK.Graphics.OpenGL.ExtHistogram pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetIntegerIndexedvEXT((OpenTK.Graphics.OpenGL.ExtDrawBuffers2)target, (UInt32)index, (Int32*)data);
+                Delegates.glGetHistogramParameterivEXT((OpenTK.Graphics.OpenGL.ExtHistogram)target, (OpenTK.Graphics.OpenGL.ExtHistogram)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -93159,7 +93144,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDrawBuffers2", Version = "2.0", EntryPoint = "glGetIntegerIndexedvEXT")]
             public static 
-            unsafe void GetIntegerIndexed(OpenTK.Graphics.OpenGL.ExtDrawBuffers2 target, UInt32 index, [OutAttribute] Int32* data)
+            unsafe void GetIntegerIndexed(OpenTK.Graphics.OpenGL.ExtDrawBuffers2 target, Int32 index, [OutAttribute] Int32* data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -93215,15 +93200,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetInvariantBooleanvEXT")]
+            [AutoGenerated(Category = "ExtDrawBuffers2", Version = "2.0", EntryPoint = "glGetIntegerIndexedvEXT")]
             public static 
-            unsafe void GetInvariantBoolean(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] bool* data)
+            unsafe void GetIntegerIndexed(OpenTK.Graphics.OpenGL.ExtDrawBuffers2 target, UInt32 index, [OutAttribute] Int32* data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetInvariantBooleanvEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)value, (bool*)data);
+                Delegates.glGetIntegerIndexedvEXT((OpenTK.Graphics.OpenGL.ExtDrawBuffers2)target, (UInt32)index, (Int32*)data);
                 #if DEBUG
                 }
                 #endif
@@ -93273,7 +93258,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetInvariantBooleanvEXT")]
             public static 
-            unsafe void GetInvariantBoolean(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] bool* data)
+            unsafe void GetInvariantBoolean(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] bool* data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -93328,6 +93313,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetInvariantBooleanvEXT")]
+            public static 
+            unsafe void GetInvariantBoolean(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] bool* data)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetInvariantBooleanvEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)value, (bool*)data);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetInvariantFloatvEXT")]
+            public static 
+            void GetInvariantFloat(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] Single[] data)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* data_ptr = data)
+                    {
+                        Delegates.glGetInvariantFloatvEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)value, (Single*)data_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetInvariantFloatvEXT")]
             public static 
             void GetInvariantFloat(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] out Single data)
@@ -93364,9 +93384,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetInvariantFloatvEXT")]
             public static 
-            void GetInvariantFloat(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] Single[] data)
+            void GetInvariantFloat(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] Single[] data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -93421,42 +93442,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetInvariantFloatvEXT")]
-            public static 
-            void GetInvariantFloat(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] Single[] data)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* data_ptr = data)
-                    {
-                        Delegates.glGetInvariantFloatvEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)value, (Single*)data_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetInvariantIntegervEXT")]
-            public static 
-            unsafe void GetInvariantInteger(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] Int32* data)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetInvariantIntegervEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)value, (Int32*)data);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetInvariantIntegervEXT")]
             public static 
             void GetInvariantInteger(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] Int32[] data)
@@ -93501,7 +93486,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetInvariantIntegervEXT")]
             public static 
-            unsafe void GetInvariantInteger(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] Int32* data)
+            unsafe void GetInvariantInteger(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] Int32* data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -93557,15 +93542,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetLocalConstantBooleanvEXT")]
+            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetInvariantIntegervEXT")]
             public static 
-            unsafe void GetLocalConstantBoolean(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] bool* data)
+            unsafe void GetInvariantInteger(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] Int32* data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetLocalConstantBooleanvEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)value, (bool*)data);
+                Delegates.glGetInvariantIntegervEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)value, (Int32*)data);
                 #if DEBUG
                 }
                 #endif
@@ -93615,7 +93600,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetLocalConstantBooleanvEXT")]
             public static 
-            unsafe void GetLocalConstantBoolean(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] bool* data)
+            unsafe void GetLocalConstantBoolean(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] bool* data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -93670,6 +93655,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetLocalConstantBooleanvEXT")]
+            public static 
+            unsafe void GetLocalConstantBoolean(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] bool* data)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetLocalConstantBooleanvEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)value, (bool*)data);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetLocalConstantFloatvEXT")]
+            public static 
+            void GetLocalConstantFloat(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] Single[] data)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* data_ptr = data)
+                    {
+                        Delegates.glGetLocalConstantFloatvEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)value, (Single*)data_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetLocalConstantFloatvEXT")]
             public static 
             void GetLocalConstantFloat(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] out Single data)
@@ -93706,9 +93726,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetLocalConstantFloatvEXT")]
             public static 
-            void GetLocalConstantFloat(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] Single[] data)
+            void GetLocalConstantFloat(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] Single[] data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -93763,42 +93784,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetLocalConstantFloatvEXT")]
-            public static 
-            void GetLocalConstantFloat(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] Single[] data)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* data_ptr = data)
-                    {
-                        Delegates.glGetLocalConstantFloatvEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)value, (Single*)data_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetLocalConstantIntegervEXT")]
-            public static 
-            unsafe void GetLocalConstantInteger(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] Int32* data)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetLocalConstantIntegervEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)value, (Int32*)data);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetLocalConstantIntegervEXT")]
             public static 
             void GetLocalConstantInteger(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] Int32[] data)
@@ -93843,7 +93828,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetLocalConstantIntegervEXT")]
             public static 
-            unsafe void GetLocalConstantInteger(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] Int32* data)
+            unsafe void GetLocalConstantInteger(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] Int32* data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -93898,54 +93883,16 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            
-        /// <summary>
-        /// Get minimum and maximum pixel values
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Must be GL_MINMAX.
-        /// </para>
-        /// </param>
-        /// <param name="reset">
-        /// <para>
-        /// If GL_TRUE, all entries in the minmax table that are actually returned are reset to their initial values. (Other entries are unaltered.) If GL_FALSE, the minmax table is unaltered.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// The format of the data to be returned in values. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="types">
-        /// <para>
-        /// The type of the data to be returned in values. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="values">
-        /// <para>
-        /// A pointer to storage for the returned values.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtHistogram", Version = "1.0", EntryPoint = "glGetMinmaxEXT")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetLocalConstantIntegervEXT")]
             public static 
-            void GetMinmax<T4>(OpenTK.Graphics.OpenGL.ExtHistogram target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T4 values)
-                where T4 : struct
+            unsafe void GetLocalConstantInteger(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] Int32* data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle values_ptr = GCHandle.Alloc(values, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetMinmaxEXT((OpenTK.Graphics.OpenGL.ExtHistogram)target, (bool)reset, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)values_ptr.AddrOfPinnedObject());
-                    values = (T4)values_ptr.Target;
-                }
-                finally
-                {
-                    values_ptr.Free();
-                }
+                Delegates.glGetLocalConstantIntegervEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)value, (Int32*)data);
                 #if DEBUG
                 }
                 #endif
@@ -93982,7 +93929,50 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtHistogram", Version = "1.0", EntryPoint = "glGetMinmaxEXT")]
             public static 
-            void GetMinmax<T4>(OpenTK.Graphics.OpenGL.ExtHistogram target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[,,] values)
+            void GetMinmax(OpenTK.Graphics.OpenGL.ExtHistogram target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr values)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetMinmaxEXT((OpenTK.Graphics.OpenGL.ExtHistogram)target, (bool)reset, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)values);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Get minimum and maximum pixel values
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be GL_MINMAX.
+        /// </para>
+        /// </param>
+        /// <param name="reset">
+        /// <para>
+        /// If GL_TRUE, all entries in the minmax table that are actually returned are reset to their initial values. (Other entries are unaltered.) If GL_FALSE, the minmax table is unaltered.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// The format of the data to be returned in values. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="types">
+        /// <para>
+        /// The type of the data to be returned in values. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="values">
+        /// <para>
+        /// A pointer to storage for the returned values.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtHistogram", Version = "1.0", EntryPoint = "glGetMinmaxEXT")]
+            public static 
+            void GetMinmax<T4>(OpenTK.Graphics.OpenGL.ExtHistogram target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[] values)
                 where T4 : struct
             {
                 #if DEBUG
@@ -94086,7 +94076,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtHistogram", Version = "1.0", EntryPoint = "glGetMinmaxEXT")]
             public static 
-            void GetMinmax<T4>(OpenTK.Graphics.OpenGL.ExtHistogram target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[] values)
+            void GetMinmax<T4>(OpenTK.Graphics.OpenGL.ExtHistogram target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T4[,,] values)
                 where T4 : struct
             {
                 #if DEBUG
@@ -94138,13 +94128,62 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtHistogram", Version = "1.0", EntryPoint = "glGetMinmaxEXT")]
             public static 
-            void GetMinmax(OpenTK.Graphics.OpenGL.ExtHistogram target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr values)
+            void GetMinmax<T4>(OpenTK.Graphics.OpenGL.ExtHistogram target, bool reset, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T4 values)
+                where T4 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetMinmaxEXT((OpenTK.Graphics.OpenGL.ExtHistogram)target, (bool)reset, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)values);
+                GCHandle values_ptr = GCHandle.Alloc(values, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetMinmaxEXT((OpenTK.Graphics.OpenGL.ExtHistogram)target, (bool)reset, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)values_ptr.AddrOfPinnedObject());
+                    values = (T4)values_ptr.Target;
+                }
+                finally
+                {
+                    values_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Get minmax parameters
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be GL_MINMAX.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// The parameter to be retrieved. Must be one of GL_MINMAX_FORMAT or GL_MINMAX_SINK.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// A pointer to storage for the retrieved parameters.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtHistogram", Version = "1.0", EntryPoint = "glGetMinmaxParameterfvEXT")]
+            public static 
+            void GetMinmaxParameter(OpenTK.Graphics.OpenGL.ExtHistogram target, OpenTK.Graphics.OpenGL.ExtHistogram pname, [OutAttribute] Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glGetMinmaxParameterfvEXT((OpenTK.Graphics.OpenGL.ExtHistogram)target, (OpenTK.Graphics.OpenGL.ExtHistogram)pname, (Single*)@params_ptr);
+                    }
+                }
                 #if DEBUG
                 }
                 #endif
@@ -94225,79 +94264,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Get minmax parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Must be GL_MINMAX.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// The parameter to be retrieved. Must be one of GL_MINMAX_FORMAT or GL_MINMAX_SINK.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// A pointer to storage for the retrieved parameters.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtHistogram", Version = "1.0", EntryPoint = "glGetMinmaxParameterfvEXT")]
-            public static 
-            void GetMinmaxParameter(OpenTK.Graphics.OpenGL.ExtHistogram target, OpenTK.Graphics.OpenGL.ExtHistogram pname, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetMinmaxParameterfvEXT((OpenTK.Graphics.OpenGL.ExtHistogram)target, (OpenTK.Graphics.OpenGL.ExtHistogram)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Get minmax parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Must be GL_MINMAX.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// The parameter to be retrieved. Must be one of GL_MINMAX_FORMAT or GL_MINMAX_SINK.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// A pointer to storage for the retrieved parameters.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtHistogram", Version = "1.0", EntryPoint = "glGetMinmaxParameterivEXT")]
-            public static 
-            unsafe void GetMinmaxParameter(OpenTK.Graphics.OpenGL.ExtHistogram target, OpenTK.Graphics.OpenGL.ExtHistogram pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetMinmaxParameterivEXT((OpenTK.Graphics.OpenGL.ExtHistogram)target, (OpenTK.Graphics.OpenGL.ExtHistogram)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Get minmax parameters
         /// </summary>
@@ -94376,6 +94342,60 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            
+        /// <summary>
+        /// Get minmax parameters
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be GL_MINMAX.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// The parameter to be retrieved. Must be one of GL_MINMAX_FORMAT or GL_MINMAX_SINK.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// A pointer to storage for the retrieved parameters.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtHistogram", Version = "1.0", EntryPoint = "glGetMinmaxParameterivEXT")]
+            public static 
+            unsafe void GetMinmaxParameter(OpenTK.Graphics.OpenGL.ExtHistogram target, OpenTK.Graphics.OpenGL.ExtHistogram pname, [OutAttribute] Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetMinmaxParameterivEXT((OpenTK.Graphics.OpenGL.ExtHistogram)target, (OpenTK.Graphics.OpenGL.ExtHistogram)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexEnvfvEXT")]
+            public static 
+            void GetMultiTexEnv(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureEnvTarget target, OpenTK.Graphics.OpenGL.TextureEnvParameter pname, [OutAttribute] Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glGetMultiTexEnvfvEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureEnvTarget)target, (OpenTK.Graphics.OpenGL.TextureEnvParameter)pname, (Single*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexEnvfvEXT")]
             public static 
             void GetMultiTexEnv(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureEnvTarget target, OpenTK.Graphics.OpenGL.TextureEnvParameter pname, [OutAttribute] out Single @params)
@@ -94412,41 +94432,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexEnvfvEXT")]
-            public static 
-            void GetMultiTexEnv(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureEnvTarget target, OpenTK.Graphics.OpenGL.TextureEnvParameter pname, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetMultiTexEnvfvEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureEnvTarget)target, (OpenTK.Graphics.OpenGL.TextureEnvParameter)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexEnvivEXT")]
-            public static 
-            unsafe void GetMultiTexEnv(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureEnvTarget target, OpenTK.Graphics.OpenGL.TextureEnvParameter pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetMultiTexEnvivEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureEnvTarget)target, (OpenTK.Graphics.OpenGL.TextureEnvParameter)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexEnvivEXT")]
             public static 
             void GetMultiTexEnv(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureEnvTarget target, OpenTK.Graphics.OpenGL.TextureEnvParameter pname, [OutAttribute] Int32[] @params)
@@ -94489,15 +94474,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexGendvEXT")]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexEnvivEXT")]
             public static 
-            unsafe void GetMultiTexGen(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, [OutAttribute] Double* @params)
+            unsafe void GetMultiTexEnv(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureEnvTarget target, OpenTK.Graphics.OpenGL.TextureEnvParameter pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetMultiTexGendvEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Double*)@params);
+                Delegates.glGetMultiTexEnvivEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureEnvTarget)target, (OpenTK.Graphics.OpenGL.TextureEnvParameter)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -94544,6 +94529,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexGendvEXT")]
+            public static 
+            unsafe void GetMultiTexGen(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, [OutAttribute] Double* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetMultiTexGendvEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Double*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexGenfvEXT")]
+            public static 
+            void GetMultiTexGen(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, [OutAttribute] Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glGetMultiTexGenfvEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Single*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexGenfvEXT")]
             public static 
             void GetMultiTexGen(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, [OutAttribute] out Single @params)
@@ -94580,41 +94600,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexGenfvEXT")]
-            public static 
-            void GetMultiTexGen(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetMultiTexGenfvEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexGenivEXT")]
-            public static 
-            unsafe void GetMultiTexGen(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetMultiTexGenivEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexGenivEXT")]
             public static 
             void GetMultiTexGen(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, [OutAttribute] Int32[] @params)
@@ -94656,25 +94641,16 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexImageEXT")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexGenivEXT")]
             public static 
-            void GetMultiTexImage<T5>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T5 pixels)
-                where T5 : struct
+            unsafe void GetMultiTexGen(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetMultiTexImageEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                    pixels = (T5)pixels_ptr.Target;
-                }
-                finally
-                {
-                    pixels_ptr.Free();
-                }
+                Delegates.glGetMultiTexGenivEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -94682,7 +94658,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexImageEXT")]
             public static 
-            void GetMultiTexImage<T5>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[,,] pixels)
+            void GetMultiTexImage(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr pixels)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetMultiTexImageEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexImageEXT")]
+            public static 
+            void GetMultiTexImage<T5>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[] pixels)
                 where T5 : struct
             {
                 #if DEBUG
@@ -94728,7 +94718,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexImageEXT")]
             public static 
-            void GetMultiTexImage<T5>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[] pixels)
+            void GetMultiTexImage<T5>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[,,] pixels)
                 where T5 : struct
             {
                 #if DEBUG
@@ -94751,13 +94741,43 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexImageEXT")]
             public static 
-            void GetMultiTexImage(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr pixels)
+            void GetMultiTexImage<T5>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T5 pixels)
+                where T5 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetMultiTexImageEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+                GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetMultiTexImageEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    pixels = (T5)pixels_ptr.Target;
+                }
+                finally
+                {
+                    pixels_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexLevelParameterfvEXT")]
+            public static 
+            void GetMultiTexLevelParameter(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glGetMultiTexLevelParameterfvEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Single*)@params_ptr);
+                    }
+                }
                 #if DEBUG
                 }
                 #endif
@@ -94799,41 +94819,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexLevelParameterfvEXT")]
-            public static 
-            void GetMultiTexLevelParameter(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetMultiTexLevelParameterfvEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexLevelParameterivEXT")]
-            public static 
-            unsafe void GetMultiTexLevelParameter(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetMultiTexLevelParameterivEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexLevelParameterivEXT")]
             public static 
             void GetMultiTexLevelParameter(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32[] @params)
@@ -94875,6 +94860,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexLevelParameterivEXT")]
+            public static 
+            unsafe void GetMultiTexLevelParameter(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetMultiTexLevelParameterivEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexParameterfvEXT")]
+            public static 
+            void GetMultiTexParameter(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glGetMultiTexParameterfvEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Single*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexParameterfvEXT")]
             public static 
             void GetMultiTexParameter(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] out Single @params)
@@ -94911,41 +94931,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexParameterfvEXT")]
-            public static 
-            void GetMultiTexParameter(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetMultiTexParameterfvEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexParameterIivEXT")]
-            public static 
-            unsafe void GetMultiTexParameterI(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetMultiTexParameterIivEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexParameterIivEXT")]
             public static 
             void GetMultiTexParameterI(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32[] @params)
@@ -94987,6 +94972,42 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexParameterIivEXT")]
+            public static 
+            unsafe void GetMultiTexParameterI(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetMultiTexParameterIivEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexParameterIuivEXT")]
+            public static 
+            void GetMultiTexParameterI(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] UInt32[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* @params_ptr = @params)
+                    {
+                        Delegates.glGetMultiTexParameterIuivEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (UInt32*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexParameterIuivEXT")]
             public static 
@@ -95024,42 +95045,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexParameterIuivEXT")]
-            public static 
-            void GetMultiTexParameterI(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] UInt32[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* @params_ptr = @params)
-                    {
-                        Delegates.glGetMultiTexParameterIuivEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (UInt32*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexParameterivEXT")]
-            public static 
-            unsafe void GetMultiTexParameter(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetMultiTexParameterivEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexParameterivEXT")]
             public static 
             void GetMultiTexParameter(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32[] @params)
@@ -95102,15 +95087,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedBufferParameterivEXT")]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetMultiTexParameterivEXT")]
             public static 
-            unsafe void GetNamedBufferParameter(Int32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] Int32* @params)
+            unsafe void GetMultiTexParameter(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetNamedBufferParameterivEXT((UInt32)buffer, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)pname, (Int32*)@params);
+                Delegates.glGetMultiTexParameterivEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -95160,7 +95145,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedBufferParameterivEXT")]
             public static 
-            unsafe void GetNamedBufferParameter(UInt32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] Int32* @params)
+            unsafe void GetNamedBufferParameter(Int32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -95215,25 +95200,16 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedBufferPointervEXT")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedBufferParameterivEXT")]
             public static 
-            void GetNamedBufferPointer<T2>(Int32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [InAttribute, OutAttribute] ref T2 @params)
-                where T2 : struct
+            unsafe void GetNamedBufferParameter(UInt32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle @params_ptr = GCHandle.Alloc(@params, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetNamedBufferPointervEXT((UInt32)buffer, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
-                    @params = (T2)@params_ptr.Target;
-                }
-                finally
-                {
-                    @params_ptr.Free();
-                }
+                Delegates.glGetNamedBufferParameterivEXT((UInt32)buffer, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -95241,7 +95217,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedBufferPointervEXT")]
             public static 
-            void GetNamedBufferPointer<T2>(Int32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [InAttribute, OutAttribute] T2[,,] @params)
+            void GetNamedBufferPointer(Int32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] IntPtr @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetNamedBufferPointervEXT((UInt32)buffer, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)pname, (IntPtr)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedBufferPointervEXT")]
+            public static 
+            void GetNamedBufferPointer<T2>(Int32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [InAttribute, OutAttribute] T2[] @params)
                 where T2 : struct
             {
                 #if DEBUG
@@ -95287,7 +95277,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedBufferPointervEXT")]
             public static 
-            void GetNamedBufferPointer<T2>(Int32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [InAttribute, OutAttribute] T2[] @params)
+            void GetNamedBufferPointer<T2>(Int32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [InAttribute, OutAttribute] T2[,,] @params)
                 where T2 : struct
             {
                 #if DEBUG
@@ -95310,22 +95300,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedBufferPointervEXT")]
             public static 
-            void GetNamedBufferPointer(Int32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] IntPtr @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetNamedBufferPointervEXT((UInt32)buffer, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)pname, (IntPtr)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedBufferPointervEXT")]
-            public static 
-            void GetNamedBufferPointer<T2>(UInt32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [InAttribute, OutAttribute] ref T2 @params)
+            void GetNamedBufferPointer<T2>(Int32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [InAttribute, OutAttribute] ref T2 @params)
                 where T2 : struct
             {
                 #if DEBUG
@@ -95350,7 +95325,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedBufferPointervEXT")]
             public static 
-            void GetNamedBufferPointer<T2>(UInt32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [InAttribute, OutAttribute] T2[,,] @params)
+            void GetNamedBufferPointer(UInt32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] IntPtr @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetNamedBufferPointervEXT((UInt32)buffer, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)pname, (IntPtr)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedBufferPointervEXT")]
+            public static 
+            void GetNamedBufferPointer<T2>(UInt32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [InAttribute, OutAttribute] T2[] @params)
                 where T2 : struct
             {
                 #if DEBUG
@@ -95398,7 +95388,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedBufferPointervEXT")]
             public static 
-            void GetNamedBufferPointer<T2>(UInt32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [InAttribute, OutAttribute] T2[] @params)
+            void GetNamedBufferPointer<T2>(UInt32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [InAttribute, OutAttribute] T2[,,] @params)
                 where T2 : struct
             {
                 #if DEBUG
@@ -95422,36 +95412,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedBufferPointervEXT")]
             public static 
-            void GetNamedBufferPointer(UInt32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] IntPtr @params)
+            void GetNamedBufferPointer<T2>(UInt32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [InAttribute, OutAttribute] ref T2 @params)
+                where T2 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetNamedBufferPointervEXT((UInt32)buffer, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)pname, (IntPtr)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedBufferSubDataEXT")]
-            public static 
-            void GetNamedBufferSubData<T3>(Int32 buffer, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] ref T3 data)
-                where T3 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
+                GCHandle @params_ptr = GCHandle.Alloc(@params, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glGetNamedBufferSubDataEXT((UInt32)buffer, (IntPtr)offset, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject());
-                    data = (T3)data_ptr.Target;
+                    Delegates.glGetNamedBufferPointervEXT((UInt32)buffer, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
+                    @params = (T2)@params_ptr.Target;
                 }
                 finally
                 {
-                    data_ptr.Free();
+                    @params_ptr.Free();
                 }
                 #if DEBUG
                 }
@@ -95460,7 +95436,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedBufferSubDataEXT")]
             public static 
-            void GetNamedBufferSubData<T3>(Int32 buffer, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[,,] data)
+            void GetNamedBufferSubData(Int32 buffer, IntPtr offset, IntPtr size, [OutAttribute] IntPtr data)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetNamedBufferSubDataEXT((UInt32)buffer, (IntPtr)offset, (IntPtr)size, (IntPtr)data);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedBufferSubDataEXT")]
+            public static 
+            void GetNamedBufferSubData<T3>(Int32 buffer, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[] data)
                 where T3 : struct
             {
                 #if DEBUG
@@ -95506,7 +95496,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedBufferSubDataEXT")]
             public static 
-            void GetNamedBufferSubData<T3>(Int32 buffer, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[] data)
+            void GetNamedBufferSubData<T3>(Int32 buffer, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[,,] data)
                 where T3 : struct
             {
                 #if DEBUG
@@ -95529,22 +95519,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedBufferSubDataEXT")]
             public static 
-            void GetNamedBufferSubData(Int32 buffer, IntPtr offset, IntPtr size, [OutAttribute] IntPtr data)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetNamedBufferSubDataEXT((UInt32)buffer, (IntPtr)offset, (IntPtr)size, (IntPtr)data);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedBufferSubDataEXT")]
-            public static 
-            void GetNamedBufferSubData<T3>(UInt32 buffer, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] ref T3 data)
+            void GetNamedBufferSubData<T3>(Int32 buffer, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] ref T3 data)
                 where T3 : struct
             {
                 #if DEBUG
@@ -95569,7 +95544,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedBufferSubDataEXT")]
             public static 
-            void GetNamedBufferSubData<T3>(UInt32 buffer, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[,,] data)
+            void GetNamedBufferSubData(UInt32 buffer, IntPtr offset, IntPtr size, [OutAttribute] IntPtr data)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetNamedBufferSubDataEXT((UInt32)buffer, (IntPtr)offset, (IntPtr)size, (IntPtr)data);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedBufferSubDataEXT")]
+            public static 
+            void GetNamedBufferSubData<T3>(UInt32 buffer, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[] data)
                 where T3 : struct
             {
                 #if DEBUG
@@ -95617,7 +95607,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedBufferSubDataEXT")]
             public static 
-            void GetNamedBufferSubData<T3>(UInt32 buffer, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[] data)
+            void GetNamedBufferSubData<T3>(UInt32 buffer, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[,,] data)
                 where T3 : struct
             {
                 #if DEBUG
@@ -95641,28 +95631,23 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedBufferSubDataEXT")]
             public static 
-            void GetNamedBufferSubData(UInt32 buffer, IntPtr offset, IntPtr size, [OutAttribute] IntPtr data)
+            void GetNamedBufferSubData<T3>(UInt32 buffer, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] ref T3 data)
+                where T3 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetNamedBufferSubDataEXT((UInt32)buffer, (IntPtr)offset, (IntPtr)size, (IntPtr)data);
-                #if DEBUG
+                GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetNamedBufferSubDataEXT((UInt32)buffer, (IntPtr)offset, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject());
+                    data = (T3)data_ptr.Target;
                 }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedFramebufferAttachmentParameterivEXT")]
-            public static 
-            unsafe void GetNamedFramebufferAttachmentParameter(Int32 framebuffer, OpenTK.Graphics.OpenGL.FramebufferAttachment attachment, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                finally
                 {
-                #endif
-                Delegates.glGetNamedFramebufferAttachmentParameterivEXT((UInt32)framebuffer, (OpenTK.Graphics.OpenGL.FramebufferAttachment)attachment, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)pname, (Int32*)@params);
+                    data_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -95712,7 +95697,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedFramebufferAttachmentParameterivEXT")]
             public static 
-            unsafe void GetNamedFramebufferAttachmentParameter(UInt32 framebuffer, OpenTK.Graphics.OpenGL.FramebufferAttachment attachment, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] Int32* @params)
+            unsafe void GetNamedFramebufferAttachmentParameter(Int32 framebuffer, OpenTK.Graphics.OpenGL.FramebufferAttachment attachment, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -95768,15 +95753,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedProgramivEXT")]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedFramebufferAttachmentParameterivEXT")]
             public static 
-            unsafe void GetNamedProgram(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] Int32* @params)
+            unsafe void GetNamedFramebufferAttachmentParameter(UInt32 framebuffer, OpenTK.Graphics.OpenGL.FramebufferAttachment attachment, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetNamedProgramivEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)pname, (Int32*)@params);
+                Delegates.glGetNamedFramebufferAttachmentParameterivEXT((UInt32)framebuffer, (OpenTK.Graphics.OpenGL.FramebufferAttachment)attachment, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -95806,7 +95791,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedProgramivEXT")]
             public static 
-            unsafe void GetNamedProgram(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] Int32* @params)
+            unsafe void GetNamedProgram(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -95841,15 +95826,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedProgramLocalParameterdvEXT")]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedProgramivEXT")]
             public static 
-            unsafe void GetNamedProgramLocalParameter(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, [OutAttribute] Double* @params)
+            unsafe void GetNamedProgram(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetNamedProgramLocalParameterdvEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (Double*)@params);
+                Delegates.glGetNamedProgramivEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -95899,7 +95884,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedProgramLocalParameterdvEXT")]
             public static 
-            unsafe void GetNamedProgramLocalParameter(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, [OutAttribute] Double* @params)
+            unsafe void GetNamedProgramLocalParameter(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, [OutAttribute] Double* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -95954,6 +95939,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedProgramLocalParameterdvEXT")]
+            public static 
+            unsafe void GetNamedProgramLocalParameter(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, [OutAttribute] Double* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetNamedProgramLocalParameterdvEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (Double*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedProgramLocalParameterfvEXT")]
+            public static 
+            void GetNamedProgramLocalParameter(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, [OutAttribute] Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glGetNamedProgramLocalParameterfvEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (Single*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedProgramLocalParameterfvEXT")]
             public static 
             void GetNamedProgramLocalParameter(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, [OutAttribute] out Single @params)
@@ -95990,9 +96010,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedProgramLocalParameterfvEXT")]
             public static 
-            void GetNamedProgramLocalParameter(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, [OutAttribute] Single[] @params)
+            void GetNamedProgramLocalParameter(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, [OutAttribute] Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -96047,42 +96068,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedProgramLocalParameterfvEXT")]
-            public static 
-            void GetNamedProgramLocalParameter(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetNamedProgramLocalParameterfvEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedProgramLocalParameterIivEXT")]
-            public static 
-            unsafe void GetNamedProgramLocalParameterI(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetNamedProgramLocalParameterIivEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedProgramLocalParameterIivEXT")]
             public static 
             void GetNamedProgramLocalParameterI(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, [OutAttribute] Int32[] @params)
@@ -96127,7 +96112,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedProgramLocalParameterIivEXT")]
             public static 
-            unsafe void GetNamedProgramLocalParameterI(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, [OutAttribute] Int32* @params)
+            unsafe void GetNamedProgramLocalParameterI(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -96182,6 +96167,42 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedProgramLocalParameterIivEXT")]
+            public static 
+            unsafe void GetNamedProgramLocalParameterI(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, [OutAttribute] Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetNamedProgramLocalParameterIivEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedProgramLocalParameterIuivEXT")]
+            public static 
+            void GetNamedProgramLocalParameterI(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, [OutAttribute] UInt32[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* @params_ptr = @params)
+                    {
+                        Delegates.glGetNamedProgramLocalParameterIuivEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (UInt32*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedProgramLocalParameterIuivEXT")]
             public static 
@@ -96219,22 +96240,15 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedProgramLocalParameterIuivEXT")]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedProgramStringEXT")]
             public static 
-            void GetNamedProgramLocalParameterI(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, [OutAttribute] UInt32[] @params)
+            void GetNamedProgramString(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] IntPtr @string)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                unsafe
-                {
-                    fixed (UInt32* @params_ptr = @params)
-                    {
-                        Delegates.glGetNamedProgramLocalParameterIuivEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (UInt32*)@params_ptr);
-                    }
-                }
+                Delegates.glGetNamedProgramStringEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)pname, (IntPtr)@string);
                 #if DEBUG
                 }
                 #endif
@@ -96242,31 +96256,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedProgramStringEXT")]
             public static 
-            void GetNamedProgramString<T3>(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [InAttribute, OutAttribute] ref T3 @string)
-                where T3 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle @string_ptr = GCHandle.Alloc(@string, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetNamedProgramStringEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)pname, (IntPtr)@string_ptr.AddrOfPinnedObject());
-                    @string = (T3)@string_ptr.Target;
-                }
-                finally
-                {
-                    @string_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedProgramStringEXT")]
-            public static 
-            void GetNamedProgramString<T3>(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [InAttribute, OutAttribute] T3[,,] @string)
+            void GetNamedProgramString<T3>(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [InAttribute, OutAttribute] T3[] @string)
                 where T3 : struct
             {
                 #if DEBUG
@@ -96312,7 +96302,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedProgramStringEXT")]
             public static 
-            void GetNamedProgramString<T3>(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [InAttribute, OutAttribute] T3[] @string)
+            void GetNamedProgramString<T3>(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [InAttribute, OutAttribute] T3[,,] @string)
                 where T3 : struct
             {
                 #if DEBUG
@@ -96335,22 +96325,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedProgramStringEXT")]
             public static 
-            void GetNamedProgramString(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] IntPtr @string)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetNamedProgramStringEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)pname, (IntPtr)@string);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedProgramStringEXT")]
-            public static 
-            void GetNamedProgramString<T3>(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [InAttribute, OutAttribute] ref T3 @string)
+            void GetNamedProgramString<T3>(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [InAttribute, OutAttribute] ref T3 @string)
                 where T3 : struct
             {
                 #if DEBUG
@@ -96375,7 +96350,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedProgramStringEXT")]
             public static 
-            void GetNamedProgramString<T3>(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [InAttribute, OutAttribute] T3[,,] @string)
+            void GetNamedProgramString(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] IntPtr @string)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetNamedProgramStringEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)pname, (IntPtr)@string);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedProgramStringEXT")]
+            public static 
+            void GetNamedProgramString<T3>(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [InAttribute, OutAttribute] T3[] @string)
                 where T3 : struct
             {
                 #if DEBUG
@@ -96423,7 +96413,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedProgramStringEXT")]
             public static 
-            void GetNamedProgramString<T3>(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [InAttribute, OutAttribute] T3[] @string)
+            void GetNamedProgramString<T3>(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [InAttribute, OutAttribute] T3[,,] @string)
                 where T3 : struct
             {
                 #if DEBUG
@@ -96447,28 +96437,23 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedProgramStringEXT")]
             public static 
-            void GetNamedProgramString(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [OutAttribute] IntPtr @string)
+            void GetNamedProgramString<T3>(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess pname, [InAttribute, OutAttribute] ref T3 @string)
+                where T3 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetNamedProgramStringEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)pname, (IntPtr)@string);
-                #if DEBUG
+                GCHandle @string_ptr = GCHandle.Alloc(@string, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetNamedProgramStringEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)pname, (IntPtr)@string_ptr.AddrOfPinnedObject());
+                    @string = (T3)@string_ptr.Target;
                 }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedRenderbufferParameterivEXT")]
-            public static 
-            unsafe void GetNamedRenderbufferParameter(Int32 renderbuffer, OpenTK.Graphics.OpenGL.RenderbufferParameterName pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                finally
                 {
-                #endif
-                Delegates.glGetNamedRenderbufferParameterivEXT((UInt32)renderbuffer, (OpenTK.Graphics.OpenGL.RenderbufferParameterName)pname, (Int32*)@params);
+                    @string_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -96518,7 +96503,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedRenderbufferParameterivEXT")]
             public static 
-            unsafe void GetNamedRenderbufferParameter(UInt32 renderbuffer, OpenTK.Graphics.OpenGL.RenderbufferParameterName pname, [OutAttribute] Int32* @params)
+            unsafe void GetNamedRenderbufferParameter(Int32 renderbuffer, OpenTK.Graphics.OpenGL.RenderbufferParameterName pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -96573,25 +96558,16 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetPointerIndexedvEXT")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetNamedRenderbufferParameterivEXT")]
             public static 
-            void GetPointerIndexed<T2>(OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, [InAttribute, OutAttribute] ref T2 data)
-                where T2 : struct
+            unsafe void GetNamedRenderbufferParameter(UInt32 renderbuffer, OpenTK.Graphics.OpenGL.RenderbufferParameterName pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetPointerIndexedvEXT((OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (IntPtr)data_ptr.AddrOfPinnedObject());
-                    data = (T2)data_ptr.Target;
-                }
-                finally
-                {
-                    data_ptr.Free();
-                }
+                Delegates.glGetNamedRenderbufferParameterivEXT((UInt32)renderbuffer, (OpenTK.Graphics.OpenGL.RenderbufferParameterName)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -96599,7 +96575,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetPointerIndexedvEXT")]
             public static 
-            void GetPointerIndexed<T2>(OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, [InAttribute, OutAttribute] T2[,,] data)
+            void GetPointerIndexed(OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, [OutAttribute] IntPtr data)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetPointerIndexedvEXT((OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (IntPtr)data);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetPointerIndexedvEXT")]
+            public static 
+            void GetPointerIndexed<T2>(OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, [InAttribute, OutAttribute] T2[] data)
                 where T2 : struct
             {
                 #if DEBUG
@@ -96645,7 +96635,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetPointerIndexedvEXT")]
             public static 
-            void GetPointerIndexed<T2>(OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, [InAttribute, OutAttribute] T2[] data)
+            void GetPointerIndexed<T2>(OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, [InAttribute, OutAttribute] T2[,,] data)
                 where T2 : struct
             {
                 #if DEBUG
@@ -96668,22 +96658,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetPointerIndexedvEXT")]
             public static 
-            void GetPointerIndexed(OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, [OutAttribute] IntPtr data)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetPointerIndexedvEXT((OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (IntPtr)data);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetPointerIndexedvEXT")]
-            public static 
-            void GetPointerIndexed<T2>(OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, [InAttribute, OutAttribute] ref T2 data)
+            void GetPointerIndexed<T2>(OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, [InAttribute, OutAttribute] ref T2 data)
                 where T2 : struct
             {
                 #if DEBUG
@@ -96708,7 +96683,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetPointerIndexedvEXT")]
             public static 
-            void GetPointerIndexed<T2>(OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, [InAttribute, OutAttribute] T2[,,] data)
+            void GetPointerIndexed(OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, [OutAttribute] IntPtr data)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetPointerIndexedvEXT((OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (IntPtr)data);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetPointerIndexedvEXT")]
+            public static 
+            void GetPointerIndexed<T2>(OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, [InAttribute, OutAttribute] T2[] data)
                 where T2 : struct
             {
                 #if DEBUG
@@ -96756,7 +96746,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetPointerIndexedvEXT")]
             public static 
-            void GetPointerIndexed<T2>(OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, [InAttribute, OutAttribute] T2[] data)
+            void GetPointerIndexed<T2>(OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, [InAttribute, OutAttribute] T2[,,] data)
                 where T2 : struct
             {
                 #if DEBUG
@@ -96780,36 +96770,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetPointerIndexedvEXT")]
             public static 
-            void GetPointerIndexed(OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, [OutAttribute] IntPtr data)
+            void GetPointerIndexed<T2>(OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, [InAttribute, OutAttribute] ref T2 data)
+                where T2 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetPointerIndexedvEXT((OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (IntPtr)data);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtVertexArray", Version = "1.0", EntryPoint = "glGetPointervEXT")]
-            public static 
-            void GetPointer<T1>(OpenTK.Graphics.OpenGL.GetPointervPName pname, [InAttribute, OutAttribute] ref T1 @params)
-                where T1 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle @params_ptr = GCHandle.Alloc(@params, GCHandleType.Pinned);
+                GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glGetPointervEXT((OpenTK.Graphics.OpenGL.GetPointervPName)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
-                    @params = (T1)@params_ptr.Target;
+                    Delegates.glGetPointerIndexedvEXT((OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (IntPtr)data_ptr.AddrOfPinnedObject());
+                    data = (T2)data_ptr.Target;
                 }
                 finally
                 {
-                    @params_ptr.Free();
+                    data_ptr.Free();
                 }
                 #if DEBUG
                 }
@@ -96818,7 +96794,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtVertexArray", Version = "1.0", EntryPoint = "glGetPointervEXT")]
             public static 
-            void GetPointer<T1>(OpenTK.Graphics.OpenGL.GetPointervPName pname, [InAttribute, OutAttribute] T1[,,] @params)
+            void GetPointer(OpenTK.Graphics.OpenGL.GetPointervPName pname, [OutAttribute] IntPtr @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetPointervEXT((OpenTK.Graphics.OpenGL.GetPointervPName)pname, (IntPtr)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtVertexArray", Version = "1.0", EntryPoint = "glGetPointervEXT")]
+            public static 
+            void GetPointer<T1>(OpenTK.Graphics.OpenGL.GetPointervPName pname, [InAttribute, OutAttribute] T1[] @params)
                 where T1 : struct
             {
                 #if DEBUG
@@ -96864,7 +96854,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtVertexArray", Version = "1.0", EntryPoint = "glGetPointervEXT")]
             public static 
-            void GetPointer<T1>(OpenTK.Graphics.OpenGL.GetPointervPName pname, [InAttribute, OutAttribute] T1[] @params)
+            void GetPointer<T1>(OpenTK.Graphics.OpenGL.GetPointervPName pname, [InAttribute, OutAttribute] T1[,,] @params)
                 where T1 : struct
             {
                 #if DEBUG
@@ -96887,28 +96877,23 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtVertexArray", Version = "1.0", EntryPoint = "glGetPointervEXT")]
             public static 
-            void GetPointer(OpenTK.Graphics.OpenGL.GetPointervPName pname, [OutAttribute] IntPtr @params)
+            void GetPointer<T1>(OpenTK.Graphics.OpenGL.GetPointervPName pname, [InAttribute, OutAttribute] ref T1 @params)
+                where T1 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetPointervEXT((OpenTK.Graphics.OpenGL.GetPointervPName)pname, (IntPtr)@params);
-                #if DEBUG
+                GCHandle @params_ptr = GCHandle.Alloc(@params, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetPointervEXT((OpenTK.Graphics.OpenGL.GetPointervPName)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
+                    @params = (T1)@params_ptr.Target;
                 }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtTimerQuery", Version = "1.5", EntryPoint = "glGetQueryObjecti64vEXT")]
-            public static 
-            unsafe void GetQueryObjecti64(Int32 id, OpenTK.Graphics.OpenGL.ExtTimerQuery pname, [OutAttribute] Int64* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                finally
                 {
-                #endif
-                Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtTimerQuery)pname, (Int64*)@params);
+                    @params_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -96958,7 +96943,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtTimerQuery", Version = "1.5", EntryPoint = "glGetQueryObjecti64vEXT")]
             public static 
-            unsafe void GetQueryObjecti64(UInt32 id, OpenTK.Graphics.OpenGL.ExtTimerQuery pname, [OutAttribute] Int64* @params)
+            unsafe void GetQueryObjecti64(Int32 id, OpenTK.Graphics.OpenGL.ExtTimerQuery pname, [OutAttribute] Int64* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -97014,15 +96999,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtTimerQuery", Version = "1.5", EntryPoint = "glGetQueryObjectui64vEXT")]
+            [AutoGenerated(Category = "ExtTimerQuery", Version = "1.5", EntryPoint = "glGetQueryObjecti64vEXT")]
             public static 
-            unsafe void GetQueryObjectui64(Int32 id, OpenTK.Graphics.OpenGL.ExtTimerQuery pname, [OutAttribute] Int64* @params)
+            unsafe void GetQueryObjecti64(UInt32 id, OpenTK.Graphics.OpenGL.ExtTimerQuery pname, [OutAttribute] Int64* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetQueryObjectui64vEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtTimerQuery)pname, (UInt64*)@params);
+                Delegates.glGetQueryObjecti64vEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtTimerQuery)pname, (Int64*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -97072,29 +97057,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtTimerQuery", Version = "1.5", EntryPoint = "glGetQueryObjectui64vEXT")]
             public static 
-            void GetQueryObjectui64(UInt32 id, OpenTK.Graphics.OpenGL.ExtTimerQuery pname, [OutAttribute] out UInt64 @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt64* @params_ptr = &@params)
-                    {
-                        Delegates.glGetQueryObjectui64vEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtTimerQuery)pname, (UInt64*)@params_ptr);
-                        @params = *@params_ptr;
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtTimerQuery", Version = "1.5", EntryPoint = "glGetQueryObjectui64vEXT")]
-            public static 
-            unsafe void GetQueryObjectui64(UInt32 id, OpenTK.Graphics.OpenGL.ExtTimerQuery pname, [OutAttribute] UInt64* @params)
+            unsafe void GetQueryObjectui64(Int32 id, OpenTK.Graphics.OpenGL.ExtTimerQuery pname, [OutAttribute] Int64* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -97128,15 +97091,37 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtFramebufferObject", Version = "1.2", EntryPoint = "glGetRenderbufferParameterivEXT")]
+            [AutoGenerated(Category = "ExtTimerQuery", Version = "1.5", EntryPoint = "glGetQueryObjectui64vEXT")]
             public static 
-            unsafe void GetRenderbufferParameter(OpenTK.Graphics.OpenGL.RenderbufferTarget target, OpenTK.Graphics.OpenGL.RenderbufferParameterName pname, [OutAttribute] Int32* @params)
+            void GetQueryObjectui64(UInt32 id, OpenTK.Graphics.OpenGL.ExtTimerQuery pname, [OutAttribute] out UInt64 @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetRenderbufferParameterivEXT((OpenTK.Graphics.OpenGL.RenderbufferTarget)target, (OpenTK.Graphics.OpenGL.RenderbufferParameterName)pname, (Int32*)@params);
+                unsafe
+                {
+                    fixed (UInt64* @params_ptr = &@params)
+                    {
+                        Delegates.glGetQueryObjectui64vEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtTimerQuery)pname, (UInt64*)@params_ptr);
+                        @params = *@params_ptr;
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtTimerQuery", Version = "1.5", EntryPoint = "glGetQueryObjectui64vEXT")]
+            public static 
+            unsafe void GetQueryObjectui64(UInt32 id, OpenTK.Graphics.OpenGL.ExtTimerQuery pname, [OutAttribute] UInt64* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetQueryObjectui64vEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtTimerQuery)pname, (UInt64*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -97183,6 +97168,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtFramebufferObject", Version = "1.2", EntryPoint = "glGetRenderbufferParameterivEXT")]
+            public static 
+            unsafe void GetRenderbufferParameter(OpenTK.Graphics.OpenGL.RenderbufferTarget target, OpenTK.Graphics.OpenGL.RenderbufferParameterName pname, [OutAttribute] Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetRenderbufferParameterivEXT((OpenTK.Graphics.OpenGL.RenderbufferTarget)target, (OpenTK.Graphics.OpenGL.RenderbufferParameterName)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             
         /// <summary>
         /// Get separable convolution filter kernel images
@@ -97219,8 +97219,284 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")]
             public static 
-            void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T3 row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
-                where T3 : struct
+            void GetSeparableFilter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [OutAttribute] IntPtr span)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetSeparableFilterEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column, (IntPtr)span);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Get separable convolution filter kernel images
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="row">
+        /// <para>
+        /// Pointer to storage for the row filter image.
+        /// </para>
+        /// </param>
+        /// <param name="column">
+        /// <para>
+        /// Pointer to storage for the column filter image.
+        /// </para>
+        /// </param>
+        /// <param name="span">
+        /// <para>
+        /// Pointer to storage for the span filter image (currently unused).
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")]
+            public static 
+            void GetSeparableFilter<T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [InAttribute, OutAttribute] T5[] span)
+                where T5 : struct
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetSeparableFilterEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column, (IntPtr)span_ptr.AddrOfPinnedObject());
+                }
+                finally
+                {
+                    span_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Get separable convolution filter kernel images
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="row">
+        /// <para>
+        /// Pointer to storage for the row filter image.
+        /// </para>
+        /// </param>
+        /// <param name="column">
+        /// <para>
+        /// Pointer to storage for the column filter image.
+        /// </para>
+        /// </param>
+        /// <param name="span">
+        /// <para>
+        /// Pointer to storage for the span filter image (currently unused).
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")]
+            public static 
+            void GetSeparableFilter<T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [InAttribute, OutAttribute] T5[,] span)
+                where T5 : struct
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetSeparableFilterEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column, (IntPtr)span_ptr.AddrOfPinnedObject());
+                }
+                finally
+                {
+                    span_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Get separable convolution filter kernel images
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="row">
+        /// <para>
+        /// Pointer to storage for the row filter image.
+        /// </para>
+        /// </param>
+        /// <param name="column">
+        /// <para>
+        /// Pointer to storage for the column filter image.
+        /// </para>
+        /// </param>
+        /// <param name="span">
+        /// <para>
+        /// Pointer to storage for the span filter image (currently unused).
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")]
+            public static 
+            void GetSeparableFilter<T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [InAttribute, OutAttribute] T5[,,] span)
+                where T5 : struct
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetSeparableFilterEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column, (IntPtr)span_ptr.AddrOfPinnedObject());
+                }
+                finally
+                {
+                    span_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Get separable convolution filter kernel images
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="row">
+        /// <para>
+        /// Pointer to storage for the row filter image.
+        /// </para>
+        /// </param>
+        /// <param name="column">
+        /// <para>
+        /// Pointer to storage for the column filter image.
+        /// </para>
+        /// </param>
+        /// <param name="span">
+        /// <para>
+        /// Pointer to storage for the span filter image (currently unused).
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")]
+            public static 
+            void GetSeparableFilter<T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [InAttribute, OutAttribute] ref T5 span)
+                where T5 : struct
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetSeparableFilterEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column, (IntPtr)span_ptr.AddrOfPinnedObject());
+                    span = (T5)span_ptr.Target;
+                }
+                finally
+                {
+                    span_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Get separable convolution filter kernel images
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="row">
+        /// <para>
+        /// Pointer to storage for the row filter image.
+        /// </para>
+        /// </param>
+        /// <param name="column">
+        /// <para>
+        /// Pointer to storage for the column filter image.
+        /// </para>
+        /// </param>
+        /// <param name="span">
+        /// <para>
+        /// Pointer to storage for the span filter image (currently unused).
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")]
+            public static 
+            void GetSeparableFilter<T4,T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[] column, [InAttribute, OutAttribute] T5[,,] span)
                 where T4 : struct
                 where T5 : struct
             {
@@ -97228,17 +97504,14 @@ namespace OpenTK.Graphics.OpenGL
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle row_ptr = GCHandle.Alloc(row, GCHandleType.Pinned);
                 GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
                 GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glGetSeparableFilterEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row_ptr.AddrOfPinnedObject(), (IntPtr)column_ptr.AddrOfPinnedObject(), (IntPtr)span_ptr.AddrOfPinnedObject());
-                    row = (T3)row_ptr.Target;
+                    Delegates.glGetSeparableFilterEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject(), (IntPtr)span_ptr.AddrOfPinnedObject());
                 }
                 finally
                 {
-                    row_ptr.Free();
                     column_ptr.Free();
                     span_ptr.Free();
                 }
@@ -97283,7 +97556,188 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")]
             public static 
-            void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[,,] row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
+            void GetSeparableFilter<T4,T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[,] column, [InAttribute, OutAttribute] T5[,,] span)
+                where T4 : struct
+                where T5 : struct
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
+                GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetSeparableFilterEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject(), (IntPtr)span_ptr.AddrOfPinnedObject());
+                }
+                finally
+                {
+                    column_ptr.Free();
+                    span_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Get separable convolution filter kernel images
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="row">
+        /// <para>
+        /// Pointer to storage for the row filter image.
+        /// </para>
+        /// </param>
+        /// <param name="column">
+        /// <para>
+        /// Pointer to storage for the column filter image.
+        /// </para>
+        /// </param>
+        /// <param name="span">
+        /// <para>
+        /// Pointer to storage for the span filter image (currently unused).
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")]
+            public static 
+            void GetSeparableFilter<T4,T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
+                where T4 : struct
+                where T5 : struct
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
+                GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetSeparableFilterEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject(), (IntPtr)span_ptr.AddrOfPinnedObject());
+                }
+                finally
+                {
+                    column_ptr.Free();
+                    span_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Get separable convolution filter kernel images
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="row">
+        /// <para>
+        /// Pointer to storage for the row filter image.
+        /// </para>
+        /// </param>
+        /// <param name="column">
+        /// <para>
+        /// Pointer to storage for the column filter image.
+        /// </para>
+        /// </param>
+        /// <param name="span">
+        /// <para>
+        /// Pointer to storage for the span filter image (currently unused).
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")]
+            public static 
+            void GetSeparableFilter<T4,T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] ref T4 column, [InAttribute, OutAttribute] T5[,,] span)
+                where T4 : struct
+                where T5 : struct
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
+                GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetSeparableFilterEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject(), (IntPtr)span_ptr.AddrOfPinnedObject());
+                    column = (T4)column_ptr.Target;
+                }
+                finally
+                {
+                    column_ptr.Free();
+                    span_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Get separable convolution filter kernel images
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="row">
+        /// <para>
+        /// Pointer to storage for the row filter image.
+        /// </para>
+        /// </param>
+        /// <param name="column">
+        /// <para>
+        /// Pointer to storage for the column filter image.
+        /// </para>
+        /// </param>
+        /// <param name="span">
+        /// <para>
+        /// Pointer to storage for the span filter image (currently unused).
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")]
+            public static 
+            void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[] row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
                 where T3 : struct
                 where T4 : struct
                 where T5 : struct
@@ -97409,7 +97863,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")]
             public static 
-            void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[] row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
+            void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[,,] row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
                 where T3 : struct
                 where T4 : struct
                 where T5 : struct
@@ -97472,7 +97926,8 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")]
             public static 
-            void GetSeparableFilter<T4,T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] ref T4 column, [InAttribute, OutAttribute] T5[,,] span)
+            void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T3 row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
+                where T3 : struct
                 where T4 : struct
                 where T5 : struct
             {
@@ -97480,15 +97935,17 @@ namespace OpenTK.Graphics.OpenGL
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
+                GCHandle row_ptr = GCHandle.Alloc(row, GCHandleType.Pinned);
                 GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
                 GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glGetSeparableFilterEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject(), (IntPtr)span_ptr.AddrOfPinnedObject());
-                    column = (T4)column_ptr.Target;
+                    Delegates.glGetSeparableFilterEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row_ptr.AddrOfPinnedObject(), (IntPtr)column_ptr.AddrOfPinnedObject(), (IntPtr)span_ptr.AddrOfPinnedObject());
+                    row = (T3)row_ptr.Target;
                 }
                 finally
                 {
+                    row_ptr.Free();
                     column_ptr.Free();
                     span_ptr.Free();
                 }
@@ -97497,478 +97954,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            
-        /// <summary>
-        /// Get separable convolution filter kernel images
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="row">
-        /// <para>
-        /// Pointer to storage for the row filter image.
-        /// </para>
-        /// </param>
-        /// <param name="column">
-        /// <para>
-        /// Pointer to storage for the column filter image.
-        /// </para>
-        /// </param>
-        /// <param name="span">
-        /// <para>
-        /// Pointer to storage for the span filter image (currently unused).
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")]
-            public static 
-            void GetSeparableFilter<T4,T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
-                where T4 : struct
-                where T5 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
-                GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetSeparableFilterEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject(), (IntPtr)span_ptr.AddrOfPinnedObject());
-                }
-                finally
-                {
-                    column_ptr.Free();
-                    span_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Get separable convolution filter kernel images
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="row">
-        /// <para>
-        /// Pointer to storage for the row filter image.
-        /// </para>
-        /// </param>
-        /// <param name="column">
-        /// <para>
-        /// Pointer to storage for the column filter image.
-        /// </para>
-        /// </param>
-        /// <param name="span">
-        /// <para>
-        /// Pointer to storage for the span filter image (currently unused).
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")]
-            public static 
-            void GetSeparableFilter<T4,T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[,] column, [InAttribute, OutAttribute] T5[,,] span)
-                where T4 : struct
-                where T5 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
-                GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetSeparableFilterEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject(), (IntPtr)span_ptr.AddrOfPinnedObject());
-                }
-                finally
-                {
-                    column_ptr.Free();
-                    span_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Get separable convolution filter kernel images
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="row">
-        /// <para>
-        /// Pointer to storage for the row filter image.
-        /// </para>
-        /// </param>
-        /// <param name="column">
-        /// <para>
-        /// Pointer to storage for the column filter image.
-        /// </para>
-        /// </param>
-        /// <param name="span">
-        /// <para>
-        /// Pointer to storage for the span filter image (currently unused).
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")]
-            public static 
-            void GetSeparableFilter<T4,T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[] column, [InAttribute, OutAttribute] T5[,,] span)
-                where T4 : struct
-                where T5 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
-                GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetSeparableFilterEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject(), (IntPtr)span_ptr.AddrOfPinnedObject());
-                }
-                finally
-                {
-                    column_ptr.Free();
-                    span_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Get separable convolution filter kernel images
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="row">
-        /// <para>
-        /// Pointer to storage for the row filter image.
-        /// </para>
-        /// </param>
-        /// <param name="column">
-        /// <para>
-        /// Pointer to storage for the column filter image.
-        /// </para>
-        /// </param>
-        /// <param name="span">
-        /// <para>
-        /// Pointer to storage for the span filter image (currently unused).
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")]
-            public static 
-            void GetSeparableFilter<T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [InAttribute, OutAttribute] ref T5 span)
-                where T5 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetSeparableFilterEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column, (IntPtr)span_ptr.AddrOfPinnedObject());
-                    span = (T5)span_ptr.Target;
-                }
-                finally
-                {
-                    span_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Get separable convolution filter kernel images
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="row">
-        /// <para>
-        /// Pointer to storage for the row filter image.
-        /// </para>
-        /// </param>
-        /// <param name="column">
-        /// <para>
-        /// Pointer to storage for the column filter image.
-        /// </para>
-        /// </param>
-        /// <param name="span">
-        /// <para>
-        /// Pointer to storage for the span filter image (currently unused).
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")]
-            public static 
-            void GetSeparableFilter<T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [InAttribute, OutAttribute] T5[,,] span)
-                where T5 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetSeparableFilterEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column, (IntPtr)span_ptr.AddrOfPinnedObject());
-                }
-                finally
-                {
-                    span_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Get separable convolution filter kernel images
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="row">
-        /// <para>
-        /// Pointer to storage for the row filter image.
-        /// </para>
-        /// </param>
-        /// <param name="column">
-        /// <para>
-        /// Pointer to storage for the column filter image.
-        /// </para>
-        /// </param>
-        /// <param name="span">
-        /// <para>
-        /// Pointer to storage for the span filter image (currently unused).
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")]
-            public static 
-            void GetSeparableFilter<T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [InAttribute, OutAttribute] T5[,] span)
-                where T5 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetSeparableFilterEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column, (IntPtr)span_ptr.AddrOfPinnedObject());
-                }
-                finally
-                {
-                    span_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Get separable convolution filter kernel images
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="row">
-        /// <para>
-        /// Pointer to storage for the row filter image.
-        /// </para>
-        /// </param>
-        /// <param name="column">
-        /// <para>
-        /// Pointer to storage for the column filter image.
-        /// </para>
-        /// </param>
-        /// <param name="span">
-        /// <para>
-        /// Pointer to storage for the span filter image (currently unused).
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")]
-            public static 
-            void GetSeparableFilter<T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [InAttribute, OutAttribute] T5[] span)
-                where T5 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle span_ptr = GCHandle.Alloc(span, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetSeparableFilterEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column, (IntPtr)span_ptr.AddrOfPinnedObject());
-                }
-                finally
-                {
-                    span_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Get separable convolution filter kernel images
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The separable filter to be retrieved. Must be GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Format of the output images. Must be one of GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR GL_RGBA, GL_BGRA, GL_LUMINANCE, or GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Data type of components in the output images. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="row">
-        /// <para>
-        /// Pointer to storage for the row filter image.
-        /// </para>
-        /// </param>
-        /// <param name="column">
-        /// <para>
-        /// Pointer to storage for the column filter image.
-        /// </para>
-        /// </param>
-        /// <param name="span">
-        /// <para>
-        /// Pointer to storage for the span filter image (currently unused).
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")]
-            public static 
-            void GetSeparableFilter(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [OutAttribute] IntPtr column, [OutAttribute] IntPtr span)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetSeparableFilterEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column, (IntPtr)span);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtTextureInteger", Version = "2.0", EntryPoint = "glGetTexParameterIivEXT")]
-            public static 
-            unsafe void GetTexParameterI(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetTexParameterIivEXT((OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtTextureInteger", Version = "2.0", EntryPoint = "glGetTexParameterIivEXT")]
             public static 
             void GetTexParameterI(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32[] @params)
@@ -98010,6 +97995,42 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtTextureInteger", Version = "2.0", EntryPoint = "glGetTexParameterIivEXT")]
+            public static 
+            unsafe void GetTexParameterI(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetTexParameterIivEXT((OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtTextureInteger", Version = "2.0", EntryPoint = "glGetTexParameterIuivEXT")]
+            public static 
+            void GetTexParameterI(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] UInt32[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* @params_ptr = @params)
+                    {
+                        Delegates.glGetTexParameterIuivEXT((OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (UInt32*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtTextureInteger", Version = "2.0", EntryPoint = "glGetTexParameterIuivEXT")]
             public static 
@@ -98047,22 +98068,15 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtTextureInteger", Version = "2.0", EntryPoint = "glGetTexParameterIuivEXT")]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureImageEXT")]
             public static 
-            void GetTexParameterI(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] UInt32[] @params)
+            void GetTextureImage(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr pixels)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                unsafe
-                {
-                    fixed (UInt32* @params_ptr = @params)
-                    {
-                        Delegates.glGetTexParameterIuivEXT((OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (UInt32*)@params_ptr);
-                    }
-                }
+                Delegates.glGetTextureImageEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
                 #if DEBUG
                 }
                 #endif
@@ -98070,31 +98084,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureImageEXT")]
             public static 
-            void GetTextureImage<T5>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T5 pixels)
-                where T5 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetTextureImageEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                    pixels = (T5)pixels_ptr.Target;
-                }
-                finally
-                {
-                    pixels_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureImageEXT")]
-            public static 
-            void GetTextureImage<T5>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[,,] pixels)
+            void GetTextureImage<T5>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[] pixels)
                 where T5 : struct
             {
                 #if DEBUG
@@ -98140,7 +98130,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureImageEXT")]
             public static 
-            void GetTextureImage<T5>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[] pixels)
+            void GetTextureImage<T5>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[,,] pixels)
                 where T5 : struct
             {
                 #if DEBUG
@@ -98163,22 +98153,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureImageEXT")]
             public static 
-            void GetTextureImage(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr pixels)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetTextureImageEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureImageEXT")]
-            public static 
-            void GetTextureImage<T5>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T5 pixels)
+            void GetTextureImage<T5>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T5 pixels)
                 where T5 : struct
             {
                 #if DEBUG
@@ -98203,7 +98178,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureImageEXT")]
             public static 
-            void GetTextureImage<T5>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[,,] pixels)
+            void GetTextureImage(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr pixels)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetTextureImageEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureImageEXT")]
+            public static 
+            void GetTextureImage<T5>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[] pixels)
                 where T5 : struct
             {
                 #if DEBUG
@@ -98251,7 +98241,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureImageEXT")]
             public static 
-            void GetTextureImage<T5>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[] pixels)
+            void GetTextureImage<T5>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[,,] pixels)
                 where T5 : struct
             {
                 #if DEBUG
@@ -98275,13 +98265,43 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureImageEXT")]
             public static 
-            void GetTextureImage(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr pixels)
+            void GetTextureImage<T5>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T5 pixels)
+                where T5 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetTextureImageEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+                GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetTextureImageEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    pixels = (T5)pixels_ptr.Target;
+                }
+                finally
+                {
+                    pixels_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureLevelParameterfvEXT")]
+            public static 
+            void GetTextureLevelParameter(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glGetTextureLevelParameterfvEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Single*)@params_ptr);
+                    }
+                }
                 #if DEBUG
                 }
                 #endif
@@ -98323,9 +98343,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureLevelParameterfvEXT")]
             public static 
-            void GetTextureLevelParameter(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Single[] @params)
+            void GetTextureLevelParameter(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -98380,42 +98401,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureLevelParameterfvEXT")]
-            public static 
-            void GetTextureLevelParameter(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetTextureLevelParameterfvEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureLevelParameterivEXT")]
-            public static 
-            unsafe void GetTextureLevelParameter(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetTextureLevelParameterivEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureLevelParameterivEXT")]
             public static 
             void GetTextureLevelParameter(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32[] @params)
@@ -98460,7 +98445,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureLevelParameterivEXT")]
             public static 
-            unsafe void GetTextureLevelParameter(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32* @params)
+            unsafe void GetTextureLevelParameter(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -98515,6 +98500,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureLevelParameterivEXT")]
+            public static 
+            unsafe void GetTextureLevelParameter(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetTextureLevelParameterivEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureParameterfvEXT")]
+            public static 
+            void GetTextureParameter(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glGetTextureParameterfvEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Single*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureParameterfvEXT")]
             public static 
             void GetTextureParameter(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] out Single @params)
@@ -98551,9 +98571,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureParameterfvEXT")]
             public static 
-            void GetTextureParameter(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Single[] @params)
+            void GetTextureParameter(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -98608,42 +98629,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureParameterfvEXT")]
-            public static 
-            void GetTextureParameter(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetTextureParameterfvEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureParameterIivEXT")]
-            public static 
-            unsafe void GetTextureParameterI(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetTextureParameterIivEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureParameterIivEXT")]
             public static 
             void GetTextureParameterI(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32[] @params)
@@ -98688,7 +98673,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureParameterIivEXT")]
             public static 
-            unsafe void GetTextureParameterI(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32* @params)
+            unsafe void GetTextureParameterI(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -98743,6 +98728,42 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureParameterIivEXT")]
+            public static 
+            unsafe void GetTextureParameterI(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetTextureParameterIivEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureParameterIuivEXT")]
+            public static 
+            void GetTextureParameterI(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] UInt32[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* @params_ptr = @params)
+                    {
+                        Delegates.glGetTextureParameterIuivEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (UInt32*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureParameterIuivEXT")]
             public static 
@@ -98780,42 +98801,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureParameterIuivEXT")]
-            public static 
-            void GetTextureParameterI(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] UInt32[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* @params_ptr = @params)
-                    {
-                        Delegates.glGetTextureParameterIuivEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (UInt32*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureParameterivEXT")]
-            public static 
-            unsafe void GetTextureParameter(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetTextureParameterivEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureParameterivEXT")]
             public static 
             void GetTextureParameter(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32[] @params)
@@ -98860,7 +98845,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureParameterivEXT")]
             public static 
-            unsafe void GetTextureParameter(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32* @params)
+            unsafe void GetTextureParameter(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -98916,15 +98901,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtTransformFeedback", Version = "2.0", EntryPoint = "glGetTransformFeedbackVaryingEXT")]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glGetTextureParameterivEXT")]
             public static 
-            unsafe void GetTransformFeedbackVarying(Int32 program, Int32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ExtTransformFeedback* type, [OutAttribute] StringBuilder name)
+            unsafe void GetTextureParameter(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.GetTextureParameter pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetTransformFeedbackVaryingEXT((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length, (Int32*)size, (OpenTK.Graphics.OpenGL.ExtTransformFeedback*)type, (StringBuilder)name);
+                Delegates.glGetTextureParameterivEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.GetTextureParameter)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -98958,7 +98943,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtTransformFeedback", Version = "2.0", EntryPoint = "glGetTransformFeedbackVaryingEXT")]
             public static 
-            unsafe void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ExtTransformFeedback* type, [OutAttribute] StringBuilder name)
+            unsafe void GetTransformFeedbackVarying(Int32 program, Int32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ExtTransformFeedback* type, [OutAttribute] StringBuilder name)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -98996,6 +98981,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtTransformFeedback", Version = "2.0", EntryPoint = "glGetTransformFeedbackVaryingEXT")]
+            public static 
+            unsafe void GetTransformFeedbackVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] Int32* length, [OutAttribute] Int32* size, [OutAttribute] OpenTK.Graphics.OpenGL.ExtTransformFeedback* type, [OutAttribute] StringBuilder name)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetTransformFeedbackVaryingEXT((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length, (Int32*)size, (OpenTK.Graphics.OpenGL.ExtTransformFeedback*)type, (StringBuilder)name);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtBindableUniform", Version = "2.0", EntryPoint = "glGetUniformBufferSizeEXT")]
             public static 
             Int32 GetUniformBufferSize(Int32 program, Int32 location)
@@ -99055,40 +99055,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Returns the value of a uniform variable
-        /// </summary>
-        /// <param name="program">
-        /// <para>
-        /// Specifies the program object to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the value of the specified uniform variable.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtGpuShader4", Version = "2.0", EntryPoint = "glGetUniformuivEXT")]
-            public static 
-            unsafe void GetUniform(Int32 program, Int32 location, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetUniformuivEXT((UInt32)program, (Int32)location, (UInt32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Returns the value of a uniform variable
         /// </summary>
@@ -99168,6 +99134,80 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Returns the value of a uniform variable
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// Specifies the program object to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the value of the specified uniform variable.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtGpuShader4", Version = "2.0", EntryPoint = "glGetUniformuivEXT")]
+            public static 
+            unsafe void GetUniform(Int32 program, Int32 location, [OutAttribute] Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetUniformuivEXT((UInt32)program, (Int32)location, (UInt32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Returns the value of a uniform variable
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// Specifies the program object to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the value of the specified uniform variable.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtGpuShader4", Version = "2.0", EntryPoint = "glGetUniformuivEXT")]
+            public static 
+            void GetUniform(UInt32 program, Int32 location, [OutAttribute] UInt32[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* @params_ptr = @params)
+                    {
+                        Delegates.glGetUniformuivEXT((UInt32)program, (Int32)location, (UInt32*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Returns the value of a uniform variable
         /// </summary>
@@ -99242,61 +99282,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            
-        /// <summary>
-        /// Returns the value of a uniform variable
-        /// </summary>
-        /// <param name="program">
-        /// <para>
-        /// Specifies the program object to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the value of the specified uniform variable.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtGpuShader4", Version = "2.0", EntryPoint = "glGetUniformuivEXT")]
-            public static 
-            void GetUniform(UInt32 program, Int32 location, [OutAttribute] UInt32[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* @params_ptr = @params)
-                    {
-                        Delegates.glGetUniformuivEXT((UInt32)program, (Int32)location, (UInt32*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetVariantBooleanvEXT")]
-            public static 
-            unsafe void GetVariantBoolean(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] bool* data)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetVariantBooleanvEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)value, (bool*)data);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetVariantBooleanvEXT")]
             public static 
             void GetVariantBoolean(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] bool[] data)
@@ -99341,7 +99326,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetVariantBooleanvEXT")]
             public static 
-            unsafe void GetVariantBoolean(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] bool* data)
+            unsafe void GetVariantBoolean(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] bool* data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -99396,6 +99381,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetVariantBooleanvEXT")]
+            public static 
+            unsafe void GetVariantBoolean(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] bool* data)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetVariantBooleanvEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)value, (bool*)data);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetVariantFloatvEXT")]
+            public static 
+            void GetVariantFloat(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] Single[] data)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* data_ptr = data)
+                    {
+                        Delegates.glGetVariantFloatvEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)value, (Single*)data_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetVariantFloatvEXT")]
             public static 
             void GetVariantFloat(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] out Single data)
@@ -99432,9 +99452,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetVariantFloatvEXT")]
             public static 
-            void GetVariantFloat(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] Single[] data)
+            void GetVariantFloat(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] Single[] data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -99489,42 +99510,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetVariantFloatvEXT")]
-            public static 
-            void GetVariantFloat(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] Single[] data)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* data_ptr = data)
-                    {
-                        Delegates.glGetVariantFloatvEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)value, (Single*)data_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetVariantIntegervEXT")]
-            public static 
-            unsafe void GetVariantInteger(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] Int32* data)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetVariantIntegervEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)value, (Int32*)data);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetVariantIntegervEXT")]
             public static 
             void GetVariantInteger(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] Int32[] data)
@@ -99569,7 +99554,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetVariantIntegervEXT")]
             public static 
-            unsafe void GetVariantInteger(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] Int32* data)
+            unsafe void GetVariantInteger(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] Int32* data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -99624,25 +99609,16 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetVariantPointervEXT")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetVariantIntegervEXT")]
             public static 
-            void GetVariantPointer<T2>(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [InAttribute, OutAttribute] ref T2 data)
-                where T2 : struct
+            unsafe void GetVariantInteger(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] Int32* data)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetVariantPointervEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)value, (IntPtr)data_ptr.AddrOfPinnedObject());
-                    data = (T2)data_ptr.Target;
-                }
-                finally
-                {
-                    data_ptr.Free();
-                }
+                Delegates.glGetVariantIntegervEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)value, (Int32*)data);
                 #if DEBUG
                 }
                 #endif
@@ -99650,7 +99626,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetVariantPointervEXT")]
             public static 
-            void GetVariantPointer<T2>(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [InAttribute, OutAttribute] T2[,,] data)
+            void GetVariantPointer(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] IntPtr data)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetVariantPointervEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)value, (IntPtr)data);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetVariantPointervEXT")]
+            public static 
+            void GetVariantPointer<T2>(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [InAttribute, OutAttribute] T2[] data)
                 where T2 : struct
             {
                 #if DEBUG
@@ -99696,7 +99686,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetVariantPointervEXT")]
             public static 
-            void GetVariantPointer<T2>(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [InAttribute, OutAttribute] T2[] data)
+            void GetVariantPointer<T2>(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [InAttribute, OutAttribute] T2[,,] data)
                 where T2 : struct
             {
                 #if DEBUG
@@ -99719,22 +99709,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetVariantPointervEXT")]
             public static 
-            void GetVariantPointer(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] IntPtr data)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetVariantPointervEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)value, (IntPtr)data);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetVariantPointervEXT")]
-            public static 
-            void GetVariantPointer<T2>(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [InAttribute, OutAttribute] ref T2 data)
+            void GetVariantPointer<T2>(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [InAttribute, OutAttribute] ref T2 data)
                 where T2 : struct
             {
                 #if DEBUG
@@ -99759,7 +99734,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetVariantPointervEXT")]
             public static 
-            void GetVariantPointer<T2>(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [InAttribute, OutAttribute] T2[,,] data)
+            void GetVariantPointer(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] IntPtr data)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetVariantPointervEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)value, (IntPtr)data);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetVariantPointervEXT")]
+            public static 
+            void GetVariantPointer<T2>(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [InAttribute, OutAttribute] T2[] data)
                 where T2 : struct
             {
                 #if DEBUG
@@ -99807,7 +99797,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetVariantPointervEXT")]
             public static 
-            void GetVariantPointer<T2>(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [InAttribute, OutAttribute] T2[] data)
+            void GetVariantPointer<T2>(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [InAttribute, OutAttribute] T2[,,] data)
                 where T2 : struct
             {
                 #if DEBUG
@@ -99831,28 +99821,23 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glGetVariantPointervEXT")]
             public static 
-            void GetVariantPointer(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [OutAttribute] IntPtr data)
+            void GetVariantPointer<T2>(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader value, [InAttribute, OutAttribute] ref T2 data)
+                where T2 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetVariantPointervEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)value, (IntPtr)data);
-                #if DEBUG
+                GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetVariantPointervEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)value, (IntPtr)data_ptr.AddrOfPinnedObject());
+                    data = (T2)data_ptr.Target;
                 }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glGetVertexAttribIivEXT")]
-            public static 
-            unsafe void GetVertexAttribI(Int32 index, OpenTK.Graphics.OpenGL.NvVertexProgram4 pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                finally
                 {
-                #endif
-                Delegates.glGetVertexAttribIivEXT((UInt32)index, (OpenTK.Graphics.OpenGL.NvVertexProgram4)pname, (Int32*)@params);
+                    data_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -99882,7 +99867,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glGetVertexAttribIivEXT")]
             public static 
-            unsafe void GetVertexAttribI(UInt32 index, OpenTK.Graphics.OpenGL.NvVertexProgram4 pname, [OutAttribute] Int32* @params)
+            unsafe void GetVertexAttribI(Int32 index, OpenTK.Graphics.OpenGL.NvVertexProgram4 pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -99916,6 +99901,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glGetVertexAttribIivEXT")]
+            public static 
+            unsafe void GetVertexAttribI(UInt32 index, OpenTK.Graphics.OpenGL.NvVertexProgram4 pname, [OutAttribute] Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetVertexAttribIivEXT((UInt32)index, (OpenTK.Graphics.OpenGL.NvVertexProgram4)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glGetVertexAttribIuivEXT")]
             public static 
@@ -100040,23 +100040,13 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtVertexArray", Version = "1.0", EntryPoint = "glIndexPointerEXT")]
             public static 
-            void IndexPointer<T3>(OpenTK.Graphics.OpenGL.IndexPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] ref T3 pointer)
-                where T3 : struct
+            void IndexPointer(OpenTK.Graphics.OpenGL.IndexPointerType type, Int32 stride, Int32 count, IntPtr pointer)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glIndexPointerEXT((OpenTK.Graphics.OpenGL.IndexPointerType)type, (Int32)stride, (Int32)count, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                    pointer = (T3)pointer_ptr.Target;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
+                Delegates.glIndexPointerEXT((OpenTK.Graphics.OpenGL.IndexPointerType)type, (Int32)stride, (Int32)count, (IntPtr)pointer);
                 #if DEBUG
                 }
                 #endif
@@ -100083,7 +100073,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtVertexArray", Version = "1.0", EntryPoint = "glIndexPointerEXT")]
             public static 
-            void IndexPointer<T3>(OpenTK.Graphics.OpenGL.IndexPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] T3[,,] pointer)
+            void IndexPointer<T3>(OpenTK.Graphics.OpenGL.IndexPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] T3[] pointer)
                 where T3 : struct
             {
                 #if DEBUG
@@ -100167,7 +100157,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtVertexArray", Version = "1.0", EntryPoint = "glIndexPointerEXT")]
             public static 
-            void IndexPointer<T3>(OpenTK.Graphics.OpenGL.IndexPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] T3[] pointer)
+            void IndexPointer<T3>(OpenTK.Graphics.OpenGL.IndexPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] T3[,,] pointer)
                 where T3 : struct
             {
                 #if DEBUG
@@ -100209,13 +100199,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtVertexArray", Version = "1.0", EntryPoint = "glIndexPointerEXT")]
             public static 
-            void IndexPointer(OpenTK.Graphics.OpenGL.IndexPointerType type, Int32 stride, Int32 count, IntPtr pointer)
+            void IndexPointer<T3>(OpenTK.Graphics.OpenGL.IndexPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] ref T3 pointer)
+                where T3 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glIndexPointerEXT((OpenTK.Graphics.OpenGL.IndexPointerType)type, (Int32)stride, (Int32)count, (IntPtr)pointer);
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glIndexPointerEXT((OpenTK.Graphics.OpenGL.IndexPointerType)type, (Int32)stride, (Int32)count, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    pointer = (T3)pointer_ptr.Target;
+                }
+                finally
+                {
+                    pointer_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -100471,21 +100471,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMatrixLoaddEXT")]
-            public static 
-            unsafe void MatrixLoad(OpenTK.Graphics.OpenGL.MatrixMode mode, Double* m)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMatrixLoaddEXT((OpenTK.Graphics.OpenGL.MatrixMode)mode, (Double*)m);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMatrixLoaddEXT")]
             public static 
             void MatrixLoad(OpenTK.Graphics.OpenGL.MatrixMode mode, Double[] m)
@@ -100526,6 +100511,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMatrixLoaddEXT")]
+            public static 
+            unsafe void MatrixLoad(OpenTK.Graphics.OpenGL.MatrixMode mode, Double* m)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMatrixLoaddEXT((OpenTK.Graphics.OpenGL.MatrixMode)mode, (Double*)m);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMatrixLoadfEXT")]
+            public static 
+            void MatrixLoad(OpenTK.Graphics.OpenGL.MatrixMode mode, Single[] m)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* m_ptr = m)
+                    {
+                        Delegates.glMatrixLoadfEXT((OpenTK.Graphics.OpenGL.MatrixMode)mode, (Single*)m_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMatrixLoadfEXT")]
             public static 
             void MatrixLoad(OpenTK.Graphics.OpenGL.MatrixMode mode, ref Single m)
@@ -100561,26 +100581,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMatrixLoadfEXT")]
-            public static 
-            void MatrixLoad(OpenTK.Graphics.OpenGL.MatrixMode mode, Single[] m)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* m_ptr = m)
-                    {
-                        Delegates.glMatrixLoadfEXT((OpenTK.Graphics.OpenGL.MatrixMode)mode, (Single*)m_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMatrixLoadIdentityEXT")]
             public static 
             void MatrixLoadIdentity(OpenTK.Graphics.OpenGL.MatrixMode mode)
@@ -100595,21 +100595,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMatrixLoadTransposedEXT")]
-            public static 
-            unsafe void MatrixLoadTranspose(OpenTK.Graphics.OpenGL.MatrixMode mode, Double* m)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMatrixLoadTransposedEXT((OpenTK.Graphics.OpenGL.MatrixMode)mode, (Double*)m);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMatrixLoadTransposedEXT")]
             public static 
             void MatrixLoadTranspose(OpenTK.Graphics.OpenGL.MatrixMode mode, Double[] m)
@@ -100650,6 +100635,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMatrixLoadTransposedEXT")]
+            public static 
+            unsafe void MatrixLoadTranspose(OpenTK.Graphics.OpenGL.MatrixMode mode, Double* m)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMatrixLoadTransposedEXT((OpenTK.Graphics.OpenGL.MatrixMode)mode, (Double*)m);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMatrixLoadTransposefEXT")]
+            public static 
+            void MatrixLoadTranspose(OpenTK.Graphics.OpenGL.MatrixMode mode, Single[] m)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* m_ptr = m)
+                    {
+                        Delegates.glMatrixLoadTransposefEXT((OpenTK.Graphics.OpenGL.MatrixMode)mode, (Single*)m_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMatrixLoadTransposefEXT")]
             public static 
             void MatrixLoadTranspose(OpenTK.Graphics.OpenGL.MatrixMode mode, ref Single m)
@@ -100685,41 +100705,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMatrixLoadTransposefEXT")]
-            public static 
-            void MatrixLoadTranspose(OpenTK.Graphics.OpenGL.MatrixMode mode, Single[] m)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* m_ptr = m)
-                    {
-                        Delegates.glMatrixLoadTransposefEXT((OpenTK.Graphics.OpenGL.MatrixMode)mode, (Single*)m_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMatrixMultdEXT")]
-            public static 
-            unsafe void MatrixMult(OpenTK.Graphics.OpenGL.MatrixMode mode, Double* m)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMatrixMultdEXT((OpenTK.Graphics.OpenGL.MatrixMode)mode, (Double*)m);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMatrixMultdEXT")]
             public static 
             void MatrixMult(OpenTK.Graphics.OpenGL.MatrixMode mode, Double[] m)
@@ -100760,6 +100745,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMatrixMultdEXT")]
+            public static 
+            unsafe void MatrixMult(OpenTK.Graphics.OpenGL.MatrixMode mode, Double* m)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMatrixMultdEXT((OpenTK.Graphics.OpenGL.MatrixMode)mode, (Double*)m);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMatrixMultfEXT")]
+            public static 
+            void MatrixMult(OpenTK.Graphics.OpenGL.MatrixMode mode, Single[] m)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* m_ptr = m)
+                    {
+                        Delegates.glMatrixMultfEXT((OpenTK.Graphics.OpenGL.MatrixMode)mode, (Single*)m_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMatrixMultfEXT")]
             public static 
             void MatrixMult(OpenTK.Graphics.OpenGL.MatrixMode mode, ref Single m)
@@ -100795,41 +100815,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMatrixMultfEXT")]
-            public static 
-            void MatrixMult(OpenTK.Graphics.OpenGL.MatrixMode mode, Single[] m)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* m_ptr = m)
-                    {
-                        Delegates.glMatrixMultfEXT((OpenTK.Graphics.OpenGL.MatrixMode)mode, (Single*)m_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMatrixMultTransposedEXT")]
-            public static 
-            unsafe void MatrixMultTranspose(OpenTK.Graphics.OpenGL.MatrixMode mode, Double* m)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMatrixMultTransposedEXT((OpenTK.Graphics.OpenGL.MatrixMode)mode, (Double*)m);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMatrixMultTransposedEXT")]
             public static 
             void MatrixMultTranspose(OpenTK.Graphics.OpenGL.MatrixMode mode, Double[] m)
@@ -100870,6 +100855,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMatrixMultTransposedEXT")]
+            public static 
+            unsafe void MatrixMultTranspose(OpenTK.Graphics.OpenGL.MatrixMode mode, Double* m)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMatrixMultTransposedEXT((OpenTK.Graphics.OpenGL.MatrixMode)mode, (Double*)m);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMatrixMultTransposefEXT")]
+            public static 
+            void MatrixMultTranspose(OpenTK.Graphics.OpenGL.MatrixMode mode, Single[] m)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* m_ptr = m)
+                    {
+                        Delegates.glMatrixMultTransposefEXT((OpenTK.Graphics.OpenGL.MatrixMode)mode, (Single*)m_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMatrixMultTransposefEXT")]
             public static 
             void MatrixMultTranspose(OpenTK.Graphics.OpenGL.MatrixMode mode, ref Single m)
@@ -100905,26 +100925,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMatrixMultTransposefEXT")]
-            public static 
-            void MatrixMultTranspose(OpenTK.Graphics.OpenGL.MatrixMode mode, Single[] m)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* m_ptr = m)
-                    {
-                        Delegates.glMatrixMultTransposefEXT((OpenTK.Graphics.OpenGL.MatrixMode)mode, (Single*)m_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMatrixOrthoEXT")]
             public static 
             void MatrixOrtho(OpenTK.Graphics.OpenGL.MatrixMode mode, Double left, Double right, Double bottom, Double top, Double zNear, Double zFar)
@@ -101085,45 +101085,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Render multiple sets of primitives from array data
-        /// </summary>
-        /// <param name="mode">
-        /// <para>
-        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="first">
-        /// <para>
-        /// Points to an array of starting indices in the enabled arrays.
-        /// </para>
-        /// </param>
-        /// <param name="count">
-        /// <para>
-        /// Points to an array of the number of indices to be rendered.
-        /// </para>
-        /// </param>
-        /// <param name="primcount">
-        /// <para>
-        /// Specifies the size of the first and count
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtMultiDrawArrays", Version = "1.1", EntryPoint = "glMultiDrawArraysEXT")]
-            public static 
-            unsafe void MultiDrawArrays(OpenTK.Graphics.OpenGL.BeginMode mode, [OutAttribute] Int32* first, [OutAttribute] Int32* count, Int32 primcount)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMultiDrawArraysEXT((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)first, (Int32*)count, (Int32)primcount);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Render multiple sets of primitives from array data
         /// </summary>
@@ -101217,256 +101178,38 @@ namespace OpenTK.Graphics.OpenGL
 
             
         /// <summary>
-        /// Render multiple sets of primitives by specifying indices of array data elements
+        /// Render multiple sets of primitives from array data
         /// </summary>
         /// <param name="mode">
         /// <para>
         /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
         /// </para>
         /// </param>
+        /// <param name="first">
+        /// <para>
+        /// Points to an array of starting indices in the enabled arrays.
+        /// </para>
+        /// </param>
         /// <param name="count">
         /// <para>
-        /// Points to an array of the elements counts.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
-        /// </para>
-        /// </param>
-        /// <param name="indices">
-        /// <para>
-        /// Specifies a pointer to the location where the indices are stored.
+        /// Points to an array of the number of indices to be rendered.
         /// </para>
         /// </param>
         /// <param name="primcount">
         /// <para>
-        /// Specifies the size of the count array.
+        /// Specifies the size of the first and count
         /// </para>
         /// </param>
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtMultiDrawArrays", Version = "1.1", EntryPoint = "glMultiDrawElementsEXT")]
+            [AutoGenerated(Category = "ExtMultiDrawArrays", Version = "1.1", EntryPoint = "glMultiDrawArraysEXT")]
             public static 
-            unsafe void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount)
-                where T3 : struct
+            unsafe void MultiDrawArrays(OpenTK.Graphics.OpenGL.BeginMode mode, [OutAttribute] Int32* first, [OutAttribute] Int32* count, Int32 primcount)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glMultiDrawElementsEXT((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
-                    indices = (T3)indices_ptr.Target;
-                }
-                finally
-                {
-                    indices_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Render multiple sets of primitives by specifying indices of array data elements
-        /// </summary>
-        /// <param name="mode">
-        /// <para>
-        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="count">
-        /// <para>
-        /// Points to an array of the elements counts.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
-        /// </para>
-        /// </param>
-        /// <param name="indices">
-        /// <para>
-        /// Specifies a pointer to the location where the indices are stored.
-        /// </para>
-        /// </param>
-        /// <param name="primcount">
-        /// <para>
-        /// Specifies the size of the count array.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtMultiDrawArrays", Version = "1.1", EntryPoint = "glMultiDrawElementsEXT")]
-            public static 
-            unsafe void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount)
-                where T3 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glMultiDrawElementsEXT((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
-                }
-                finally
-                {
-                    indices_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Render multiple sets of primitives by specifying indices of array data elements
-        /// </summary>
-        /// <param name="mode">
-        /// <para>
-        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="count">
-        /// <para>
-        /// Points to an array of the elements counts.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
-        /// </para>
-        /// </param>
-        /// <param name="indices">
-        /// <para>
-        /// Specifies a pointer to the location where the indices are stored.
-        /// </para>
-        /// </param>
-        /// <param name="primcount">
-        /// <para>
-        /// Specifies the size of the count array.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtMultiDrawArrays", Version = "1.1", EntryPoint = "glMultiDrawElementsEXT")]
-            public static 
-            unsafe void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,] indices, Int32 primcount)
-                where T3 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glMultiDrawElementsEXT((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
-                }
-                finally
-                {
-                    indices_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Render multiple sets of primitives by specifying indices of array data elements
-        /// </summary>
-        /// <param name="mode">
-        /// <para>
-        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="count">
-        /// <para>
-        /// Points to an array of the elements counts.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
-        /// </para>
-        /// </param>
-        /// <param name="indices">
-        /// <para>
-        /// Specifies a pointer to the location where the indices are stored.
-        /// </para>
-        /// </param>
-        /// <param name="primcount">
-        /// <para>
-        /// Specifies the size of the count array.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtMultiDrawArrays", Version = "1.1", EntryPoint = "glMultiDrawElementsEXT")]
-            public static 
-            unsafe void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount)
-                where T3 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glMultiDrawElementsEXT((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
-                }
-                finally
-                {
-                    indices_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Render multiple sets of primitives by specifying indices of array data elements
-        /// </summary>
-        /// <param name="mode">
-        /// <para>
-        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="count">
-        /// <para>
-        /// Points to an array of the elements counts.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
-        /// </para>
-        /// </param>
-        /// <param name="indices">
-        /// <para>
-        /// Specifies a pointer to the location where the indices are stored.
-        /// </para>
-        /// </param>
-        /// <param name="primcount">
-        /// <para>
-        /// Specifies the size of the count array.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtMultiDrawArrays", Version = "1.1", EntryPoint = "glMultiDrawElementsEXT")]
-            public static 
-            unsafe void MultiDrawElements(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMultiDrawElementsEXT((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount);
+                Delegates.glMultiDrawArraysEXT((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)first, (Int32*)count, (Int32)primcount);
                 #if DEBUG
                 }
                 #endif
@@ -101503,8 +101246,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtMultiDrawArrays", Version = "1.1", EntryPoint = "glMultiDrawElementsEXT")]
             public static 
-            void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount)
-                where T3 : struct
+            void MultiDrawElements(OpenTK.Graphics.OpenGL.BeginMode mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -101514,16 +101256,7 @@ namespace OpenTK.Graphics.OpenGL
                 {
                     fixed (Int32* count_ptr = count)
                     {
-                        GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
-                        try
-                        {
-                            Delegates.glMultiDrawElementsEXT((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count_ptr, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
-                            indices = (T3)indices_ptr.Target;
-                        }
-                        finally
-                        {
-                            indices_ptr.Free();
-                        }
+                        Delegates.glMultiDrawElementsEXT((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count_ptr, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount);
                     }
                 }
                 #if DEBUG
@@ -101562,7 +101295,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtMultiDrawArrays", Version = "1.1", EntryPoint = "glMultiDrawElementsEXT")]
             public static 
-            void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount)
+            void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount)
                 where T3 : struct
             {
                 #if DEBUG
@@ -101678,7 +101411,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtMultiDrawArrays", Version = "1.1", EntryPoint = "glMultiDrawElementsEXT")]
             public static 
-            void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount)
+            void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount)
                 where T3 : struct
             {
                 #if DEBUG
@@ -101736,56 +101469,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtMultiDrawArrays", Version = "1.1", EntryPoint = "glMultiDrawElementsEXT")]
             public static 
-            void MultiDrawElements(OpenTK.Graphics.OpenGL.BeginMode mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Int32* count_ptr = count)
-                    {
-                        Delegates.glMultiDrawElementsEXT((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count_ptr, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Render multiple sets of primitives by specifying indices of array data elements
-        /// </summary>
-        /// <param name="mode">
-        /// <para>
-        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="count">
-        /// <para>
-        /// Points to an array of the elements counts.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
-        /// </para>
-        /// </param>
-        /// <param name="indices">
-        /// <para>
-        /// Specifies a pointer to the location where the indices are stored.
-        /// </para>
-        /// </param>
-        /// <param name="primcount">
-        /// <para>
-        /// Specifies the size of the count array.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtMultiDrawArrays", Version = "1.1", EntryPoint = "glMultiDrawElementsEXT")]
-            public static 
-            void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount)
+            void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount)
                 where T3 : struct
             {
                 #if DEBUG
@@ -101794,7 +101478,7 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
                 unsafe
                 {
-                    fixed (Int32* count_ptr = &count)
+                    fixed (Int32* count_ptr = count)
                     {
                         GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
                         try
@@ -101844,7 +101528,56 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtMultiDrawArrays", Version = "1.1", EntryPoint = "glMultiDrawElementsEXT")]
             public static 
-            void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount)
+            void MultiDrawElements(OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Int32* count_ptr = &count)
+                    {
+                        Delegates.glMultiDrawElementsEXT((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count_ptr, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Render multiple sets of primitives by specifying indices of array data elements
+        /// </summary>
+        /// <param name="mode">
+        /// <para>
+        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="count">
+        /// <para>
+        /// Points to an array of the elements counts.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
+        /// </para>
+        /// </param>
+        /// <param name="indices">
+        /// <para>
+        /// Specifies a pointer to the location where the indices are stored.
+        /// </para>
+        /// </param>
+        /// <param name="primcount">
+        /// <para>
+        /// Specifies the size of the count array.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtMultiDrawArrays", Version = "1.1", EntryPoint = "glMultiDrawElementsEXT")]
+            public static 
+            void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount)
                 where T3 : struct
             {
                 #if DEBUG
@@ -101960,7 +101693,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtMultiDrawArrays", Version = "1.1", EntryPoint = "glMultiDrawElementsEXT")]
             public static 
-            void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount)
+            void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount)
                 where T3 : struct
             {
                 #if DEBUG
@@ -102018,7 +101751,8 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtMultiDrawArrays", Version = "1.1", EntryPoint = "glMultiDrawElementsEXT")]
             public static 
-            void MultiDrawElements(OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount)
+            void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount)
+                where T3 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -102028,7 +101762,16 @@ namespace OpenTK.Graphics.OpenGL
                 {
                     fixed (Int32* count_ptr = &count)
                     {
-                        Delegates.glMultiDrawElementsEXT((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count_ptr, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount);
+                        GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
+                        try
+                        {
+                            Delegates.glMultiDrawElementsEXT((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count_ptr, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
+                            indices = (T3)indices_ptr.Target;
+                        }
+                        finally
+                        {
+                            indices_ptr.Free();
+                        }
                     }
                 }
                 #if DEBUG
@@ -102036,6 +101779,263 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            
+        /// <summary>
+        /// Render multiple sets of primitives by specifying indices of array data elements
+        /// </summary>
+        /// <param name="mode">
+        /// <para>
+        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="count">
+        /// <para>
+        /// Points to an array of the elements counts.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
+        /// </para>
+        /// </param>
+        /// <param name="indices">
+        /// <para>
+        /// Specifies a pointer to the location where the indices are stored.
+        /// </para>
+        /// </param>
+        /// <param name="primcount">
+        /// <para>
+        /// Specifies the size of the count array.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtMultiDrawArrays", Version = "1.1", EntryPoint = "glMultiDrawElementsEXT")]
+            public static 
+            unsafe void MultiDrawElements(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMultiDrawElementsEXT((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Render multiple sets of primitives by specifying indices of array data elements
+        /// </summary>
+        /// <param name="mode">
+        /// <para>
+        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="count">
+        /// <para>
+        /// Points to an array of the elements counts.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
+        /// </para>
+        /// </param>
+        /// <param name="indices">
+        /// <para>
+        /// Specifies a pointer to the location where the indices are stored.
+        /// </para>
+        /// </param>
+        /// <param name="primcount">
+        /// <para>
+        /// Specifies the size of the count array.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtMultiDrawArrays", Version = "1.1", EntryPoint = "glMultiDrawElementsEXT")]
+            public static 
+            unsafe void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount)
+                where T3 : struct
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glMultiDrawElementsEXT((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
+                }
+                finally
+                {
+                    indices_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Render multiple sets of primitives by specifying indices of array data elements
+        /// </summary>
+        /// <param name="mode">
+        /// <para>
+        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="count">
+        /// <para>
+        /// Points to an array of the elements counts.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
+        /// </para>
+        /// </param>
+        /// <param name="indices">
+        /// <para>
+        /// Specifies a pointer to the location where the indices are stored.
+        /// </para>
+        /// </param>
+        /// <param name="primcount">
+        /// <para>
+        /// Specifies the size of the count array.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtMultiDrawArrays", Version = "1.1", EntryPoint = "glMultiDrawElementsEXT")]
+            public static 
+            unsafe void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,] indices, Int32 primcount)
+                where T3 : struct
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glMultiDrawElementsEXT((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
+                }
+                finally
+                {
+                    indices_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Render multiple sets of primitives by specifying indices of array data elements
+        /// </summary>
+        /// <param name="mode">
+        /// <para>
+        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="count">
+        /// <para>
+        /// Points to an array of the elements counts.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
+        /// </para>
+        /// </param>
+        /// <param name="indices">
+        /// <para>
+        /// Specifies a pointer to the location where the indices are stored.
+        /// </para>
+        /// </param>
+        /// <param name="primcount">
+        /// <para>
+        /// Specifies the size of the count array.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtMultiDrawArrays", Version = "1.1", EntryPoint = "glMultiDrawElementsEXT")]
+            public static 
+            unsafe void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount)
+                where T3 : struct
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glMultiDrawElementsEXT((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
+                }
+                finally
+                {
+                    indices_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Render multiple sets of primitives by specifying indices of array data elements
+        /// </summary>
+        /// <param name="mode">
+        /// <para>
+        /// Specifies what kind of primitives to render. Symbolic constants GL_POINTS, GL_LINE_STRIP, GL_LINE_LOOP, GL_LINES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN, GL_TRIANGLES, GL_QUAD_STRIP, GL_QUADS, and GL_POLYGON are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="count">
+        /// <para>
+        /// Points to an array of the elements counts.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the type of the values in indices. Must be one of GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT, or GL_UNSIGNED_INT.
+        /// </para>
+        /// </param>
+        /// <param name="indices">
+        /// <para>
+        /// Specifies a pointer to the location where the indices are stored.
+        /// </para>
+        /// </param>
+        /// <param name="primcount">
+        /// <para>
+        /// Specifies the size of the count array.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtMultiDrawArrays", Version = "1.1", EntryPoint = "glMultiDrawElementsEXT")]
+            public static 
+            unsafe void MultiDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount)
+                where T3 : struct
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glMultiDrawElementsEXT((OpenTK.Graphics.OpenGL.BeginMode)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount);
+                    indices = (T3)indices_ptr.Target;
+                }
+                finally
+                {
+                    indices_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexBufferEXT")]
             public static 
             void MultiTexBuffer(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 buffer)
@@ -102067,23 +102067,13 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexCoordPointerEXT")]
             public static 
-            void MultiTexCoordPointer<T4>(OpenTK.Graphics.OpenGL.TextureUnit texunit, Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T4 pointer)
-                where T4 : struct
+            void MultiTexCoordPointer(OpenTK.Graphics.OpenGL.TextureUnit texunit, Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, IntPtr pointer)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glMultiTexCoordPointerEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (Int32)size, (OpenTK.Graphics.OpenGL.TexCoordPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                    pointer = (T4)pointer_ptr.Target;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
+                Delegates.glMultiTexCoordPointerEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (Int32)size, (OpenTK.Graphics.OpenGL.TexCoordPointerType)type, (Int32)stride, (IntPtr)pointer);
                 #if DEBUG
                 }
                 #endif
@@ -102091,7 +102081,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexCoordPointerEXT")]
             public static 
-            void MultiTexCoordPointer<T4>(OpenTK.Graphics.OpenGL.TextureUnit texunit, Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, [InAttribute, OutAttribute] T4[,,] pointer)
+            void MultiTexCoordPointer<T4>(OpenTK.Graphics.OpenGL.TextureUnit texunit, Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, [InAttribute, OutAttribute] T4[] pointer)
                 where T4 : struct
             {
                 #if DEBUG
@@ -102137,7 +102127,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexCoordPointerEXT")]
             public static 
-            void MultiTexCoordPointer<T4>(OpenTK.Graphics.OpenGL.TextureUnit texunit, Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, [InAttribute, OutAttribute] T4[] pointer)
+            void MultiTexCoordPointer<T4>(OpenTK.Graphics.OpenGL.TextureUnit texunit, Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, [InAttribute, OutAttribute] T4[,,] pointer)
                 where T4 : struct
             {
                 #if DEBUG
@@ -102160,13 +102150,23 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexCoordPointerEXT")]
             public static 
-            void MultiTexCoordPointer(OpenTK.Graphics.OpenGL.TextureUnit texunit, Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, IntPtr pointer)
+            void MultiTexCoordPointer<T4>(OpenTK.Graphics.OpenGL.TextureUnit texunit, Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T4 pointer)
+                where T4 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glMultiTexCoordPointerEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (Int32)size, (OpenTK.Graphics.OpenGL.TexCoordPointerType)type, (Int32)stride, (IntPtr)pointer);
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glMultiTexCoordPointerEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (Int32)size, (OpenTK.Graphics.OpenGL.TexCoordPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    pointer = (T4)pointer_ptr.Target;
+                }
+                finally
+                {
+                    pointer_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -102186,21 +102186,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexEnvfvEXT")]
-            public static 
-            unsafe void MultiTexEnv(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureEnvTarget target, OpenTK.Graphics.OpenGL.TextureEnvParameter pname, Single* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMultiTexEnvfvEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureEnvTarget)target, (OpenTK.Graphics.OpenGL.TextureEnvParameter)pname, (Single*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexEnvfvEXT")]
             public static 
             void MultiTexEnv(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureEnvTarget target, OpenTK.Graphics.OpenGL.TextureEnvParameter pname, Single[] @params)
@@ -102221,6 +102206,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexEnvfvEXT")]
+            public static 
+            unsafe void MultiTexEnv(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureEnvTarget target, OpenTK.Graphics.OpenGL.TextureEnvParameter pname, Single* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMultiTexEnvfvEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureEnvTarget)target, (OpenTK.Graphics.OpenGL.TextureEnvParameter)pname, (Single*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexEnviEXT")]
             public static 
             void MultiTexEnv(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureEnvTarget target, OpenTK.Graphics.OpenGL.TextureEnvParameter pname, Int32 param)
@@ -102235,21 +102235,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexEnvivEXT")]
-            public static 
-            unsafe void MultiTexEnv(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureEnvTarget target, OpenTK.Graphics.OpenGL.TextureEnvParameter pname, Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMultiTexEnvivEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureEnvTarget)target, (OpenTK.Graphics.OpenGL.TextureEnvParameter)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexEnvivEXT")]
             public static 
             void MultiTexEnv(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureEnvTarget target, OpenTK.Graphics.OpenGL.TextureEnvParameter pname, Int32[] @params)
@@ -102270,6 +102255,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexEnvivEXT")]
+            public static 
+            unsafe void MultiTexEnv(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureEnvTarget target, OpenTK.Graphics.OpenGL.TextureEnvParameter pname, Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMultiTexEnvivEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureEnvTarget)target, (OpenTK.Graphics.OpenGL.TextureEnvParameter)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexGendEXT")]
             public static 
             void MultiTexGend(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, Double param)
@@ -102284,21 +102284,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexGendvEXT")]
-            public static 
-            unsafe void MultiTexGen(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, Double* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMultiTexGendvEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Double*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexGendvEXT")]
             public static 
             void MultiTexGen(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, Double[] @params)
@@ -102339,6 +102324,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexGendvEXT")]
+            public static 
+            unsafe void MultiTexGen(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, Double* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMultiTexGendvEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Double*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexGenfEXT")]
             public static 
             void MultiTexGen(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, Single param)
@@ -102353,21 +102353,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexGenfvEXT")]
-            public static 
-            unsafe void MultiTexGen(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, Single* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMultiTexGenfvEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Single*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexGenfvEXT")]
             public static 
             void MultiTexGen(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, Single[] @params)
@@ -102388,6 +102373,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexGenfvEXT")]
+            public static 
+            unsafe void MultiTexGen(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, Single* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMultiTexGenfvEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Single*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexGeniEXT")]
             public static 
             void MultiTexGen(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, Int32 param)
@@ -102402,21 +102402,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexGenivEXT")]
-            public static 
-            unsafe void MultiTexGen(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMultiTexGenivEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexGenivEXT")]
             public static 
             void MultiTexGen(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, Int32[] @params)
@@ -102437,25 +102422,16 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexImage1DEXT")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexGenivEXT")]
             public static 
-            void MultiTexImage1D<T8>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T8 pixels)
-                where T8 : struct
+            unsafe void MultiTexGen(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureCoordName coord, OpenTK.Graphics.OpenGL.TextureGenParameter pname, Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glMultiTexImage1DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                    pixels = (T8)pixels_ptr.Target;
-                }
-                finally
-                {
-                    pixels_ptr.Free();
-                }
+                Delegates.glMultiTexGenivEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureCoordName)coord, (OpenTK.Graphics.OpenGL.TextureGenParameter)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -102463,7 +102439,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexImage1DEXT")]
             public static 
-            void MultiTexImage1D<T8>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T8[,,] pixels)
+            void MultiTexImage1D(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMultiTexImage1DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexImage1DEXT")]
+            public static 
+            void MultiTexImage1D<T8>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T8[] pixels)
                 where T8 : struct
             {
                 #if DEBUG
@@ -102509,7 +102499,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexImage1DEXT")]
             public static 
-            void MultiTexImage1D<T8>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T8[] pixels)
+            void MultiTexImage1D<T8>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T8[,,] pixels)
                 where T8 : struct
             {
                 #if DEBUG
@@ -102532,22 +102522,8 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexImage1DEXT")]
             public static 
-            void MultiTexImage1D(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMultiTexImage1DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexImage2DEXT")]
-            public static 
-            void MultiTexImage2D<T9>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T9 pixels)
-                where T9 : struct
+            void MultiTexImage1D<T8>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T8 pixels)
+                where T8 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -102556,8 +102532,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glMultiTexImage2DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                    pixels = (T9)pixels_ptr.Target;
+                    Delegates.glMultiTexImage1DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    pixels = (T8)pixels_ptr.Target;
                 }
                 finally
                 {
@@ -102570,7 +102546,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexImage2DEXT")]
             public static 
-            void MultiTexImage2D<T9>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[,,] pixels)
+            void MultiTexImage2D(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMultiTexImage2DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexImage2DEXT")]
+            public static 
+            void MultiTexImage2D<T9>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[] pixels)
                 where T9 : struct
             {
                 #if DEBUG
@@ -102616,7 +102606,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexImage2DEXT")]
             public static 
-            void MultiTexImage2D<T9>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[] pixels)
+            void MultiTexImage2D<T9>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[,,] pixels)
                 where T9 : struct
             {
                 #if DEBUG
@@ -102639,22 +102629,8 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexImage2DEXT")]
             public static 
-            void MultiTexImage2D(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMultiTexImage2DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexImage3DEXT")]
-            public static 
-            void MultiTexImage3D<T10>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T10 pixels)
-                where T10 : struct
+            void MultiTexImage2D<T9>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T9 pixels)
+                where T9 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -102663,8 +102639,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glMultiTexImage3DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                    pixels = (T10)pixels_ptr.Target;
+                    Delegates.glMultiTexImage2DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    pixels = (T9)pixels_ptr.Target;
                 }
                 finally
                 {
@@ -102677,7 +102653,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexImage3DEXT")]
             public static 
-            void MultiTexImage3D<T10>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T10[,,] pixels)
+            void MultiTexImage3D(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMultiTexImage3DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexImage3DEXT")]
+            public static 
+            void MultiTexImage3D<T10>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T10[] pixels)
                 where T10 : struct
             {
                 #if DEBUG
@@ -102723,7 +102713,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexImage3DEXT")]
             public static 
-            void MultiTexImage3D<T10>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T10[] pixels)
+            void MultiTexImage3D<T10>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T10[,,] pixels)
                 where T10 : struct
             {
                 #if DEBUG
@@ -102746,13 +102736,23 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexImage3DEXT")]
             public static 
-            void MultiTexImage3D(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+            void MultiTexImage3D<T10>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T10 pixels)
+                where T10 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glMultiTexImage3DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+                GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glMultiTexImage3DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    pixels = (T10)pixels_ptr.Target;
+                }
+                finally
+                {
+                    pixels_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -102772,21 +102772,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexParameterfvEXT")]
-            public static 
-            unsafe void MultiTexParameter(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Single* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMultiTexParameterfvEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.TextureParameterName)pname, (Single*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexParameterfvEXT")]
             public static 
             void MultiTexParameter(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Single[] @params)
@@ -102807,6 +102792,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexParameterfvEXT")]
+            public static 
+            unsafe void MultiTexParameter(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Single* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMultiTexParameterfvEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.TextureParameterName)pname, (Single*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexParameteriEXT")]
             public static 
             void MultiTexParameter(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Int32 param)
@@ -102821,21 +102821,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexParameterIivEXT")]
-            public static 
-            unsafe void MultiTexParameterI(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMultiTexParameterIivEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.TextureParameterName)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexParameterIivEXT")]
             public static 
             void MultiTexParameterI(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Int32[] @params)
@@ -102876,6 +102861,42 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexParameterIivEXT")]
+            public static 
+            unsafe void MultiTexParameterI(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMultiTexParameterIivEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.TextureParameterName)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexParameterIuivEXT")]
+            public static 
+            void MultiTexParameterI(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, UInt32[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* @params_ptr = @params)
+                    {
+                        Delegates.glMultiTexParameterIuivEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.TextureParameterName)pname, (UInt32*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexParameterIuivEXT")]
             public static 
@@ -102912,10 +102933,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexParameterIuivEXT")]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexParameterivEXT")]
             public static 
-            void MultiTexParameterI(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, UInt32[] @params)
+            void MultiTexParameter(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Int32[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -102923,9 +102943,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
                 unsafe
                 {
-                    fixed (UInt32* @params_ptr = @params)
+                    fixed (Int32* @params_ptr = @params)
                     {
-                        Delegates.glMultiTexParameterIuivEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.TextureParameterName)pname, (UInt32*)@params_ptr);
+                        Delegates.glMultiTexParameterivEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.TextureParameterName)pname, (Int32*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -102948,26 +102968,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexParameterivEXT")]
-            public static 
-            void MultiTexParameter(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Int32[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Int32* @params_ptr = @params)
-                    {
-                        Delegates.glMultiTexParameterivEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.TextureParameterName)pname, (Int32*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexRenderbufferEXT")]
             public static 
             void MultiTexRenderbuffer(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 renderbuffer)
@@ -102999,23 +102999,13 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexSubImage1DEXT")]
             public static 
-            void MultiTexSubImage1D<T7>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T7 pixels)
-                where T7 : struct
+            void MultiTexSubImage1D(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glMultiTexSubImage1DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                    pixels = (T7)pixels_ptr.Target;
-                }
-                finally
-                {
-                    pixels_ptr.Free();
-                }
+                Delegates.glMultiTexSubImage1DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
                 #if DEBUG
                 }
                 #endif
@@ -103023,7 +103013,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexSubImage1DEXT")]
             public static 
-            void MultiTexSubImage1D<T7>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T7[,,] pixels)
+            void MultiTexSubImage1D<T7>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T7[] pixels)
                 where T7 : struct
             {
                 #if DEBUG
@@ -103069,7 +103059,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexSubImage1DEXT")]
             public static 
-            void MultiTexSubImage1D<T7>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T7[] pixels)
+            void MultiTexSubImage1D<T7>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T7[,,] pixels)
                 where T7 : struct
             {
                 #if DEBUG
@@ -103092,22 +103082,8 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexSubImage1DEXT")]
             public static 
-            void MultiTexSubImage1D(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMultiTexSubImage1DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexSubImage2DEXT")]
-            public static 
-            void MultiTexSubImage2D<T9>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T9 pixels)
-                where T9 : struct
+            void MultiTexSubImage1D<T7>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T7 pixels)
+                where T7 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -103116,8 +103092,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glMultiTexSubImage2DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                    pixels = (T9)pixels_ptr.Target;
+                    Delegates.glMultiTexSubImage1DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    pixels = (T7)pixels_ptr.Target;
                 }
                 finally
                 {
@@ -103130,7 +103106,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexSubImage2DEXT")]
             public static 
-            void MultiTexSubImage2D<T9>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[,,] pixels)
+            void MultiTexSubImage2D(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMultiTexSubImage2DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexSubImage2DEXT")]
+            public static 
+            void MultiTexSubImage2D<T9>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[] pixels)
                 where T9 : struct
             {
                 #if DEBUG
@@ -103176,7 +103166,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexSubImage2DEXT")]
             public static 
-            void MultiTexSubImage2D<T9>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[] pixels)
+            void MultiTexSubImage2D<T9>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[,,] pixels)
                 where T9 : struct
             {
                 #if DEBUG
@@ -103199,22 +103189,8 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexSubImage2DEXT")]
             public static 
-            void MultiTexSubImage2D(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMultiTexSubImage2DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexSubImage3DEXT")]
-            public static 
-            void MultiTexSubImage3D<T11>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T11 pixels)
-                where T11 : struct
+            void MultiTexSubImage2D<T9>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T9 pixels)
+                where T9 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -103223,8 +103199,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glMultiTexSubImage3DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                    pixels = (T11)pixels_ptr.Target;
+                    Delegates.glMultiTexSubImage2DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    pixels = (T9)pixels_ptr.Target;
                 }
                 finally
                 {
@@ -103237,7 +103213,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexSubImage3DEXT")]
             public static 
-            void MultiTexSubImage3D<T11>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T11[,,] pixels)
+            void MultiTexSubImage3D(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMultiTexSubImage3DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexSubImage3DEXT")]
+            public static 
+            void MultiTexSubImage3D<T11>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T11[] pixels)
                 where T11 : struct
             {
                 #if DEBUG
@@ -103283,7 +103273,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexSubImage3DEXT")]
             public static 
-            void MultiTexSubImage3D<T11>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T11[] pixels)
+            void MultiTexSubImage3D<T11>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T11[,,] pixels)
                 where T11 : struct
             {
                 #if DEBUG
@@ -103306,36 +103296,22 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glMultiTexSubImage3DEXT")]
             public static 
-            void MultiTexSubImage3D(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+            void MultiTexSubImage3D<T11>(OpenTK.Graphics.OpenGL.TextureUnit texunit, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T11 pixels)
+                where T11 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glMultiTexSubImage3DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedBufferDataEXT")]
-            public static 
-            void NamedBufferData<T2>(Int32 buffer, IntPtr size, [InAttribute, OutAttribute] ref T2 data, OpenTK.Graphics.OpenGL.ExtDirectStateAccess usage)
-                where T2 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
+                GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glNamedBufferDataEXT((UInt32)buffer, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject(), (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)usage);
-                    data = (T2)data_ptr.Target;
+                    Delegates.glMultiTexSubImage3DEXT((OpenTK.Graphics.OpenGL.TextureUnit)texunit, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    pixels = (T11)pixels_ptr.Target;
                 }
                 finally
                 {
-                    data_ptr.Free();
+                    pixels_ptr.Free();
                 }
                 #if DEBUG
                 }
@@ -103344,7 +103320,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedBufferDataEXT")]
             public static 
-            void NamedBufferData<T2>(Int32 buffer, IntPtr size, [InAttribute, OutAttribute] T2[,,] data, OpenTK.Graphics.OpenGL.ExtDirectStateAccess usage)
+            void NamedBufferData(Int32 buffer, IntPtr size, IntPtr data, OpenTK.Graphics.OpenGL.ExtDirectStateAccess usage)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glNamedBufferDataEXT((UInt32)buffer, (IntPtr)size, (IntPtr)data, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)usage);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedBufferDataEXT")]
+            public static 
+            void NamedBufferData<T2>(Int32 buffer, IntPtr size, [InAttribute, OutAttribute] T2[] data, OpenTK.Graphics.OpenGL.ExtDirectStateAccess usage)
                 where T2 : struct
             {
                 #if DEBUG
@@ -103390,7 +103380,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedBufferDataEXT")]
             public static 
-            void NamedBufferData<T2>(Int32 buffer, IntPtr size, [InAttribute, OutAttribute] T2[] data, OpenTK.Graphics.OpenGL.ExtDirectStateAccess usage)
+            void NamedBufferData<T2>(Int32 buffer, IntPtr size, [InAttribute, OutAttribute] T2[,,] data, OpenTK.Graphics.OpenGL.ExtDirectStateAccess usage)
                 where T2 : struct
             {
                 #if DEBUG
@@ -103413,22 +103403,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedBufferDataEXT")]
             public static 
-            void NamedBufferData(Int32 buffer, IntPtr size, IntPtr data, OpenTK.Graphics.OpenGL.ExtDirectStateAccess usage)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glNamedBufferDataEXT((UInt32)buffer, (IntPtr)size, (IntPtr)data, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)usage);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedBufferDataEXT")]
-            public static 
-            void NamedBufferData<T2>(UInt32 buffer, IntPtr size, [InAttribute, OutAttribute] ref T2 data, OpenTK.Graphics.OpenGL.ExtDirectStateAccess usage)
+            void NamedBufferData<T2>(Int32 buffer, IntPtr size, [InAttribute, OutAttribute] ref T2 data, OpenTK.Graphics.OpenGL.ExtDirectStateAccess usage)
                 where T2 : struct
             {
                 #if DEBUG
@@ -103453,7 +103428,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedBufferDataEXT")]
             public static 
-            void NamedBufferData<T2>(UInt32 buffer, IntPtr size, [InAttribute, OutAttribute] T2[,,] data, OpenTK.Graphics.OpenGL.ExtDirectStateAccess usage)
+            void NamedBufferData(UInt32 buffer, IntPtr size, IntPtr data, OpenTK.Graphics.OpenGL.ExtDirectStateAccess usage)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glNamedBufferDataEXT((UInt32)buffer, (IntPtr)size, (IntPtr)data, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)usage);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedBufferDataEXT")]
+            public static 
+            void NamedBufferData<T2>(UInt32 buffer, IntPtr size, [InAttribute, OutAttribute] T2[] data, OpenTK.Graphics.OpenGL.ExtDirectStateAccess usage)
                 where T2 : struct
             {
                 #if DEBUG
@@ -103501,7 +103491,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedBufferDataEXT")]
             public static 
-            void NamedBufferData<T2>(UInt32 buffer, IntPtr size, [InAttribute, OutAttribute] T2[] data, OpenTK.Graphics.OpenGL.ExtDirectStateAccess usage)
+            void NamedBufferData<T2>(UInt32 buffer, IntPtr size, [InAttribute, OutAttribute] T2[,,] data, OpenTK.Graphics.OpenGL.ExtDirectStateAccess usage)
                 where T2 : struct
             {
                 #if DEBUG
@@ -103525,22 +103515,8 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedBufferDataEXT")]
             public static 
-            void NamedBufferData(UInt32 buffer, IntPtr size, IntPtr data, OpenTK.Graphics.OpenGL.ExtDirectStateAccess usage)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glNamedBufferDataEXT((UInt32)buffer, (IntPtr)size, (IntPtr)data, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)usage);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedBufferSubDataEXT")]
-            public static 
-            void NamedBufferSubData<T3>(Int32 buffer, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] ref T3 data)
-                where T3 : struct
+            void NamedBufferData<T2>(UInt32 buffer, IntPtr size, [InAttribute, OutAttribute] ref T2 data, OpenTK.Graphics.OpenGL.ExtDirectStateAccess usage)
+                where T2 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -103549,8 +103525,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glNamedBufferSubDataEXT((UInt32)buffer, (IntPtr)offset, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject());
-                    data = (T3)data_ptr.Target;
+                    Delegates.glNamedBufferDataEXT((UInt32)buffer, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject(), (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)usage);
+                    data = (T2)data_ptr.Target;
                 }
                 finally
                 {
@@ -103563,7 +103539,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedBufferSubDataEXT")]
             public static 
-            void NamedBufferSubData<T3>(Int32 buffer, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[,,] data)
+            void NamedBufferSubData(Int32 buffer, IntPtr offset, IntPtr size, IntPtr data)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glNamedBufferSubDataEXT((UInt32)buffer, (IntPtr)offset, (IntPtr)size, (IntPtr)data);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedBufferSubDataEXT")]
+            public static 
+            void NamedBufferSubData<T3>(Int32 buffer, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[] data)
                 where T3 : struct
             {
                 #if DEBUG
@@ -103609,7 +103599,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedBufferSubDataEXT")]
             public static 
-            void NamedBufferSubData<T3>(Int32 buffer, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[] data)
+            void NamedBufferSubData<T3>(Int32 buffer, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[,,] data)
                 where T3 : struct
             {
                 #if DEBUG
@@ -103632,22 +103622,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedBufferSubDataEXT")]
             public static 
-            void NamedBufferSubData(Int32 buffer, IntPtr offset, IntPtr size, IntPtr data)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glNamedBufferSubDataEXT((UInt32)buffer, (IntPtr)offset, (IntPtr)size, (IntPtr)data);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedBufferSubDataEXT")]
-            public static 
-            void NamedBufferSubData<T3>(UInt32 buffer, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] ref T3 data)
+            void NamedBufferSubData<T3>(Int32 buffer, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] ref T3 data)
                 where T3 : struct
             {
                 #if DEBUG
@@ -103672,7 +103647,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedBufferSubDataEXT")]
             public static 
-            void NamedBufferSubData<T3>(UInt32 buffer, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[,,] data)
+            void NamedBufferSubData(UInt32 buffer, IntPtr offset, IntPtr size, IntPtr data)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glNamedBufferSubDataEXT((UInt32)buffer, (IntPtr)offset, (IntPtr)size, (IntPtr)data);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedBufferSubDataEXT")]
+            public static 
+            void NamedBufferSubData<T3>(UInt32 buffer, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[] data)
                 where T3 : struct
             {
                 #if DEBUG
@@ -103720,7 +103710,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedBufferSubDataEXT")]
             public static 
-            void NamedBufferSubData<T3>(UInt32 buffer, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[] data)
+            void NamedBufferSubData<T3>(UInt32 buffer, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T3[,,] data)
                 where T3 : struct
             {
                 #if DEBUG
@@ -103744,13 +103734,23 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedBufferSubDataEXT")]
             public static 
-            void NamedBufferSubData(UInt32 buffer, IntPtr offset, IntPtr size, IntPtr data)
+            void NamedBufferSubData<T3>(UInt32 buffer, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] ref T3 data)
+                where T3 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glNamedBufferSubDataEXT((UInt32)buffer, (IntPtr)offset, (IntPtr)size, (IntPtr)data);
+                GCHandle data_ptr = GCHandle.Alloc(data, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glNamedBufferSubDataEXT((UInt32)buffer, (IntPtr)offset, (IntPtr)size, (IntPtr)data_ptr.AddrOfPinnedObject());
+                    data = (T3)data_ptr.Target;
+                }
+                finally
+                {
+                    data_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -103988,21 +103988,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramLocalParameter4dvEXT")]
-            public static 
-            unsafe void NamedProgramLocalParameter4(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, Double* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glNamedProgramLocalParameter4dvEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (Double*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramLocalParameter4dvEXT")]
             public static 
             void NamedProgramLocalParameter4(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, Double[] @params)
@@ -104046,7 +104031,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramLocalParameter4dvEXT")]
             public static 
-            unsafe void NamedProgramLocalParameter4(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, Double* @params)
+            unsafe void NamedProgramLocalParameter4(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, Double* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -104100,6 +104085,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramLocalParameter4dvEXT")]
+            public static 
+            unsafe void NamedProgramLocalParameter4(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, Double* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glNamedProgramLocalParameter4dvEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (Double*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramLocalParameter4fEXT")]
             public static 
             void NamedProgramLocalParameter4(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, Single x, Single y, Single z, Single w)
@@ -104129,6 +104129,26 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramLocalParameter4fvEXT")]
+            public static 
+            void NamedProgramLocalParameter4(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glNamedProgramLocalParameter4fvEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (Single*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramLocalParameter4fvEXT")]
             public static 
             void NamedProgramLocalParameter4(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, ref Single @params)
@@ -104164,9 +104184,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramLocalParameter4fvEXT")]
             public static 
-            void NamedProgramLocalParameter4(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, Single[] @params)
+            void NamedProgramLocalParameter4(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -104220,27 +104241,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramLocalParameter4fvEXT")]
-            public static 
-            void NamedProgramLocalParameter4(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glNamedProgramLocalParameter4fvEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramLocalParameterI4iEXT")]
             public static 
             void NamedProgramLocalParameterI4(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, Int32 x, Int32 y, Int32 z, Int32 w)
@@ -104270,21 +104270,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramLocalParameterI4ivEXT")]
-            public static 
-            unsafe void NamedProgramLocalParameterI4(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glNamedProgramLocalParameterI4ivEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramLocalParameterI4ivEXT")]
             public static 
             void NamedProgramLocalParameterI4(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, Int32[] @params)
@@ -104328,7 +104313,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramLocalParameterI4ivEXT")]
             public static 
-            unsafe void NamedProgramLocalParameterI4(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, Int32* @params)
+            unsafe void NamedProgramLocalParameterI4(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -104382,6 +104367,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramLocalParameterI4ivEXT")]
+            public static 
+            unsafe void NamedProgramLocalParameterI4(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glNamedProgramLocalParameterI4ivEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramLocalParameterI4uiEXT")]
             public static 
@@ -104397,6 +104397,27 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramLocalParameterI4uivEXT")]
+            public static 
+            void NamedProgramLocalParameterI4(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, UInt32[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* @params_ptr = @params)
+                    {
+                        Delegates.glNamedProgramLocalParameterI4uivEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (UInt32*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramLocalParameterI4uivEXT")]
             public static 
@@ -104433,10 +104454,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramLocalParameterI4uivEXT")]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramLocalParameters4fvEXT")]
             public static 
-            void NamedProgramLocalParameterI4(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, UInt32[] @params)
+            void NamedProgramLocalParameters4(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, Int32 count, Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -104444,9 +104464,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
                 unsafe
                 {
-                    fixed (UInt32* @params_ptr = @params)
+                    fixed (Single* @params_ptr = @params)
                     {
-                        Delegates.glNamedProgramLocalParameterI4uivEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (UInt32*)@params_ptr);
+                        Delegates.glNamedProgramLocalParameters4fvEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (Int32)count, (Single*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -104489,9 +104509,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramLocalParameters4fvEXT")]
             public static 
-            void NamedProgramLocalParameters4(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, Int32 count, Single[] @params)
+            void NamedProgramLocalParameters4(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, Int32 count, Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -104545,42 +104566,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramLocalParameters4fvEXT")]
-            public static 
-            void NamedProgramLocalParameters4(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, Int32 count, Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glNamedProgramLocalParameters4fvEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (Int32)count, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramLocalParametersI4ivEXT")]
-            public static 
-            unsafe void NamedProgramLocalParametersI4(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, Int32 count, Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glNamedProgramLocalParametersI4ivEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (Int32)count, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramLocalParametersI4ivEXT")]
             public static 
             void NamedProgramLocalParametersI4(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, Int32 count, Int32[] @params)
@@ -104624,7 +104609,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramLocalParametersI4ivEXT")]
             public static 
-            unsafe void NamedProgramLocalParametersI4(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, Int32 count, Int32* @params)
+            unsafe void NamedProgramLocalParametersI4(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, Int32 index, Int32 count, Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -104678,6 +104663,42 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramLocalParametersI4ivEXT")]
+            public static 
+            unsafe void NamedProgramLocalParametersI4(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, Int32 count, Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glNamedProgramLocalParametersI4ivEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (Int32)count, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramLocalParametersI4uivEXT")]
+            public static 
+            void NamedProgramLocalParametersI4(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, Int32 count, UInt32[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* @params_ptr = @params)
+                    {
+                        Delegates.glNamedProgramLocalParametersI4uivEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (Int32)count, (UInt32*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramLocalParametersI4uivEXT")]
             public static 
@@ -104714,22 +104735,15 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramLocalParametersI4uivEXT")]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramStringEXT")]
             public static 
-            void NamedProgramLocalParametersI4(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, UInt32 index, Int32 count, UInt32[] @params)
+            void NamedProgramString(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess format, Int32 len, IntPtr @string)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                unsafe
-                {
-                    fixed (UInt32* @params_ptr = @params)
-                    {
-                        Delegates.glNamedProgramLocalParametersI4uivEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (UInt32)index, (Int32)count, (UInt32*)@params_ptr);
-                    }
-                }
+                Delegates.glNamedProgramStringEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)format, (Int32)len, (IntPtr)@string);
                 #if DEBUG
                 }
                 #endif
@@ -104737,31 +104751,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramStringEXT")]
             public static 
-            void NamedProgramString<T4>(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess format, Int32 len, [InAttribute, OutAttribute] ref T4 @string)
-                where T4 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle @string_ptr = GCHandle.Alloc(@string, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glNamedProgramStringEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)format, (Int32)len, (IntPtr)@string_ptr.AddrOfPinnedObject());
-                    @string = (T4)@string_ptr.Target;
-                }
-                finally
-                {
-                    @string_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramStringEXT")]
-            public static 
-            void NamedProgramString<T4>(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess format, Int32 len, [InAttribute, OutAttribute] T4[,,] @string)
+            void NamedProgramString<T4>(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess format, Int32 len, [InAttribute, OutAttribute] T4[] @string)
                 where T4 : struct
             {
                 #if DEBUG
@@ -104807,7 +104797,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramStringEXT")]
             public static 
-            void NamedProgramString<T4>(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess format, Int32 len, [InAttribute, OutAttribute] T4[] @string)
+            void NamedProgramString<T4>(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess format, Int32 len, [InAttribute, OutAttribute] T4[,,] @string)
                 where T4 : struct
             {
                 #if DEBUG
@@ -104830,22 +104820,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramStringEXT")]
             public static 
-            void NamedProgramString(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess format, Int32 len, IntPtr @string)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glNamedProgramStringEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)format, (Int32)len, (IntPtr)@string);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramStringEXT")]
-            public static 
-            void NamedProgramString<T4>(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess format, Int32 len, [InAttribute, OutAttribute] ref T4 @string)
+            void NamedProgramString<T4>(Int32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess format, Int32 len, [InAttribute, OutAttribute] ref T4 @string)
                 where T4 : struct
             {
                 #if DEBUG
@@ -104870,7 +104845,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramStringEXT")]
             public static 
-            void NamedProgramString<T4>(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess format, Int32 len, [InAttribute, OutAttribute] T4[,,] @string)
+            void NamedProgramString(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess format, Int32 len, IntPtr @string)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glNamedProgramStringEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)format, (Int32)len, (IntPtr)@string);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramStringEXT")]
+            public static 
+            void NamedProgramString<T4>(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess format, Int32 len, [InAttribute, OutAttribute] T4[] @string)
                 where T4 : struct
             {
                 #if DEBUG
@@ -104918,7 +104908,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramStringEXT")]
             public static 
-            void NamedProgramString<T4>(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess format, Int32 len, [InAttribute, OutAttribute] T4[] @string)
+            void NamedProgramString<T4>(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess format, Int32 len, [InAttribute, OutAttribute] T4[,,] @string)
                 where T4 : struct
             {
                 #if DEBUG
@@ -104942,13 +104932,23 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glNamedProgramStringEXT")]
             public static 
-            void NamedProgramString(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess format, Int32 len, IntPtr @string)
+            void NamedProgramString<T4>(UInt32 program, OpenTK.Graphics.OpenGL.ExtDirectStateAccess target, OpenTK.Graphics.OpenGL.ExtDirectStateAccess format, Int32 len, [InAttribute, OutAttribute] ref T4 @string)
+                where T4 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glNamedProgramStringEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)format, (Int32)len, (IntPtr)@string);
+                GCHandle @string_ptr = GCHandle.Alloc(@string, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glNamedProgramStringEXT((UInt32)program, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)target, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)format, (Int32)len, (IntPtr)@string_ptr.AddrOfPinnedObject());
+                    @string = (T4)@string_ptr.Target;
+                }
+                finally
+                {
+                    @string_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -105062,23 +105062,13 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtVertexArray", Version = "1.0", EntryPoint = "glNormalPointerEXT")]
             public static 
-            void NormalPointer<T3>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] ref T3 pointer)
-                where T3 : struct
+            void NormalPointer(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, Int32 count, IntPtr pointer)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glNormalPointerEXT((OpenTK.Graphics.OpenGL.NormalPointerType)type, (Int32)stride, (Int32)count, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                    pointer = (T3)pointer_ptr.Target;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
+                Delegates.glNormalPointerEXT((OpenTK.Graphics.OpenGL.NormalPointerType)type, (Int32)stride, (Int32)count, (IntPtr)pointer);
                 #if DEBUG
                 }
                 #endif
@@ -105105,7 +105095,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtVertexArray", Version = "1.0", EntryPoint = "glNormalPointerEXT")]
             public static 
-            void NormalPointer<T3>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] T3[,,] pointer)
+            void NormalPointer<T3>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] T3[] pointer)
                 where T3 : struct
             {
                 #if DEBUG
@@ -105189,7 +105179,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtVertexArray", Version = "1.0", EntryPoint = "glNormalPointerEXT")]
             public static 
-            void NormalPointer<T3>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] T3[] pointer)
+            void NormalPointer<T3>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] T3[,,] pointer)
                 where T3 : struct
             {
                 #if DEBUG
@@ -105231,13 +105221,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtVertexArray", Version = "1.0", EntryPoint = "glNormalPointerEXT")]
             public static 
-            void NormalPointer(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, Int32 count, IntPtr pointer)
+            void NormalPointer<T3>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] ref T3 pointer)
+                where T3 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glNormalPointerEXT((OpenTK.Graphics.OpenGL.NormalPointerType)type, (Int32)stride, (Int32)count, (IntPtr)pointer);
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glNormalPointerEXT((OpenTK.Graphics.OpenGL.NormalPointerType)type, (Int32)stride, (Int32)count, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    pointer = (T3)pointer_ptr.Target;
+                }
+                finally
+                {
+                    pointer_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -105343,16 +105343,21 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the value that pname will be set to.
         /// </para>
         /// </param>
-            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtPointParameters", Version = "1.0", EntryPoint = "glPointParameterfvEXT")]
             public static 
-            unsafe void PointParameter(OpenTK.Graphics.OpenGL.ExtPointParameters pname, Single* @params)
+            void PointParameter(OpenTK.Graphics.OpenGL.ExtPointParameters pname, Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glPointParameterfvEXT((OpenTK.Graphics.OpenGL.ExtPointParameters)pname, (Single*)@params);
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glPointParameterfvEXT((OpenTK.Graphics.OpenGL.ExtPointParameters)pname, (Single*)@params_ptr);
+                    }
+                }
                 #if DEBUG
                 }
                 #endif
@@ -105372,21 +105377,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the value that pname will be set to.
         /// </para>
         /// </param>
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtPointParameters", Version = "1.0", EntryPoint = "glPointParameterfvEXT")]
             public static 
-            void PointParameter(OpenTK.Graphics.OpenGL.ExtPointParameters pname, Single[] @params)
+            unsafe void PointParameter(OpenTK.Graphics.OpenGL.ExtPointParameters pname, Single* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glPointParameterfvEXT((OpenTK.Graphics.OpenGL.ExtPointParameters)pname, (Single*)@params_ptr);
-                    }
-                }
+                Delegates.glPointParameterfvEXT((OpenTK.Graphics.OpenGL.ExtPointParameters)pname, (Single*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -105421,40 +105421,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Set texture residence priority
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of textures to be prioritized.
-        /// </para>
-        /// </param>
-        /// <param name="textures">
-        /// <para>
-        /// Specifies an array containing the names of the textures to be prioritized.
-        /// </para>
-        /// </param>
-        /// <param name="priorities">
-        /// <para>
-        /// Specifies an array containing the texture priorities. A priority given in an element of priorities applies to the texture named by the corresponding element of textures.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtTextureObject", Version = "1.0", EntryPoint = "glPrioritizeTexturesEXT")]
-            public static 
-            unsafe void PrioritizeTextures(Int32 n, Int32* textures, Single* priorities)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glPrioritizeTexturesEXT((Int32)n, (UInt32*)textures, (Single*)priorities);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Set texture residence priority
         /// </summary>
@@ -105535,6 +105501,81 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Set texture residence priority
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of textures to be prioritized.
+        /// </para>
+        /// </param>
+        /// <param name="textures">
+        /// <para>
+        /// Specifies an array containing the names of the textures to be prioritized.
+        /// </para>
+        /// </param>
+        /// <param name="priorities">
+        /// <para>
+        /// Specifies an array containing the texture priorities. A priority given in an element of priorities applies to the texture named by the corresponding element of textures.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtTextureObject", Version = "1.0", EntryPoint = "glPrioritizeTexturesEXT")]
+            public static 
+            unsafe void PrioritizeTextures(Int32 n, Int32* textures, Single* priorities)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glPrioritizeTexturesEXT((Int32)n, (UInt32*)textures, (Single*)priorities);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Set texture residence priority
+        /// </summary>
+        /// <param name="n">
+        /// <para>
+        /// Specifies the number of textures to be prioritized.
+        /// </para>
+        /// </param>
+        /// <param name="textures">
+        /// <para>
+        /// Specifies an array containing the names of the textures to be prioritized.
+        /// </para>
+        /// </param>
+        /// <param name="priorities">
+        /// <para>
+        /// Specifies an array containing the texture priorities. A priority given in an element of priorities applies to the texture named by the corresponding element of textures.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtTextureObject", Version = "1.0", EntryPoint = "glPrioritizeTexturesEXT")]
+            public static 
+            void PrioritizeTextures(Int32 n, UInt32[] textures, Single[] priorities)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* textures_ptr = textures)
+                    fixed (Single* priorities_ptr = priorities)
+                    {
+                        Delegates.glPrioritizeTexturesEXT((Int32)n, (UInt32*)textures_ptr, (Single*)priorities_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Set texture residence priority
         /// </summary>
@@ -105609,29 +105650,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            
-        /// <summary>
-        /// Set texture residence priority
-        /// </summary>
-        /// <param name="n">
-        /// <para>
-        /// Specifies the number of textures to be prioritized.
-        /// </para>
-        /// </param>
-        /// <param name="textures">
-        /// <para>
-        /// Specifies an array containing the names of the textures to be prioritized.
-        /// </para>
-        /// </param>
-        /// <param name="priorities">
-        /// <para>
-        /// Specifies an array containing the texture priorities. A priority given in an element of priorities applies to the texture named by the corresponding element of textures.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtTextureObject", Version = "1.0", EntryPoint = "glPrioritizeTexturesEXT")]
+            [AutoGenerated(Category = "ExtGpuProgramParameters", Version = "1.2", EntryPoint = "glProgramEnvParameters4fvEXT")]
             public static 
-            void PrioritizeTextures(Int32 n, UInt32[] textures, Single[] priorities)
+            void ProgramEnvParameters4(OpenTK.Graphics.OpenGL.ExtGpuProgramParameters target, Int32 index, Int32 count, Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -105639,10 +105660,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
                 unsafe
                 {
-                    fixed (UInt32* textures_ptr = textures)
-                    fixed (Single* priorities_ptr = priorities)
+                    fixed (Single* @params_ptr = @params)
                     {
-                        Delegates.glPrioritizeTexturesEXT((Int32)n, (UInt32*)textures_ptr, (Single*)priorities_ptr);
+                        Delegates.glProgramEnvParameters4fvEXT((OpenTK.Graphics.OpenGL.ExtGpuProgramParameters)target, (UInt32)index, (Int32)count, (Single*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -105685,9 +105705,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtGpuProgramParameters", Version = "1.2", EntryPoint = "glProgramEnvParameters4fvEXT")]
             public static 
-            void ProgramEnvParameters4(OpenTK.Graphics.OpenGL.ExtGpuProgramParameters target, Int32 index, Int32 count, Single[] @params)
+            void ProgramEnvParameters4(OpenTK.Graphics.OpenGL.ExtGpuProgramParameters target, UInt32 index, Int32 count, Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -105741,10 +105762,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtGpuProgramParameters", Version = "1.2", EntryPoint = "glProgramEnvParameters4fvEXT")]
+            [AutoGenerated(Category = "ExtGpuProgramParameters", Version = "1.2", EntryPoint = "glProgramLocalParameters4fvEXT")]
             public static 
-            void ProgramEnvParameters4(OpenTK.Graphics.OpenGL.ExtGpuProgramParameters target, UInt32 index, Int32 count, Single[] @params)
+            void ProgramLocalParameters4(OpenTK.Graphics.OpenGL.ExtGpuProgramParameters target, Int32 index, Int32 count, Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -105754,7 +105774,7 @@ namespace OpenTK.Graphics.OpenGL
                 {
                     fixed (Single* @params_ptr = @params)
                     {
-                        Delegates.glProgramEnvParameters4fvEXT((OpenTK.Graphics.OpenGL.ExtGpuProgramParameters)target, (UInt32)index, (Int32)count, (Single*)@params_ptr);
+                        Delegates.glProgramLocalParameters4fvEXT((OpenTK.Graphics.OpenGL.ExtGpuProgramParameters)target, (UInt32)index, (Int32)count, (Single*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -105797,9 +105817,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtGpuProgramParameters", Version = "1.2", EntryPoint = "glProgramLocalParameters4fvEXT")]
             public static 
-            void ProgramLocalParameters4(OpenTK.Graphics.OpenGL.ExtGpuProgramParameters target, Int32 index, Int32 count, Single[] @params)
+            void ProgramLocalParameters4(OpenTK.Graphics.OpenGL.ExtGpuProgramParameters target, UInt32 index, Int32 count, Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -105853,27 +105874,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtGpuProgramParameters", Version = "1.2", EntryPoint = "glProgramLocalParameters4fvEXT")]
-            public static 
-            void ProgramLocalParameters4(OpenTK.Graphics.OpenGL.ExtGpuProgramParameters target, UInt32 index, Int32 count, Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glProgramLocalParameters4fvEXT((OpenTK.Graphics.OpenGL.ExtGpuProgramParameters)target, (UInt32)index, (Int32)count, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtGeometryShader4", Version = "2.0", EntryPoint = "glProgramParameteriEXT")]
             public static 
             void ProgramParameter(Int32 program, OpenTK.Graphics.OpenGL.ExtGeometryShader4 pname, Int32 value)
@@ -105932,6 +105932,26 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform1fvEXT")]
+            public static 
+            void ProgramUniform1(Int32 program, Int32 location, Int32 count, Single[] value)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* value_ptr = value)
+                    {
+                        Delegates.glProgramUniform1fvEXT((UInt32)program, (Int32)location, (Int32)count, (Single*)value_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform1fvEXT")]
             public static 
             void ProgramUniform1(Int32 program, Int32 location, Int32 count, ref Single value)
@@ -105967,9 +105987,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform1fvEXT")]
             public static 
-            void ProgramUniform1(Int32 program, Int32 location, Int32 count, Single[] value)
+            void ProgramUniform1(UInt32 program, Int32 location, Int32 count, Single[] value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -106023,27 +106044,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform1fvEXT")]
-            public static 
-            void ProgramUniform1(UInt32 program, Int32 location, Int32 count, Single[] value)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* value_ptr = value)
-                    {
-                        Delegates.glProgramUniform1fvEXT((UInt32)program, (Int32)location, (Int32)count, (Single*)value_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform1iEXT")]
             public static 
             void ProgramUniform1(Int32 program, Int32 location, Int32 v0)
@@ -106073,21 +106073,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform1ivEXT")]
-            public static 
-            unsafe void ProgramUniform1(Int32 program, Int32 location, Int32 count, Int32* value)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glProgramUniform1ivEXT((UInt32)program, (Int32)location, (Int32)count, (Int32*)value);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform1ivEXT")]
             public static 
             void ProgramUniform1(Int32 program, Int32 location, Int32 count, Int32[] value)
@@ -106131,7 +106116,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform1ivEXT")]
             public static 
-            unsafe void ProgramUniform1(UInt32 program, Int32 location, Int32 count, Int32* value)
+            unsafe void ProgramUniform1(Int32 program, Int32 location, Int32 count, Int32* value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -106185,6 +106170,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform1ivEXT")]
+            public static 
+            unsafe void ProgramUniform1(UInt32 program, Int32 location, Int32 count, Int32* value)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glProgramUniform1ivEXT((UInt32)program, (Int32)location, (Int32)count, (Int32*)value);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform1uiEXT")]
             public static 
@@ -106200,6 +106200,27 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform1uivEXT")]
+            public static 
+            void ProgramUniform1(UInt32 program, Int32 location, Int32 count, UInt32[] value)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* value_ptr = value)
+                    {
+                        Delegates.glProgramUniform1uivEXT((UInt32)program, (Int32)location, (Int32)count, (UInt32*)value_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform1uivEXT")]
             public static 
@@ -106236,27 +106257,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform1uivEXT")]
-            public static 
-            void ProgramUniform1(UInt32 program, Int32 location, Int32 count, UInt32[] value)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* value_ptr = value)
-                    {
-                        Delegates.glProgramUniform1uivEXT((UInt32)program, (Int32)location, (Int32)count, (UInt32*)value_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform2fEXT")]
             public static 
             void ProgramUniform2(Int32 program, Int32 location, Single v0, Single v1)
@@ -106286,6 +106286,26 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform2fvEXT")]
+            public static 
+            void ProgramUniform2(Int32 program, Int32 location, Int32 count, Single[] value)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* value_ptr = value)
+                    {
+                        Delegates.glProgramUniform2fvEXT((UInt32)program, (Int32)location, (Int32)count, (Single*)value_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform2fvEXT")]
             public static 
             void ProgramUniform2(Int32 program, Int32 location, Int32 count, ref Single value)
@@ -106321,9 +106341,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform2fvEXT")]
             public static 
-            void ProgramUniform2(Int32 program, Int32 location, Int32 count, Single[] value)
+            void ProgramUniform2(UInt32 program, Int32 location, Int32 count, Single[] value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -106377,27 +106398,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform2fvEXT")]
-            public static 
-            void ProgramUniform2(UInt32 program, Int32 location, Int32 count, Single[] value)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* value_ptr = value)
-                    {
-                        Delegates.glProgramUniform2fvEXT((UInt32)program, (Int32)location, (Int32)count, (Single*)value_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform2iEXT")]
             public static 
             void ProgramUniform2(Int32 program, Int32 location, Int32 v0, Int32 v1)
@@ -106427,21 +106427,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform2ivEXT")]
-            public static 
-            unsafe void ProgramUniform2(Int32 program, Int32 location, Int32 count, Int32* value)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glProgramUniform2ivEXT((UInt32)program, (Int32)location, (Int32)count, (Int32*)value);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform2ivEXT")]
             public static 
             void ProgramUniform2(Int32 program, Int32 location, Int32 count, Int32[] value)
@@ -106465,7 +106450,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform2ivEXT")]
             public static 
-            unsafe void ProgramUniform2(UInt32 program, Int32 location, Int32 count, Int32* value)
+            unsafe void ProgramUniform2(Int32 program, Int32 location, Int32 count, Int32* value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -106498,6 +106483,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform2ivEXT")]
+            public static 
+            unsafe void ProgramUniform2(UInt32 program, Int32 location, Int32 count, Int32* value)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glProgramUniform2ivEXT((UInt32)program, (Int32)location, (Int32)count, (Int32*)value);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform2uiEXT")]
             public static 
@@ -106513,6 +106513,27 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform2uivEXT")]
+            public static 
+            void ProgramUniform2(UInt32 program, Int32 location, Int32 count, UInt32[] value)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* value_ptr = value)
+                    {
+                        Delegates.glProgramUniform2uivEXT((UInt32)program, (Int32)location, (Int32)count, (UInt32*)value_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform2uivEXT")]
             public static 
@@ -106549,27 +106570,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform2uivEXT")]
-            public static 
-            void ProgramUniform2(UInt32 program, Int32 location, Int32 count, UInt32[] value)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* value_ptr = value)
-                    {
-                        Delegates.glProgramUniform2uivEXT((UInt32)program, (Int32)location, (Int32)count, (UInt32*)value_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform3fEXT")]
             public static 
             void ProgramUniform3(Int32 program, Int32 location, Single v0, Single v1, Single v2)
@@ -106599,6 +106599,26 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform3fvEXT")]
+            public static 
+            void ProgramUniform3(Int32 program, Int32 location, Int32 count, Single[] value)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* value_ptr = value)
+                    {
+                        Delegates.glProgramUniform3fvEXT((UInt32)program, (Int32)location, (Int32)count, (Single*)value_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform3fvEXT")]
             public static 
             void ProgramUniform3(Int32 program, Int32 location, Int32 count, ref Single value)
@@ -106634,9 +106654,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform3fvEXT")]
             public static 
-            void ProgramUniform3(Int32 program, Int32 location, Int32 count, Single[] value)
+            void ProgramUniform3(UInt32 program, Int32 location, Int32 count, Single[] value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -106690,27 +106711,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform3fvEXT")]
-            public static 
-            void ProgramUniform3(UInt32 program, Int32 location, Int32 count, Single[] value)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* value_ptr = value)
-                    {
-                        Delegates.glProgramUniform3fvEXT((UInt32)program, (Int32)location, (Int32)count, (Single*)value_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform3iEXT")]
             public static 
             void ProgramUniform3(Int32 program, Int32 location, Int32 v0, Int32 v1, Int32 v2)
@@ -106740,21 +106740,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform3ivEXT")]
-            public static 
-            unsafe void ProgramUniform3(Int32 program, Int32 location, Int32 count, Int32* value)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glProgramUniform3ivEXT((UInt32)program, (Int32)location, (Int32)count, (Int32*)value);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform3ivEXT")]
             public static 
             void ProgramUniform3(Int32 program, Int32 location, Int32 count, Int32[] value)
@@ -106798,7 +106783,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform3ivEXT")]
             public static 
-            unsafe void ProgramUniform3(UInt32 program, Int32 location, Int32 count, Int32* value)
+            unsafe void ProgramUniform3(Int32 program, Int32 location, Int32 count, Int32* value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -106852,6 +106837,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform3ivEXT")]
+            public static 
+            unsafe void ProgramUniform3(UInt32 program, Int32 location, Int32 count, Int32* value)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glProgramUniform3ivEXT((UInt32)program, (Int32)location, (Int32)count, (Int32*)value);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform3uiEXT")]
             public static 
@@ -106867,6 +106867,27 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform3uivEXT")]
+            public static 
+            void ProgramUniform3(UInt32 program, Int32 location, Int32 count, UInt32[] value)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* value_ptr = value)
+                    {
+                        Delegates.glProgramUniform3uivEXT((UInt32)program, (Int32)location, (Int32)count, (UInt32*)value_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform3uivEXT")]
             public static 
@@ -106903,27 +106924,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform3uivEXT")]
-            public static 
-            void ProgramUniform3(UInt32 program, Int32 location, Int32 count, UInt32[] value)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* value_ptr = value)
-                    {
-                        Delegates.glProgramUniform3uivEXT((UInt32)program, (Int32)location, (Int32)count, (UInt32*)value_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform4fEXT")]
             public static 
             void ProgramUniform4(Int32 program, Int32 location, Single v0, Single v1, Single v2, Single v3)
@@ -106953,6 +106953,26 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform4fvEXT")]
+            public static 
+            void ProgramUniform4(Int32 program, Int32 location, Int32 count, Single[] value)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* value_ptr = value)
+                    {
+                        Delegates.glProgramUniform4fvEXT((UInt32)program, (Int32)location, (Int32)count, (Single*)value_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform4fvEXT")]
             public static 
             void ProgramUniform4(Int32 program, Int32 location, Int32 count, ref Single value)
@@ -106988,9 +107008,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform4fvEXT")]
             public static 
-            void ProgramUniform4(Int32 program, Int32 location, Int32 count, Single[] value)
+            void ProgramUniform4(UInt32 program, Int32 location, Int32 count, Single[] value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -107044,27 +107065,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform4fvEXT")]
-            public static 
-            void ProgramUniform4(UInt32 program, Int32 location, Int32 count, Single[] value)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* value_ptr = value)
-                    {
-                        Delegates.glProgramUniform4fvEXT((UInt32)program, (Int32)location, (Int32)count, (Single*)value_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform4iEXT")]
             public static 
             void ProgramUniform4(Int32 program, Int32 location, Int32 v0, Int32 v1, Int32 v2, Int32 v3)
@@ -107094,21 +107094,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform4ivEXT")]
-            public static 
-            unsafe void ProgramUniform4(Int32 program, Int32 location, Int32 count, Int32* value)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glProgramUniform4ivEXT((UInt32)program, (Int32)location, (Int32)count, (Int32*)value);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform4ivEXT")]
             public static 
             void ProgramUniform4(Int32 program, Int32 location, Int32 count, Int32[] value)
@@ -107152,7 +107137,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform4ivEXT")]
             public static 
-            unsafe void ProgramUniform4(UInt32 program, Int32 location, Int32 count, Int32* value)
+            unsafe void ProgramUniform4(Int32 program, Int32 location, Int32 count, Int32* value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -107206,6 +107191,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform4ivEXT")]
+            public static 
+            unsafe void ProgramUniform4(UInt32 program, Int32 location, Int32 count, Int32* value)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glProgramUniform4ivEXT((UInt32)program, (Int32)location, (Int32)count, (Int32*)value);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform4uiEXT")]
             public static 
@@ -107221,6 +107221,27 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform4uivEXT")]
+            public static 
+            void ProgramUniform4(UInt32 program, Int32 location, Int32 count, UInt32[] value)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* value_ptr = value)
+                    {
+                        Delegates.glProgramUniform4uivEXT((UInt32)program, (Int32)location, (Int32)count, (UInt32*)value_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform4uivEXT")]
             public static 
@@ -107257,10 +107278,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniform4uivEXT")]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniformMatrix2fvEXT")]
             public static 
-            void ProgramUniform4(UInt32 program, Int32 location, Int32 count, UInt32[] value)
+            void ProgramUniformMatrix2(Int32 program, Int32 location, Int32 count, bool transpose, Single[] value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -107268,9 +107288,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
                 unsafe
                 {
-                    fixed (UInt32* value_ptr = value)
+                    fixed (Single* value_ptr = value)
                     {
-                        Delegates.glProgramUniform4uivEXT((UInt32)program, (Int32)location, (Int32)count, (UInt32*)value_ptr);
+                        Delegates.glProgramUniformMatrix2fvEXT((UInt32)program, (Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
                     }
                 }
                 #if DEBUG
@@ -107313,9 +107333,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniformMatrix2fvEXT")]
             public static 
-            void ProgramUniformMatrix2(Int32 program, Int32 location, Int32 count, bool transpose, Single[] value)
+            void ProgramUniformMatrix2(UInt32 program, Int32 location, Int32 count, bool transpose, Single[] value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -107369,10 +107390,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniformMatrix2fvEXT")]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniformMatrix2x3fvEXT")]
             public static 
-            void ProgramUniformMatrix2(UInt32 program, Int32 location, Int32 count, bool transpose, Single[] value)
+            void ProgramUniformMatrix2x3(Int32 program, Int32 location, Int32 count, bool transpose, Single[] value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -107382,7 +107402,7 @@ namespace OpenTK.Graphics.OpenGL
                 {
                     fixed (Single* value_ptr = value)
                     {
-                        Delegates.glProgramUniformMatrix2fvEXT((UInt32)program, (Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
+                        Delegates.glProgramUniformMatrix2x3fvEXT((UInt32)program, (Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
                     }
                 }
                 #if DEBUG
@@ -107425,9 +107445,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniformMatrix2x3fvEXT")]
             public static 
-            void ProgramUniformMatrix2x3(Int32 program, Int32 location, Int32 count, bool transpose, Single[] value)
+            void ProgramUniformMatrix2x3(UInt32 program, Int32 location, Int32 count, bool transpose, Single[] value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -107481,10 +107502,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniformMatrix2x3fvEXT")]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniformMatrix2x4fvEXT")]
             public static 
-            void ProgramUniformMatrix2x3(UInt32 program, Int32 location, Int32 count, bool transpose, Single[] value)
+            void ProgramUniformMatrix2x4(Int32 program, Int32 location, Int32 count, bool transpose, Single[] value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -107494,7 +107514,7 @@ namespace OpenTK.Graphics.OpenGL
                 {
                     fixed (Single* value_ptr = value)
                     {
-                        Delegates.glProgramUniformMatrix2x3fvEXT((UInt32)program, (Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
+                        Delegates.glProgramUniformMatrix2x4fvEXT((UInt32)program, (Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
                     }
                 }
                 #if DEBUG
@@ -107537,9 +107557,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniformMatrix2x4fvEXT")]
             public static 
-            void ProgramUniformMatrix2x4(Int32 program, Int32 location, Int32 count, bool transpose, Single[] value)
+            void ProgramUniformMatrix2x4(UInt32 program, Int32 location, Int32 count, bool transpose, Single[] value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -107593,10 +107614,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniformMatrix2x4fvEXT")]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniformMatrix3fvEXT")]
             public static 
-            void ProgramUniformMatrix2x4(UInt32 program, Int32 location, Int32 count, bool transpose, Single[] value)
+            void ProgramUniformMatrix3(Int32 program, Int32 location, Int32 count, bool transpose, Single[] value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -107606,7 +107626,7 @@ namespace OpenTK.Graphics.OpenGL
                 {
                     fixed (Single* value_ptr = value)
                     {
-                        Delegates.glProgramUniformMatrix2x4fvEXT((UInt32)program, (Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
+                        Delegates.glProgramUniformMatrix3fvEXT((UInt32)program, (Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
                     }
                 }
                 #if DEBUG
@@ -107649,9 +107669,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniformMatrix3fvEXT")]
             public static 
-            void ProgramUniformMatrix3(Int32 program, Int32 location, Int32 count, bool transpose, Single[] value)
+            void ProgramUniformMatrix3(UInt32 program, Int32 location, Int32 count, bool transpose, Single[] value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -107705,10 +107726,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniformMatrix3fvEXT")]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniformMatrix3x2fvEXT")]
             public static 
-            void ProgramUniformMatrix3(UInt32 program, Int32 location, Int32 count, bool transpose, Single[] value)
+            void ProgramUniformMatrix3x2(Int32 program, Int32 location, Int32 count, bool transpose, Single[] value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -107718,7 +107738,7 @@ namespace OpenTK.Graphics.OpenGL
                 {
                     fixed (Single* value_ptr = value)
                     {
-                        Delegates.glProgramUniformMatrix3fvEXT((UInt32)program, (Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
+                        Delegates.glProgramUniformMatrix3x2fvEXT((UInt32)program, (Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
                     }
                 }
                 #if DEBUG
@@ -107761,9 +107781,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniformMatrix3x2fvEXT")]
             public static 
-            void ProgramUniformMatrix3x2(Int32 program, Int32 location, Int32 count, bool transpose, Single[] value)
+            void ProgramUniformMatrix3x2(UInt32 program, Int32 location, Int32 count, bool transpose, Single[] value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -107817,10 +107838,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniformMatrix3x2fvEXT")]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniformMatrix3x4fvEXT")]
             public static 
-            void ProgramUniformMatrix3x2(UInt32 program, Int32 location, Int32 count, bool transpose, Single[] value)
+            void ProgramUniformMatrix3x4(Int32 program, Int32 location, Int32 count, bool transpose, Single[] value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -107830,7 +107850,7 @@ namespace OpenTK.Graphics.OpenGL
                 {
                     fixed (Single* value_ptr = value)
                     {
-                        Delegates.glProgramUniformMatrix3x2fvEXT((UInt32)program, (Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
+                        Delegates.glProgramUniformMatrix3x4fvEXT((UInt32)program, (Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
                     }
                 }
                 #if DEBUG
@@ -107873,9 +107893,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniformMatrix3x4fvEXT")]
             public static 
-            void ProgramUniformMatrix3x4(Int32 program, Int32 location, Int32 count, bool transpose, Single[] value)
+            void ProgramUniformMatrix3x4(UInt32 program, Int32 location, Int32 count, bool transpose, Single[] value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -107929,10 +107950,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniformMatrix3x4fvEXT")]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniformMatrix4fvEXT")]
             public static 
-            void ProgramUniformMatrix3x4(UInt32 program, Int32 location, Int32 count, bool transpose, Single[] value)
+            void ProgramUniformMatrix4(Int32 program, Int32 location, Int32 count, bool transpose, Single[] value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -107942,7 +107962,7 @@ namespace OpenTK.Graphics.OpenGL
                 {
                     fixed (Single* value_ptr = value)
                     {
-                        Delegates.glProgramUniformMatrix3x4fvEXT((UInt32)program, (Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
+                        Delegates.glProgramUniformMatrix4fvEXT((UInt32)program, (Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
                     }
                 }
                 #if DEBUG
@@ -107985,9 +108005,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniformMatrix4fvEXT")]
             public static 
-            void ProgramUniformMatrix4(Int32 program, Int32 location, Int32 count, bool transpose, Single[] value)
+            void ProgramUniformMatrix4(UInt32 program, Int32 location, Int32 count, bool transpose, Single[] value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -108041,10 +108062,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniformMatrix4fvEXT")]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniformMatrix4x2fvEXT")]
             public static 
-            void ProgramUniformMatrix4(UInt32 program, Int32 location, Int32 count, bool transpose, Single[] value)
+            void ProgramUniformMatrix4x2(Int32 program, Int32 location, Int32 count, bool transpose, Single[] value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -108054,7 +108074,7 @@ namespace OpenTK.Graphics.OpenGL
                 {
                     fixed (Single* value_ptr = value)
                     {
-                        Delegates.glProgramUniformMatrix4fvEXT((UInt32)program, (Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
+                        Delegates.glProgramUniformMatrix4x2fvEXT((UInt32)program, (Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
                     }
                 }
                 #if DEBUG
@@ -108097,9 +108117,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniformMatrix4x2fvEXT")]
             public static 
-            void ProgramUniformMatrix4x2(Int32 program, Int32 location, Int32 count, bool transpose, Single[] value)
+            void ProgramUniformMatrix4x2(UInt32 program, Int32 location, Int32 count, bool transpose, Single[] value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -108153,10 +108174,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniformMatrix4x2fvEXT")]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniformMatrix4x3fvEXT")]
             public static 
-            void ProgramUniformMatrix4x2(UInt32 program, Int32 location, Int32 count, bool transpose, Single[] value)
+            void ProgramUniformMatrix4x3(Int32 program, Int32 location, Int32 count, bool transpose, Single[] value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -108166,7 +108186,7 @@ namespace OpenTK.Graphics.OpenGL
                 {
                     fixed (Single* value_ptr = value)
                     {
-                        Delegates.glProgramUniformMatrix4x2fvEXT((UInt32)program, (Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
+                        Delegates.glProgramUniformMatrix4x3fvEXT((UInt32)program, (Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
                     }
                 }
                 #if DEBUG
@@ -108209,9 +108229,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniformMatrix4x3fvEXT")]
             public static 
-            void ProgramUniformMatrix4x3(Int32 program, Int32 location, Int32 count, bool transpose, Single[] value)
+            void ProgramUniformMatrix4x3(UInt32 program, Int32 location, Int32 count, bool transpose, Single[] value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -108265,27 +108286,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glProgramUniformMatrix4x3fvEXT")]
-            public static 
-            void ProgramUniformMatrix4x3(UInt32 program, Int32 location, Int32 count, bool transpose, Single[] value)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* value_ptr = value)
-                    {
-                        Delegates.glProgramUniformMatrix4x3fvEXT((UInt32)program, (Int32)location, (Int32)count, (bool)transpose, (Single*)value_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtProvokingVertex", Version = "2.1", EntryPoint = "glProvokingVertexEXT")]
             public static 
             void ProvokingVertex(OpenTK.Graphics.OpenGL.ExtProvokingVertex mode)
@@ -108441,6 +108441,36 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Set the current secondary color
+        /// </summary>
+        /// <param name="red">
+        /// <para>
+        /// Specify new red, green, and blue values for the current secondary color.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3bvEXT")]
+            public static 
+            void SecondaryColor3(SByte[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (SByte* v_ptr = v)
+                    {
+                        Delegates.glSecondaryColor3bvEXT((SByte*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Set the current secondary color
         /// </summary>
@@ -108495,36 +108525,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Set the current secondary color
-        /// </summary>
-        /// <param name="red">
-        /// <para>
-        /// Specify new red, green, and blue values for the current secondary color.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3bvEXT")]
-            public static 
-            void SecondaryColor3(SByte[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (SByte* v_ptr = v)
-                    {
-                        Delegates.glSecondaryColor3bvEXT((SByte*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Set the current secondary color
         /// </summary>
@@ -108548,30 +108548,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Set the current secondary color
-        /// </summary>
-        /// <param name="red">
-        /// <para>
-        /// Specify new red, green, and blue values for the current secondary color.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3dvEXT")]
-            public static 
-            unsafe void SecondaryColor3(Double* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glSecondaryColor3dvEXT((Double*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Set the current secondary color
         /// </summary>
@@ -108630,6 +108606,30 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Set the current secondary color
+        /// </summary>
+        /// <param name="red">
+        /// <para>
+        /// Specify new red, green, and blue values for the current secondary color.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3dvEXT")]
+            public static 
+            unsafe void SecondaryColor3(Double* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glSecondaryColor3dvEXT((Double*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Set the current secondary color
         /// </summary>
@@ -108653,6 +108653,35 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Set the current secondary color
+        /// </summary>
+        /// <param name="red">
+        /// <para>
+        /// Specify new red, green, and blue values for the current secondary color.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3fvEXT")]
+            public static 
+            void SecondaryColor3(Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glSecondaryColor3fvEXT((Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Set the current secondary color
         /// </summary>
@@ -108706,35 +108735,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Set the current secondary color
-        /// </summary>
-        /// <param name="red">
-        /// <para>
-        /// Specify new red, green, and blue values for the current secondary color.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3fvEXT")]
-            public static 
-            void SecondaryColor3(Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glSecondaryColor3fvEXT((Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Set the current secondary color
         /// </summary>
@@ -108758,30 +108758,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Set the current secondary color
-        /// </summary>
-        /// <param name="red">
-        /// <para>
-        /// Specify new red, green, and blue values for the current secondary color.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3ivEXT")]
-            public static 
-            unsafe void SecondaryColor3(Int32* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glSecondaryColor3ivEXT((Int32*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Set the current secondary color
         /// </summary>
@@ -108848,15 +108824,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify new red, green, and blue values for the current secondary color.
         /// </para>
         /// </param>
-            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3sEXT")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3ivEXT")]
             public static 
-            void SecondaryColor3(Int16 red, Int16 green, Int16 blue)
+            unsafe void SecondaryColor3(Int32* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glSecondaryColor3sEXT((Int16)red, (Int16)green, (Int16)blue);
+                Delegates.glSecondaryColor3ivEXT((Int32*)v);
                 #if DEBUG
                 }
                 #endif
@@ -108871,16 +108848,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify new red, green, and blue values for the current secondary color.
         /// </para>
         /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3svEXT")]
+            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3sEXT")]
             public static 
-            unsafe void SecondaryColor3(Int16* v)
+            void SecondaryColor3(Int16 red, Int16 green, Int16 blue)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glSecondaryColor3svEXT((Int16*)v);
+                Delegates.glSecondaryColor3sEXT((Int16)red, (Int16)green, (Int16)blue);
                 #if DEBUG
                 }
                 #endif
@@ -108953,15 +108929,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify new red, green, and blue values for the current secondary color.
         /// </para>
         /// </param>
-            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3ubEXT")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3svEXT")]
             public static 
-            void SecondaryColor3(Byte red, Byte green, Byte blue)
+            unsafe void SecondaryColor3(Int16* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glSecondaryColor3ubEXT((Byte)red, (Byte)green, (Byte)blue);
+                Delegates.glSecondaryColor3svEXT((Int16*)v);
                 #if DEBUG
                 }
                 #endif
@@ -108976,16 +108953,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify new red, green, and blue values for the current secondary color.
         /// </para>
         /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3ubvEXT")]
+            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3ubEXT")]
             public static 
-            unsafe void SecondaryColor3(Byte* v)
+            void SecondaryColor3(Byte red, Byte green, Byte blue)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glSecondaryColor3ubvEXT((Byte*)v);
+                Delegates.glSecondaryColor3ubEXT((Byte)red, (Byte)green, (Byte)blue);
                 #if DEBUG
                 }
                 #endif
@@ -109050,6 +109026,30 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Set the current secondary color
+        /// </summary>
+        /// <param name="red">
+        /// <para>
+        /// Specify new red, green, and blue values for the current secondary color.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3ubvEXT")]
+            public static 
+            unsafe void SecondaryColor3(Byte* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glSecondaryColor3ubvEXT((Byte*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Set the current secondary color
         /// </summary>
@@ -109074,6 +109074,36 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Set the current secondary color
+        /// </summary>
+        /// <param name="red">
+        /// <para>
+        /// Specify new red, green, and blue values for the current secondary color.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3uivEXT")]
+            public static 
+            void SecondaryColor3(UInt32[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* v_ptr = v)
+                    {
+                        Delegates.glSecondaryColor3uivEXT((UInt32*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Set the current secondary color
         /// </summary>
@@ -109137,21 +109167,15 @@ namespace OpenTK.Graphics.OpenGL
         /// </para>
         /// </param>
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3uivEXT")]
+            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3usEXT")]
             public static 
-            void SecondaryColor3(UInt32[] v)
+            void SecondaryColor3(UInt16 red, UInt16 green, UInt16 blue)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                unsafe
-                {
-                    fixed (UInt32* v_ptr = v)
-                    {
-                        Delegates.glSecondaryColor3uivEXT((UInt32*)v_ptr);
-                    }
-                }
+                Delegates.glSecondaryColor3usEXT((UInt16)red, (UInt16)green, (UInt16)blue);
                 #if DEBUG
                 }
                 #endif
@@ -109167,15 +109191,21 @@ namespace OpenTK.Graphics.OpenGL
         /// </para>
         /// </param>
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3usEXT")]
+            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3usvEXT")]
             public static 
-            void SecondaryColor3(UInt16 red, UInt16 green, UInt16 blue)
+            void SecondaryColor3(UInt16[] v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glSecondaryColor3usEXT((UInt16)red, (UInt16)green, (UInt16)blue);
+                unsafe
+                {
+                    fixed (UInt16* v_ptr = v)
+                    {
+                        Delegates.glSecondaryColor3usvEXT((UInt16*)v_ptr);
+                    }
+                }
                 #if DEBUG
                 }
                 #endif
@@ -109237,29 +109267,37 @@ namespace OpenTK.Graphics.OpenGL
 
             
         /// <summary>
-        /// Set the current secondary color
+        /// Define an array of secondary colors
         /// </summary>
-        /// <param name="red">
+        /// <param name="size">
         /// <para>
-        /// Specify new red, green, and blue values for the current secondary color.
+        /// Specifies the number of components per color. Must be 3.
         /// </para>
         /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColor3usvEXT")]
+        /// <param name="type">
+        /// <para>
+        /// Specifies the data type of each color component in the array. Symbolic constants GL_BYTE, GL_UNSIGNED_BYTE, GL_SHORT, GL_UNSIGNED_SHORT, GL_INT, GL_UNSIGNED_INT, GL_FLOAT, or GL_DOUBLE are accepted. The initial value is GL_FLOAT.
+        /// </para>
+        /// </param>
+        /// <param name="stride">
+        /// <para>
+        /// Specifies the byte offset between consecutive colors. If stride is 0, the colors are understood to be tightly packed in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+        /// <param name="pointer">
+        /// <para>
+        /// Specifies a pointer to the first component of the first color element in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColorPointerEXT")]
             public static 
-            void SecondaryColor3(UInt16[] v)
+            void SecondaryColorPointer(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, IntPtr pointer)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                unsafe
-                {
-                    fixed (UInt16* v_ptr = v)
-                    {
-                        Delegates.glSecondaryColor3usvEXT((UInt16*)v_ptr);
-                    }
-                }
+                Delegates.glSecondaryColorPointerEXT((Int32)size, (OpenTK.Graphics.OpenGL.ColorPointerType)type, (Int32)stride, (IntPtr)pointer);
                 #if DEBUG
                 }
                 #endif
@@ -109291,55 +109329,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColorPointerEXT")]
             public static 
-            void SecondaryColorPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T3 pointer)
-                where T3 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glSecondaryColorPointerEXT((Int32)size, (OpenTK.Graphics.OpenGL.ColorPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                    pointer = (T3)pointer_ptr.Target;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Define an array of secondary colors
-        /// </summary>
-        /// <param name="size">
-        /// <para>
-        /// Specifies the number of components per color. Must be 3.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the data type of each color component in the array. Symbolic constants GL_BYTE, GL_UNSIGNED_BYTE, GL_SHORT, GL_UNSIGNED_SHORT, GL_INT, GL_UNSIGNED_INT, GL_FLOAT, or GL_DOUBLE are accepted. The initial value is GL_FLOAT.
-        /// </para>
-        /// </param>
-        /// <param name="stride">
-        /// <para>
-        /// Specifies the byte offset between consecutive colors. If stride is 0, the colors are understood to be tightly packed in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-        /// <param name="pointer">
-        /// <para>
-        /// Specifies a pointer to the first component of the first color element in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColorPointerEXT")]
-            public static 
-            void SecondaryColorPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[,,] pointer)
+            void SecondaryColorPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[] pointer)
                 where T3 : struct
             {
                 #if DEBUG
@@ -109433,7 +109423,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColorPointerEXT")]
             public static 
-            void SecondaryColorPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[] pointer)
+            void SecondaryColorPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[,,] pointer)
                 where T3 : struct
             {
                 #if DEBUG
@@ -109480,13 +109470,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtSecondaryColor", Version = "1.1", EntryPoint = "glSecondaryColorPointerEXT")]
             public static 
-            void SecondaryColorPointer(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, IntPtr pointer)
+            void SecondaryColorPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T3 pointer)
+                where T3 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glSecondaryColorPointerEXT((Int32)size, (OpenTK.Graphics.OpenGL.ColorPointerType)type, (Int32)stride, (IntPtr)pointer);
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glSecondaryColorPointerEXT((Int32)size, (OpenTK.Graphics.OpenGL.ColorPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    pointer = (T3)pointer_ptr.Target;
+                }
+                finally
+                {
+                    pointer_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -109538,24 +109538,78 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glSeparableFilter2DEXT")]
             public static 
-            void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T6 row, [InAttribute, OutAttribute] T7[,,] column)
-                where T6 : struct
+            void SeparableFilter2D(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr row, IntPtr column)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glSeparableFilter2DEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Define a separable two-dimensional convolution filter
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="internalformat">
+        /// <para>
+        /// The internal format of the convolution filter kernel. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, or GL_RGBA16.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// The number of elements in the pixel array referenced by row. (This is the width of the separable filter kernel.)
+        /// </para>
+        /// </param>
+        /// <param name="height">
+        /// <para>
+        /// The number of elements in the pixel array referenced by column. (This is the height of the separable filter kernel.)
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// The format of the pixel data in row and column. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_INTENSITY, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// The type of the pixel data in row and column. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="row">
+        /// <para>
+        /// Pointer to a one-dimensional array of pixel data that is processed to build the row filter kernel.
+        /// </para>
+        /// </param>
+        /// <param name="column">
+        /// <para>
+        /// Pointer to a one-dimensional array of pixel data that is processed to build the column filter kernel.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glSeparableFilter2DEXT")]
+            public static 
+            void SeparableFilter2D<T7>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr row, [InAttribute, OutAttribute] T7[] column)
                 where T7 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle row_ptr = GCHandle.Alloc(row, GCHandleType.Pinned);
                 GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glSeparableFilter2DEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row_ptr.AddrOfPinnedObject(), (IntPtr)column_ptr.AddrOfPinnedObject());
-                    row = (T6)row_ptr.Target;
+                    Delegates.glSeparableFilter2DEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject());
                 }
                 finally
                 {
-                    row_ptr.Free();
                     column_ptr.Free();
                 }
                 #if DEBUG
@@ -109609,7 +109663,209 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glSeparableFilter2DEXT")]
             public static 
-            void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[,,] row, [InAttribute, OutAttribute] T7[,,] column)
+            void SeparableFilter2D<T7>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr row, [InAttribute, OutAttribute] T7[,] column)
+                where T7 : struct
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glSeparableFilter2DEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject());
+                }
+                finally
+                {
+                    column_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Define a separable two-dimensional convolution filter
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="internalformat">
+        /// <para>
+        /// The internal format of the convolution filter kernel. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, or GL_RGBA16.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// The number of elements in the pixel array referenced by row. (This is the width of the separable filter kernel.)
+        /// </para>
+        /// </param>
+        /// <param name="height">
+        /// <para>
+        /// The number of elements in the pixel array referenced by column. (This is the height of the separable filter kernel.)
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// The format of the pixel data in row and column. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_INTENSITY, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// The type of the pixel data in row and column. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="row">
+        /// <para>
+        /// Pointer to a one-dimensional array of pixel data that is processed to build the row filter kernel.
+        /// </para>
+        /// </param>
+        /// <param name="column">
+        /// <para>
+        /// Pointer to a one-dimensional array of pixel data that is processed to build the column filter kernel.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glSeparableFilter2DEXT")]
+            public static 
+            void SeparableFilter2D<T7>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr row, [InAttribute, OutAttribute] T7[,,] column)
+                where T7 : struct
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glSeparableFilter2DEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject());
+                }
+                finally
+                {
+                    column_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Define a separable two-dimensional convolution filter
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="internalformat">
+        /// <para>
+        /// The internal format of the convolution filter kernel. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, or GL_RGBA16.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// The number of elements in the pixel array referenced by row. (This is the width of the separable filter kernel.)
+        /// </para>
+        /// </param>
+        /// <param name="height">
+        /// <para>
+        /// The number of elements in the pixel array referenced by column. (This is the height of the separable filter kernel.)
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// The format of the pixel data in row and column. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_INTENSITY, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// The type of the pixel data in row and column. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="row">
+        /// <para>
+        /// Pointer to a one-dimensional array of pixel data that is processed to build the row filter kernel.
+        /// </para>
+        /// </param>
+        /// <param name="column">
+        /// <para>
+        /// Pointer to a one-dimensional array of pixel data that is processed to build the column filter kernel.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glSeparableFilter2DEXT")]
+            public static 
+            void SeparableFilter2D<T7>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr row, [InAttribute, OutAttribute] ref T7 column)
+                where T7 : struct
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glSeparableFilter2DEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject());
+                    column = (T7)column_ptr.Target;
+                }
+                finally
+                {
+                    column_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Define a separable two-dimensional convolution filter
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be GL_SEPARABLE_2D.
+        /// </para>
+        /// </param>
+        /// <param name="internalformat">
+        /// <para>
+        /// The internal format of the convolution filter kernel. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, or GL_RGBA16.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// The number of elements in the pixel array referenced by row. (This is the width of the separable filter kernel.)
+        /// </para>
+        /// </param>
+        /// <param name="height">
+        /// <para>
+        /// The number of elements in the pixel array referenced by column. (This is the height of the separable filter kernel.)
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// The format of the pixel data in row and column. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_INTENSITY, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// The type of the pixel data in row and column. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="row">
+        /// <para>
+        /// Pointer to a one-dimensional array of pixel data that is processed to build the row filter kernel.
+        /// </para>
+        /// </param>
+        /// <param name="column">
+        /// <para>
+        /// Pointer to a one-dimensional array of pixel data that is processed to build the column filter kernel.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glSeparableFilter2DEXT")]
+            public static 
+            void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[] row, [InAttribute, OutAttribute] T7[,,] column)
                 where T6 : struct
                 where T7 : struct
             {
@@ -109749,7 +110005,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glSeparableFilter2DEXT")]
             public static 
-            void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[] row, [InAttribute, OutAttribute] T7[,,] column)
+            void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[,,] row, [InAttribute, OutAttribute] T7[,,] column)
                 where T6 : struct
                 where T7 : struct
             {
@@ -109819,21 +110075,24 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glSeparableFilter2DEXT")]
             public static 
-            void SeparableFilter2D<T7>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr row, [InAttribute, OutAttribute] ref T7 column)
+            void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T6 row, [InAttribute, OutAttribute] T7[,,] column)
+                where T6 : struct
                 where T7 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
+                GCHandle row_ptr = GCHandle.Alloc(row, GCHandleType.Pinned);
                 GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glSeparableFilter2DEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject());
-                    column = (T7)column_ptr.Target;
+                    Delegates.glSeparableFilter2DEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row_ptr.AddrOfPinnedObject(), (IntPtr)column_ptr.AddrOfPinnedObject());
+                    row = (T6)row_ptr.Target;
                 }
                 finally
                 {
+                    row_ptr.Free();
                     column_ptr.Free();
                 }
                 #if DEBUG
@@ -109841,292 +110100,23 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            
-        /// <summary>
-        /// Define a separable two-dimensional convolution filter
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Must be GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="internalformat">
-        /// <para>
-        /// The internal format of the convolution filter kernel. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, or GL_RGBA16.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// The number of elements in the pixel array referenced by row. (This is the width of the separable filter kernel.)
-        /// </para>
-        /// </param>
-        /// <param name="height">
-        /// <para>
-        /// The number of elements in the pixel array referenced by column. (This is the height of the separable filter kernel.)
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// The format of the pixel data in row and column. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_INTENSITY, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// The type of the pixel data in row and column. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="row">
-        /// <para>
-        /// Pointer to a one-dimensional array of pixel data that is processed to build the row filter kernel.
-        /// </para>
-        /// </param>
-        /// <param name="column">
-        /// <para>
-        /// Pointer to a one-dimensional array of pixel data that is processed to build the column filter kernel.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glSeparableFilter2DEXT")]
-            public static 
-            void SeparableFilter2D<T7>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr row, [InAttribute, OutAttribute] T7[,,] column)
-                where T7 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glSeparableFilter2DEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject());
-                }
-                finally
-                {
-                    column_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Define a separable two-dimensional convolution filter
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Must be GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="internalformat">
-        /// <para>
-        /// The internal format of the convolution filter kernel. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, or GL_RGBA16.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// The number of elements in the pixel array referenced by row. (This is the width of the separable filter kernel.)
-        /// </para>
-        /// </param>
-        /// <param name="height">
-        /// <para>
-        /// The number of elements in the pixel array referenced by column. (This is the height of the separable filter kernel.)
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// The format of the pixel data in row and column. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_INTENSITY, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// The type of the pixel data in row and column. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="row">
-        /// <para>
-        /// Pointer to a one-dimensional array of pixel data that is processed to build the row filter kernel.
-        /// </para>
-        /// </param>
-        /// <param name="column">
-        /// <para>
-        /// Pointer to a one-dimensional array of pixel data that is processed to build the column filter kernel.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glSeparableFilter2DEXT")]
-            public static 
-            void SeparableFilter2D<T7>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr row, [InAttribute, OutAttribute] T7[,] column)
-                where T7 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glSeparableFilter2DEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject());
-                }
-                finally
-                {
-                    column_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Define a separable two-dimensional convolution filter
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Must be GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="internalformat">
-        /// <para>
-        /// The internal format of the convolution filter kernel. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, or GL_RGBA16.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// The number of elements in the pixel array referenced by row. (This is the width of the separable filter kernel.)
-        /// </para>
-        /// </param>
-        /// <param name="height">
-        /// <para>
-        /// The number of elements in the pixel array referenced by column. (This is the height of the separable filter kernel.)
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// The format of the pixel data in row and column. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_INTENSITY, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// The type of the pixel data in row and column. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="row">
-        /// <para>
-        /// Pointer to a one-dimensional array of pixel data that is processed to build the row filter kernel.
-        /// </para>
-        /// </param>
-        /// <param name="column">
-        /// <para>
-        /// Pointer to a one-dimensional array of pixel data that is processed to build the column filter kernel.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glSeparableFilter2DEXT")]
-            public static 
-            void SeparableFilter2D<T7>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr row, [InAttribute, OutAttribute] T7[] column)
-                where T7 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle column_ptr = GCHandle.Alloc(column, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glSeparableFilter2DEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column_ptr.AddrOfPinnedObject());
-                }
-                finally
-                {
-                    column_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Define a separable two-dimensional convolution filter
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Must be GL_SEPARABLE_2D.
-        /// </para>
-        /// </param>
-        /// <param name="internalformat">
-        /// <para>
-        /// The internal format of the convolution filter kernel. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, or GL_RGBA16.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// The number of elements in the pixel array referenced by row. (This is the width of the separable filter kernel.)
-        /// </para>
-        /// </param>
-        /// <param name="height">
-        /// <para>
-        /// The number of elements in the pixel array referenced by column. (This is the height of the separable filter kernel.)
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// The format of the pixel data in row and column. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_INTENSITY, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// The type of the pixel data in row and column. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
-        /// </para>
-        /// </param>
-        /// <param name="row">
-        /// <para>
-        /// Pointer to a one-dimensional array of pixel data that is processed to build the row filter kernel.
-        /// </para>
-        /// </param>
-        /// <param name="column">
-        /// <para>
-        /// Pointer to a one-dimensional array of pixel data that is processed to build the column filter kernel.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glSeparableFilter2DEXT")]
-            public static 
-            void SeparableFilter2D(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr row, IntPtr column)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glSeparableFilter2DEXT((OpenTK.Graphics.OpenGL.ExtConvolution)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)row, (IntPtr)column);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glSetInvariantEXT")]
-            public static 
-            void SetInvariant<T2>(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, [InAttribute, OutAttribute] ref T2 addr)
-                where T2 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle addr_ptr = GCHandle.Alloc(addr, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glSetInvariantEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)type, (IntPtr)addr_ptr.AddrOfPinnedObject());
-                    addr = (T2)addr_ptr.Target;
-                }
-                finally
-                {
-                    addr_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glSetInvariantEXT")]
             public static 
-            void SetInvariant<T2>(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, [InAttribute, OutAttribute] T2[,,] addr)
+            void SetInvariant(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, IntPtr addr)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glSetInvariantEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)type, (IntPtr)addr);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glSetInvariantEXT")]
+            public static 
+            void SetInvariant<T2>(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, [InAttribute, OutAttribute] T2[] addr)
                 where T2 : struct
             {
                 #if DEBUG
@@ -110172,7 +110162,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glSetInvariantEXT")]
             public static 
-            void SetInvariant<T2>(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, [InAttribute, OutAttribute] T2[] addr)
+            void SetInvariant<T2>(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, [InAttribute, OutAttribute] T2[,,] addr)
                 where T2 : struct
             {
                 #if DEBUG
@@ -110195,22 +110185,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glSetInvariantEXT")]
             public static 
-            void SetInvariant(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, IntPtr addr)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glSetInvariantEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)type, (IntPtr)addr);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glSetInvariantEXT")]
-            public static 
-            void SetInvariant<T2>(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, [InAttribute, OutAttribute] ref T2 addr)
+            void SetInvariant<T2>(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, [InAttribute, OutAttribute] ref T2 addr)
                 where T2 : struct
             {
                 #if DEBUG
@@ -110235,7 +110210,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glSetInvariantEXT")]
             public static 
-            void SetInvariant<T2>(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, [InAttribute, OutAttribute] T2[,,] addr)
+            void SetInvariant(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, IntPtr addr)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glSetInvariantEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)type, (IntPtr)addr);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glSetInvariantEXT")]
+            public static 
+            void SetInvariant<T2>(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, [InAttribute, OutAttribute] T2[] addr)
                 where T2 : struct
             {
                 #if DEBUG
@@ -110283,7 +110273,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glSetInvariantEXT")]
             public static 
-            void SetInvariant<T2>(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, [InAttribute, OutAttribute] T2[] addr)
+            void SetInvariant<T2>(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, [InAttribute, OutAttribute] T2[,,] addr)
                 where T2 : struct
             {
                 #if DEBUG
@@ -110307,21 +110297,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glSetInvariantEXT")]
             public static 
-            void SetInvariant(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, IntPtr addr)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glSetInvariantEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)type, (IntPtr)addr);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glSetLocalConstantEXT")]
-            public static 
-            void SetLocalConstant<T2>(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, [InAttribute, OutAttribute] ref T2 addr)
+            void SetInvariant<T2>(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, [InAttribute, OutAttribute] ref T2 addr)
                 where T2 : struct
             {
                 #if DEBUG
@@ -110331,7 +110307,7 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle addr_ptr = GCHandle.Alloc(addr, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glSetLocalConstantEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)type, (IntPtr)addr_ptr.AddrOfPinnedObject());
+                    Delegates.glSetInvariantEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)type, (IntPtr)addr_ptr.AddrOfPinnedObject());
                     addr = (T2)addr_ptr.Target;
                 }
                 finally
@@ -110345,7 +110321,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glSetLocalConstantEXT")]
             public static 
-            void SetLocalConstant<T2>(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, [InAttribute, OutAttribute] T2[,,] addr)
+            void SetLocalConstant(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, IntPtr addr)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glSetLocalConstantEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)type, (IntPtr)addr);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glSetLocalConstantEXT")]
+            public static 
+            void SetLocalConstant<T2>(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, [InAttribute, OutAttribute] T2[] addr)
                 where T2 : struct
             {
                 #if DEBUG
@@ -110391,7 +110381,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glSetLocalConstantEXT")]
             public static 
-            void SetLocalConstant<T2>(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, [InAttribute, OutAttribute] T2[] addr)
+            void SetLocalConstant<T2>(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, [InAttribute, OutAttribute] T2[,,] addr)
                 where T2 : struct
             {
                 #if DEBUG
@@ -110414,22 +110404,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glSetLocalConstantEXT")]
             public static 
-            void SetLocalConstant(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, IntPtr addr)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glSetLocalConstantEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)type, (IntPtr)addr);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glSetLocalConstantEXT")]
-            public static 
-            void SetLocalConstant<T2>(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, [InAttribute, OutAttribute] ref T2 addr)
+            void SetLocalConstant<T2>(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, [InAttribute, OutAttribute] ref T2 addr)
                 where T2 : struct
             {
                 #if DEBUG
@@ -110454,7 +110429,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glSetLocalConstantEXT")]
             public static 
-            void SetLocalConstant<T2>(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, [InAttribute, OutAttribute] T2[,,] addr)
+            void SetLocalConstant(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, IntPtr addr)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glSetLocalConstantEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)type, (IntPtr)addr);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glSetLocalConstantEXT")]
+            public static 
+            void SetLocalConstant<T2>(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, [InAttribute, OutAttribute] T2[] addr)
                 where T2 : struct
             {
                 #if DEBUG
@@ -110502,7 +110492,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glSetLocalConstantEXT")]
             public static 
-            void SetLocalConstant<T2>(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, [InAttribute, OutAttribute] T2[] addr)
+            void SetLocalConstant<T2>(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, [InAttribute, OutAttribute] T2[,,] addr)
                 where T2 : struct
             {
                 #if DEBUG
@@ -110526,13 +110516,23 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glSetLocalConstantEXT")]
             public static 
-            void SetLocalConstant(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, IntPtr addr)
+            void SetLocalConstant<T2>(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, [InAttribute, OutAttribute] ref T2 addr)
+                where T2 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glSetLocalConstantEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)type, (IntPtr)addr);
+                GCHandle addr_ptr = GCHandle.Alloc(addr, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glSetLocalConstantEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)type, (IntPtr)addr_ptr.AddrOfPinnedObject());
+                    addr = (T2)addr_ptr.Target;
+                }
+                finally
+                {
+                    addr_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -110712,21 +110712,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangent3bvEXT")]
-            public static 
-            unsafe void Tangent3(Byte* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glTangent3bvEXT((SByte*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangent3bvEXT")]
             public static 
             void Tangent3(Byte[] v)
@@ -110767,6 +110752,42 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangent3bvEXT")]
+            public static 
+            unsafe void Tangent3(Byte* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTangent3bvEXT((SByte*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangent3bvEXT")]
+            public static 
+            void Tangent3(SByte[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (SByte* v_ptr = v)
+                    {
+                        Delegates.glTangent3bvEXT((SByte*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangent3bvEXT")]
             public static 
@@ -110803,27 +110824,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangent3bvEXT")]
-            public static 
-            void Tangent3(SByte[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (SByte* v_ptr = v)
-                    {
-                        Delegates.glTangent3bvEXT((SByte*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangent3dEXT")]
             public static 
             void Tangent3(Double tx, Double ty, Double tz)
@@ -110838,21 +110838,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangent3dvEXT")]
-            public static 
-            unsafe void Tangent3(Double* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glTangent3dvEXT((Double*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangent3dvEXT")]
             public static 
             void Tangent3(Double[] v)
@@ -110893,6 +110878,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangent3dvEXT")]
+            public static 
+            unsafe void Tangent3(Double* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTangent3dvEXT((Double*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangent3fEXT")]
             public static 
             void Tangent3(Single tx, Single ty, Single tz)
@@ -110907,6 +110907,26 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangent3fvEXT")]
+            public static 
+            void Tangent3(Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glTangent3fvEXT((Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangent3fvEXT")]
             public static 
             void Tangent3(ref Single v)
@@ -110942,26 +110962,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangent3fvEXT")]
-            public static 
-            void Tangent3(Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glTangent3fvEXT((Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangent3iEXT")]
             public static 
             void Tangent3(Int32 tx, Int32 ty, Int32 tz)
@@ -110976,21 +110976,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangent3ivEXT")]
-            public static 
-            unsafe void Tangent3(Int32* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glTangent3ivEXT((Int32*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangent3ivEXT")]
             public static 
             void Tangent3(Int32[] v)
@@ -111031,6 +111016,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangent3ivEXT")]
+            public static 
+            unsafe void Tangent3(Int32* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTangent3ivEXT((Int32*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangent3sEXT")]
             public static 
             void Tangent3(Int16 tx, Int16 ty, Int16 tz)
@@ -111045,21 +111045,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangent3svEXT")]
-            public static 
-            unsafe void Tangent3(Int16* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glTangent3svEXT((Int16*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangent3svEXT")]
             public static 
             void Tangent3(Int16[] v)
@@ -111100,25 +111085,16 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangentPointerEXT")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangent3svEXT")]
             public static 
-            void TangentPointer<T2>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T2 pointer)
-                where T2 : struct
+            unsafe void Tangent3(Int16* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glTangentPointerEXT((OpenTK.Graphics.OpenGL.NormalPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                    pointer = (T2)pointer_ptr.Target;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
+                Delegates.glTangent3svEXT((Int16*)v);
                 #if DEBUG
                 }
                 #endif
@@ -111126,7 +111102,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangentPointerEXT")]
             public static 
-            void TangentPointer<T2>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, [InAttribute, OutAttribute] T2[,,] pointer)
+            void TangentPointer(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, IntPtr pointer)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTangentPointerEXT((OpenTK.Graphics.OpenGL.NormalPointerType)type, (Int32)stride, (IntPtr)pointer);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangentPointerEXT")]
+            public static 
+            void TangentPointer<T2>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, [InAttribute, OutAttribute] T2[] pointer)
                 where T2 : struct
             {
                 #if DEBUG
@@ -111172,7 +111162,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangentPointerEXT")]
             public static 
-            void TangentPointer<T2>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, [InAttribute, OutAttribute] T2[] pointer)
+            void TangentPointer<T2>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, [InAttribute, OutAttribute] T2[,,] pointer)
                 where T2 : struct
             {
                 #if DEBUG
@@ -111195,13 +111185,23 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtCoordinateFrame", Version = "1.1", EntryPoint = "glTangentPointerEXT")]
             public static 
-            void TangentPointer(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, IntPtr pointer)
+            void TangentPointer<T2>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T2 pointer)
+                where T2 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glTangentPointerEXT((OpenTK.Graphics.OpenGL.NormalPointerType)type, (Int32)stride, (IntPtr)pointer);
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glTangentPointerEXT((OpenTK.Graphics.OpenGL.NormalPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    pointer = (T2)pointer_ptr.Target;
+                }
+                finally
+                {
+                    pointer_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -111262,23 +111262,13 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtVertexArray", Version = "1.0", EntryPoint = "glTexCoordPointerEXT")]
             public static 
-            void TexCoordPointer<T4>(Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] ref T4 pointer)
-                where T4 : struct
+            void TexCoordPointer(Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, Int32 count, IntPtr pointer)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glTexCoordPointerEXT((Int32)size, (OpenTK.Graphics.OpenGL.TexCoordPointerType)type, (Int32)stride, (Int32)count, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                    pointer = (T4)pointer_ptr.Target;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
+                Delegates.glTexCoordPointerEXT((Int32)size, (OpenTK.Graphics.OpenGL.TexCoordPointerType)type, (Int32)stride, (Int32)count, (IntPtr)pointer);
                 #if DEBUG
                 }
                 #endif
@@ -111310,7 +111300,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtVertexArray", Version = "1.0", EntryPoint = "glTexCoordPointerEXT")]
             public static 
-            void TexCoordPointer<T4>(Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] T4[,,] pointer)
+            void TexCoordPointer<T4>(Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] T4[] pointer)
                 where T4 : struct
             {
                 #if DEBUG
@@ -111404,7 +111394,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtVertexArray", Version = "1.0", EntryPoint = "glTexCoordPointerEXT")]
             public static 
-            void TexCoordPointer<T4>(Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] T4[] pointer)
+            void TexCoordPointer<T4>(Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] T4[,,] pointer)
                 where T4 : struct
             {
                 #if DEBUG
@@ -111451,90 +111441,22 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtVertexArray", Version = "1.0", EntryPoint = "glTexCoordPointerEXT")]
             public static 
-            void TexCoordPointer(Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, Int32 count, IntPtr pointer)
+            void TexCoordPointer<T4>(Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] ref T4 pointer)
+                where T4 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glTexCoordPointerEXT((Int32)size, (OpenTK.Graphics.OpenGL.TexCoordPointerType)type, (Int32)stride, (Int32)count, (IntPtr)pointer);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Specify a three-dimensional texture image
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target texture. Must be GL_TEXTURE_3D or GL_PROXY_TEXTURE_3D.
-        /// </para>
-        /// </param>
-        /// <param name="level">
-        /// <para>
-        /// Specifies the level-of-detail number. Level 0 is the base image level. Level is the n sup th mipmap reduction image.
-        /// </para>
-        /// </param>
-        /// <param name="internalFormat">
-        /// <para>
-        /// Specifies the number of color components in the texture. Must be 1, 2, 3, or 4, or one of the following symbolic constants: GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_COMPRESSED_ALPHA, GL_COMPRESSED_LUMINANCE, GL_COMPRESSED_LUMINANCE_ALPHA, GL_COMPRESSED_INTENSITY, GL_COMPRESSED_RGB, GL_COMPRESSED_RGBA, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, GL_RGBA16, GL_SLUMINANCE, GL_SLUMINANCE8, GL_SLUMINANCE_ALPHA, GL_SLUMINANCE8_ALPHA8, GL_SRGB, GL_SRGB8, GL_SRGB_ALPHA, or GL_SRGB8_ALPHA8.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// Specifies the width of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup n + 2 ( border ) for some integer . All implementations support 3D texture images that are at least 16 texels wide.
-        /// </para>
-        /// </param>
-        /// <param name="height">
-        /// <para>
-        /// Specifies the height of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup m + 2 ( border ) for some integer . All implementations support 3D texture images that are at least 16 texels high.
-        /// </para>
-        /// </param>
-        /// <param name="depth">
-        /// <para>
-        /// Specifies the depth of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup k + 2 ( border ) for some integer . All implementations support 3D texture images that are at least 16 texels deep.
-        /// </para>
-        /// </param>
-        /// <param name="border">
-        /// <para>
-        /// Specifies the width of the border. Must be either 0 or 1.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Specifies the format of the pixel data. The following symbolic values are accepted: GL_COLOR_INDEX, GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the data type of the pixel data. The following symbolic values are accepted: GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the image data in memory.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtTexture3D", Version = "1.0", EntryPoint = "glTexImage3DEXT")]
-            public static 
-            void TexImage3D<T9>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T9 pixels)
-                where T9 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glTexImage3DEXT((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                    pixels = (T9)pixels_ptr.Target;
+                    Delegates.glTexCoordPointerEXT((Int32)size, (OpenTK.Graphics.OpenGL.TexCoordPointerType)type, (Int32)stride, (Int32)count, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    pointer = (T4)pointer_ptr.Target;
                 }
                 finally
                 {
-                    pixels_ptr.Free();
+                    pointer_ptr.Free();
                 }
                 #if DEBUG
                 }
@@ -111597,7 +111519,75 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtTexture3D", Version = "1.0", EntryPoint = "glTexImage3DEXT")]
             public static 
-            void TexImage3D<T9>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[,,] pixels)
+            void TexImage3D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTexImage3DEXT((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Specify a three-dimensional texture image
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target texture. Must be GL_TEXTURE_3D or GL_PROXY_TEXTURE_3D.
+        /// </para>
+        /// </param>
+        /// <param name="level">
+        /// <para>
+        /// Specifies the level-of-detail number. Level 0 is the base image level. Level is the n sup th mipmap reduction image.
+        /// </para>
+        /// </param>
+        /// <param name="internalFormat">
+        /// <para>
+        /// Specifies the number of color components in the texture. Must be 1, 2, 3, or 4, or one of the following symbolic constants: GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_COMPRESSED_ALPHA, GL_COMPRESSED_LUMINANCE, GL_COMPRESSED_LUMINANCE_ALPHA, GL_COMPRESSED_INTENSITY, GL_COMPRESSED_RGB, GL_COMPRESSED_RGBA, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, GL_RGBA16, GL_SLUMINANCE, GL_SLUMINANCE8, GL_SLUMINANCE_ALPHA, GL_SLUMINANCE8_ALPHA8, GL_SRGB, GL_SRGB8, GL_SRGB_ALPHA, or GL_SRGB8_ALPHA8.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// Specifies the width of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup n + 2 ( border ) for some integer . All implementations support 3D texture images that are at least 16 texels wide.
+        /// </para>
+        /// </param>
+        /// <param name="height">
+        /// <para>
+        /// Specifies the height of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup m + 2 ( border ) for some integer . All implementations support 3D texture images that are at least 16 texels high.
+        /// </para>
+        /// </param>
+        /// <param name="depth">
+        /// <para>
+        /// Specifies the depth of the texture image including the border if any. If the GL version does not support non-power-of-two sizes, this value must be 2 sup k + 2 ( border ) for some integer . All implementations support 3D texture images that are at least 16 texels deep.
+        /// </para>
+        /// </param>
+        /// <param name="border">
+        /// <para>
+        /// Specifies the width of the border. Must be either 0 or 1.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Specifies the format of the pixel data. The following symbolic values are accepted: GL_COLOR_INDEX, GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the data type of the pixel data. The following symbolic values are accepted: GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the image data in memory.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtTexture3D", Version = "1.0", EntryPoint = "glTexImage3DEXT")]
+            public static 
+            void TexImage3D<T9>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[] pixels)
                 where T9 : struct
             {
                 #if DEBUG
@@ -111751,7 +111741,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtTexture3D", Version = "1.0", EntryPoint = "glTexImage3DEXT")]
             public static 
-            void TexImage3D<T9>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[] pixels)
+            void TexImage3D<T9>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[,,] pixels)
                 where T9 : struct
             {
                 #if DEBUG
@@ -111828,28 +111818,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtTexture3D", Version = "1.0", EntryPoint = "glTexImage3DEXT")]
             public static 
-            void TexImage3D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+            void TexImage3D<T9>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T9 pixels)
+                where T9 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glTexImage3DEXT((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
-                #if DEBUG
+                GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glTexImage3DEXT((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    pixels = (T9)pixels_ptr.Target;
                 }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtTextureInteger", Version = "2.0", EntryPoint = "glTexParameterIivEXT")]
-            public static 
-            unsafe void TexParameterI(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                finally
                 {
-                #endif
-                Delegates.glTexParameterIivEXT((OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.TextureParameterName)pname, (Int32*)@params);
+                    pixels_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -111895,6 +111880,42 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtTextureInteger", Version = "2.0", EntryPoint = "glTexParameterIivEXT")]
+            public static 
+            unsafe void TexParameterI(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTexParameterIivEXT((OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.TextureParameterName)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtTextureInteger", Version = "2.0", EntryPoint = "glTexParameterIuivEXT")]
+            public static 
+            void TexParameterI(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, UInt32[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* @params_ptr = @params)
+                    {
+                        Delegates.glTexParameterIuivEXT((OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.TextureParameterName)pname, (UInt32*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtTextureInteger", Version = "2.0", EntryPoint = "glTexParameterIuivEXT")]
             public static 
@@ -111931,22 +111952,54 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtTextureInteger", Version = "2.0", EntryPoint = "glTexParameterIuivEXT")]
+            
+        /// <summary>
+        /// Specify a one-dimensional texture subimage
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target texture. Must be GL_TEXTURE_1D.
+        /// </para>
+        /// </param>
+        /// <param name="level">
+        /// <para>
+        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
+        /// </para>
+        /// </param>
+        /// <param name="xoffset">
+        /// <para>
+        /// Specifies a texel offset in the x direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// Specifies the width of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Specifies the format of the pixel data. The following symbolic values are accepted: GL_COLOR_INDEX, GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the data type of the pixel data. The following symbolic values are accepted: GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the image data in memory.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtSubtexture", Version = "1.0", EntryPoint = "glTexSubImage1DEXT")]
             public static 
-            void TexParameterI(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, UInt32[] @params)
+            void TexSubImage1D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                unsafe
-                {
-                    fixed (UInt32* @params_ptr = @params)
-                    {
-                        Delegates.glTexParameterIuivEXT((OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.TextureParameterName)pname, (UInt32*)@params_ptr);
-                    }
-                }
+                Delegates.glTexSubImage1DEXT((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
                 #if DEBUG
                 }
                 #endif
@@ -111993,70 +112046,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtSubtexture", Version = "1.0", EntryPoint = "glTexSubImage1DEXT")]
             public static 
-            void TexSubImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T6 pixels)
-                where T6 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glTexSubImage1DEXT((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                    pixels = (T6)pixels_ptr.Target;
-                }
-                finally
-                {
-                    pixels_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Specify a one-dimensional texture subimage
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target texture. Must be GL_TEXTURE_1D.
-        /// </para>
-        /// </param>
-        /// <param name="level">
-        /// <para>
-        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
-        /// </para>
-        /// </param>
-        /// <param name="xoffset">
-        /// <para>
-        /// Specifies a texel offset in the x direction within the texture array.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// Specifies the width of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Specifies the format of the pixel data. The following symbolic values are accepted: GL_COLOR_INDEX, GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the data type of the pixel data. The following symbolic values are accepted: GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the image data in memory.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtSubtexture", Version = "1.0", EntryPoint = "glTexSubImage1DEXT")]
-            public static 
-            void TexSubImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[,,] pixels)
+            void TexSubImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[] pixels)
                 where T6 : struct
             {
                 #if DEBUG
@@ -112180,7 +112170,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtSubtexture", Version = "1.0", EntryPoint = "glTexSubImage1DEXT")]
             public static 
-            void TexSubImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[] pixels)
+            void TexSubImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[,,] pixels)
                 where T6 : struct
             {
                 #if DEBUG
@@ -112242,71 +112232,8 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtSubtexture", Version = "1.0", EntryPoint = "glTexSubImage1DEXT")]
             public static 
-            void TexSubImage1D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glTexSubImage1DEXT((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Specify a two-dimensional texture subimage
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target texture. Must be GL_TEXTURE_2D, GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, or GL_TEXTURE_CUBE_MAP_NEGATIVE_Z.
-        /// </para>
-        /// </param>
-        /// <param name="level">
-        /// <para>
-        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
-        /// </para>
-        /// </param>
-        /// <param name="xoffset">
-        /// <para>
-        /// Specifies a texel offset in the x direction within the texture array.
-        /// </para>
-        /// </param>
-        /// <param name="yoffset">
-        /// <para>
-        /// Specifies a texel offset in the y direction within the texture array.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// Specifies the width of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="height">
-        /// <para>
-        /// Specifies the height of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Specifies the format of the pixel data. The following symbolic values are accepted: GL_COLOR_INDEX, GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the data type of the pixel data. The following symbolic values are accepted: GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the image data in memory.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtSubtexture", Version = "1.0", EntryPoint = "glTexSubImage2DEXT")]
-            public static 
-            void TexSubImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T8 pixels)
-                where T8 : struct
+            void TexSubImage1D<T6>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T6 pixels)
+                where T6 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -112315,8 +112242,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glTexSubImage2DEXT((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                    pixels = (T8)pixels_ptr.Target;
+                    Delegates.glTexSubImage1DEXT((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    pixels = (T6)pixels_ptr.Target;
                 }
                 finally
                 {
@@ -112378,7 +112305,70 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtSubtexture", Version = "1.0", EntryPoint = "glTexSubImage2DEXT")]
             public static 
-            void TexSubImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T8[,,] pixels)
+            void TexSubImage2D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTexSubImage2DEXT((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Specify a two-dimensional texture subimage
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target texture. Must be GL_TEXTURE_2D, GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, GL_TEXTURE_CUBE_MAP_POSITIVE_Z, or GL_TEXTURE_CUBE_MAP_NEGATIVE_Z.
+        /// </para>
+        /// </param>
+        /// <param name="level">
+        /// <para>
+        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
+        /// </para>
+        /// </param>
+        /// <param name="xoffset">
+        /// <para>
+        /// Specifies a texel offset in the x direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="yoffset">
+        /// <para>
+        /// Specifies a texel offset in the y direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// Specifies the width of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="height">
+        /// <para>
+        /// Specifies the height of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Specifies the format of the pixel data. The following symbolic values are accepted: GL_COLOR_INDEX, GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the data type of the pixel data. The following symbolic values are accepted: GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the image data in memory.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtSubtexture", Version = "1.0", EntryPoint = "glTexSubImage2DEXT")]
+            public static 
+            void TexSubImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T8[] pixels)
                 where T8 : struct
             {
                 #if DEBUG
@@ -112522,7 +112512,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtSubtexture", Version = "1.0", EntryPoint = "glTexSubImage2DEXT")]
             public static 
-            void TexSubImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T8[] pixels)
+            void TexSubImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T8[,,] pixels)
                 where T8 : struct
             {
                 #if DEBUG
@@ -112594,81 +112584,8 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtSubtexture", Version = "1.0", EntryPoint = "glTexSubImage2DEXT")]
             public static 
-            void TexSubImage2D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glTexSubImage2DEXT((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Specify a three-dimensional texture subimage
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// Specifies the target texture. Must be GL_TEXTURE_3D.
-        /// </para>
-        /// </param>
-        /// <param name="level">
-        /// <para>
-        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
-        /// </para>
-        /// </param>
-        /// <param name="xoffset">
-        /// <para>
-        /// Specifies a texel offset in the x direction within the texture array.
-        /// </para>
-        /// </param>
-        /// <param name="yoffset">
-        /// <para>
-        /// Specifies a texel offset in the y direction within the texture array.
-        /// </para>
-        /// </param>
-        /// <param name="zoffset">
-        /// <para>
-        /// Specifies a texel offset in the z direction within the texture array.
-        /// </para>
-        /// </param>
-        /// <param name="width">
-        /// <para>
-        /// Specifies the width of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="height">
-        /// <para>
-        /// Specifies the height of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="depth">
-        /// <para>
-        /// Specifies the depth of the texture subimage.
-        /// </para>
-        /// </param>
-        /// <param name="format">
-        /// <para>
-        /// Specifies the format of the pixel data. The following symbolic values are accepted: GL_COLOR_INDEX, GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the data type of the pixel data. The following symbolic values are accepted: GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Specifies a pointer to the image data in memory.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtTexture3D", Version = "1.0", EntryPoint = "glTexSubImage3DEXT")]
-            public static 
-            void TexSubImage3D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T10 pixels)
-                where T10 : struct
+            void TexSubImage2D<T8>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T8 pixels)
+                where T8 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -112677,8 +112594,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glTexSubImage3DEXT((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                    pixels = (T10)pixels_ptr.Target;
+                    Delegates.glTexSubImage2DEXT((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    pixels = (T8)pixels_ptr.Target;
                 }
                 finally
                 {
@@ -112750,7 +112667,80 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtTexture3D", Version = "1.0", EntryPoint = "glTexSubImage3DEXT")]
             public static 
-            void TexSubImage3D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T10[,,] pixels)
+            void TexSubImage3D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTexSubImage3DEXT((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Specify a three-dimensional texture subimage
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Specifies the target texture. Must be GL_TEXTURE_3D.
+        /// </para>
+        /// </param>
+        /// <param name="level">
+        /// <para>
+        /// Specifies the level-of-detail number. Level 0 is the base image level. Level n is the nth mipmap reduction image.
+        /// </para>
+        /// </param>
+        /// <param name="xoffset">
+        /// <para>
+        /// Specifies a texel offset in the x direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="yoffset">
+        /// <para>
+        /// Specifies a texel offset in the y direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="zoffset">
+        /// <para>
+        /// Specifies a texel offset in the z direction within the texture array.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// Specifies the width of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="height">
+        /// <para>
+        /// Specifies the height of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="depth">
+        /// <para>
+        /// Specifies the depth of the texture subimage.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// Specifies the format of the pixel data. The following symbolic values are accepted: GL_COLOR_INDEX, GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RGB, GL_BGR, GL_RGBA, GL_BGRA, GL_LUMINANCE, and GL_LUMINANCE_ALPHA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the data type of the pixel data. The following symbolic values are accepted: GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Specifies a pointer to the image data in memory.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtTexture3D", Version = "1.0", EntryPoint = "glTexSubImage3DEXT")]
+            public static 
+            void TexSubImage3D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T10[] pixels)
                 where T10 : struct
             {
                 #if DEBUG
@@ -112914,7 +112904,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtTexture3D", Version = "1.0", EntryPoint = "glTexSubImage3DEXT")]
             public static 
-            void TexSubImage3D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T10[] pixels)
+            void TexSubImage3D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T10[,,] pixels)
                 where T10 : struct
             {
                 #if DEBUG
@@ -112996,13 +112986,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtTexture3D", Version = "1.0", EntryPoint = "glTexSubImage3DEXT")]
             public static 
-            void TexSubImage3D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+            void TexSubImage3D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T10 pixels)
+                where T10 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glTexSubImage3DEXT((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+                GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glTexSubImage3DEXT((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    pixels = (T10)pixels_ptr.Target;
+                }
+                finally
+                {
+                    pixels_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -113039,23 +113039,13 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureImage1DEXT")]
             public static 
-            void TextureImage1D<T8>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T8 pixels)
-                where T8 : struct
+            void TextureImage1D(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glTextureImage1DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                    pixels = (T8)pixels_ptr.Target;
-                }
-                finally
-                {
-                    pixels_ptr.Free();
-                }
+                Delegates.glTextureImage1DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
                 #if DEBUG
                 }
                 #endif
@@ -113063,7 +113053,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureImage1DEXT")]
             public static 
-            void TextureImage1D<T8>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T8[,,] pixels)
+            void TextureImage1D<T8>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T8[] pixels)
                 where T8 : struct
             {
                 #if DEBUG
@@ -113109,7 +113099,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureImage1DEXT")]
             public static 
-            void TextureImage1D<T8>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T8[] pixels)
+            void TextureImage1D<T8>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T8[,,] pixels)
                 where T8 : struct
             {
                 #if DEBUG
@@ -113132,22 +113122,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureImage1DEXT")]
             public static 
-            void TextureImage1D(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glTextureImage1DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureImage1DEXT")]
-            public static 
-            void TextureImage1D<T8>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T8 pixels)
+            void TextureImage1D<T8>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T8 pixels)
                 where T8 : struct
             {
                 #if DEBUG
@@ -113172,7 +113147,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureImage1DEXT")]
             public static 
-            void TextureImage1D<T8>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T8[,,] pixels)
+            void TextureImage1D(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTextureImage1DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureImage1DEXT")]
+            public static 
+            void TextureImage1D<T8>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T8[] pixels)
                 where T8 : struct
             {
                 #if DEBUG
@@ -113220,7 +113210,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureImage1DEXT")]
             public static 
-            void TextureImage1D<T8>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T8[] pixels)
+            void TextureImage1D<T8>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T8[,,] pixels)
                 where T8 : struct
             {
                 #if DEBUG
@@ -113244,22 +113234,8 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureImage1DEXT")]
             public static 
-            void TextureImage1D(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glTextureImage1DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureImage2DEXT")]
-            public static 
-            void TextureImage2D<T9>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T9 pixels)
-                where T9 : struct
+            void TextureImage1D<T8>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T8 pixels)
+                where T8 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -113268,8 +113244,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glTextureImage2DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                    pixels = (T9)pixels_ptr.Target;
+                    Delegates.glTextureImage1DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    pixels = (T8)pixels_ptr.Target;
                 }
                 finally
                 {
@@ -113282,7 +113258,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureImage2DEXT")]
             public static 
-            void TextureImage2D<T9>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[,,] pixels)
+            void TextureImage2D(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTextureImage2DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureImage2DEXT")]
+            public static 
+            void TextureImage2D<T9>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[] pixels)
                 where T9 : struct
             {
                 #if DEBUG
@@ -113328,7 +113318,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureImage2DEXT")]
             public static 
-            void TextureImage2D<T9>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[] pixels)
+            void TextureImage2D<T9>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[,,] pixels)
                 where T9 : struct
             {
                 #if DEBUG
@@ -113351,22 +113341,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureImage2DEXT")]
             public static 
-            void TextureImage2D(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glTextureImage2DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureImage2DEXT")]
-            public static 
-            void TextureImage2D<T9>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T9 pixels)
+            void TextureImage2D<T9>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T9 pixels)
                 where T9 : struct
             {
                 #if DEBUG
@@ -113391,7 +113366,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureImage2DEXT")]
             public static 
-            void TextureImage2D<T9>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[,,] pixels)
+            void TextureImage2D(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTextureImage2DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureImage2DEXT")]
+            public static 
+            void TextureImage2D<T9>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[] pixels)
                 where T9 : struct
             {
                 #if DEBUG
@@ -113439,7 +113429,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureImage2DEXT")]
             public static 
-            void TextureImage2D<T9>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[] pixels)
+            void TextureImage2D<T9>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[,,] pixels)
                 where T9 : struct
             {
                 #if DEBUG
@@ -113463,22 +113453,8 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureImage2DEXT")]
             public static 
-            void TextureImage2D(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glTextureImage2DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureImage3DEXT")]
-            public static 
-            void TextureImage3D<T10>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T10 pixels)
-                where T10 : struct
+            void TextureImage2D<T9>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T9 pixels)
+                where T9 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -113487,8 +113463,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glTextureImage3DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                    pixels = (T10)pixels_ptr.Target;
+                    Delegates.glTextureImage2DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    pixels = (T9)pixels_ptr.Target;
                 }
                 finally
                 {
@@ -113501,7 +113477,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureImage3DEXT")]
             public static 
-            void TextureImage3D<T10>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T10[,,] pixels)
+            void TextureImage3D(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTextureImage3DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureImage3DEXT")]
+            public static 
+            void TextureImage3D<T10>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T10[] pixels)
                 where T10 : struct
             {
                 #if DEBUG
@@ -113547,7 +113537,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureImage3DEXT")]
             public static 
-            void TextureImage3D<T10>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T10[] pixels)
+            void TextureImage3D<T10>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T10[,,] pixels)
                 where T10 : struct
             {
                 #if DEBUG
@@ -113570,22 +113560,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureImage3DEXT")]
             public static 
-            void TextureImage3D(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glTextureImage3DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureImage3DEXT")]
-            public static 
-            void TextureImage3D<T10>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T10 pixels)
+            void TextureImage3D<T10>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T10 pixels)
                 where T10 : struct
             {
                 #if DEBUG
@@ -113610,7 +113585,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureImage3DEXT")]
             public static 
-            void TextureImage3D<T10>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T10[,,] pixels)
+            void TextureImage3D(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTextureImage3DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureImage3DEXT")]
+            public static 
+            void TextureImage3D<T10>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T10[] pixels)
                 where T10 : struct
             {
                 #if DEBUG
@@ -113658,7 +113648,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureImage3DEXT")]
             public static 
-            void TextureImage3D<T10>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T10[] pixels)
+            void TextureImage3D<T10>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T10[,,] pixels)
                 where T10 : struct
             {
                 #if DEBUG
@@ -113682,13 +113672,23 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureImage3DEXT")]
             public static 
-            void TextureImage3D(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+            void TextureImage3D<T10>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, Int32 width, Int32 height, Int32 depth, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T10 pixels)
+                where T10 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glTextureImage3DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+                GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glTextureImage3DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.ExtDirectStateAccess)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    pixels = (T10)pixels_ptr.Target;
+                }
+                finally
+                {
+                    pixels_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -113765,21 +113765,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureParameterfvEXT")]
-            public static 
-            unsafe void TextureParameter(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Single* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glTextureParameterfvEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.TextureParameterName)pname, (Single*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureParameterfvEXT")]
             public static 
             void TextureParameter(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Single[] @params)
@@ -113803,7 +113788,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureParameterfvEXT")]
             public static 
-            unsafe void TextureParameter(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Single* @params)
+            unsafe void TextureParameter(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Single* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -113836,6 +113821,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureParameterfvEXT")]
+            public static 
+            unsafe void TextureParameter(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Single* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTextureParameterfvEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.TextureParameterName)pname, (Single*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureParameteriEXT")]
             public static 
             void TextureParameter(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Int32 param)
@@ -113865,21 +113865,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureParameterIivEXT")]
-            public static 
-            unsafe void TextureParameterI(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glTextureParameterIivEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.TextureParameterName)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureParameterIivEXT")]
             public static 
             void TextureParameterI(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Int32[] @params)
@@ -113923,7 +113908,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureParameterIivEXT")]
             public static 
-            unsafe void TextureParameterI(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Int32* @params)
+            unsafe void TextureParameterI(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -113977,6 +113962,42 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureParameterIivEXT")]
+            public static 
+            unsafe void TextureParameterI(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTextureParameterIivEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.TextureParameterName)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureParameterIuivEXT")]
+            public static 
+            void TextureParameterI(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, UInt32[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* @params_ptr = @params)
+                    {
+                        Delegates.glTextureParameterIuivEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.TextureParameterName)pname, (UInt32*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureParameterIuivEXT")]
             public static 
@@ -114013,42 +114034,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureParameterIuivEXT")]
-            public static 
-            void TextureParameterI(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, UInt32[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* @params_ptr = @params)
-                    {
-                        Delegates.glTextureParameterIuivEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.TextureParameterName)pname, (UInt32*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureParameterivEXT")]
-            public static 
-            unsafe void TextureParameter(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glTextureParameterivEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.TextureParameterName)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureParameterivEXT")]
             public static 
             void TextureParameter(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Int32[] @params)
@@ -114072,7 +114057,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureParameterivEXT")]
             public static 
-            unsafe void TextureParameter(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Int32* @params)
+            unsafe void TextureParameter(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -114105,6 +114090,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureParameterivEXT")]
+            public static 
+            unsafe void TextureParameter(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.TextureParameterName pname, Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTextureParameterivEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.TextureParameterName)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureRenderbufferEXT")]
             public static 
             void TextureRenderbuffer(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 renderbuffer)
@@ -114136,23 +114136,13 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureSubImage1DEXT")]
             public static 
-            void TextureSubImage1D<T7>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T7 pixels)
-                where T7 : struct
+            void TextureSubImage1D(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glTextureSubImage1DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                    pixels = (T7)pixels_ptr.Target;
-                }
-                finally
-                {
-                    pixels_ptr.Free();
-                }
+                Delegates.glTextureSubImage1DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
                 #if DEBUG
                 }
                 #endif
@@ -114160,7 +114150,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureSubImage1DEXT")]
             public static 
-            void TextureSubImage1D<T7>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T7[,,] pixels)
+            void TextureSubImage1D<T7>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T7[] pixels)
                 where T7 : struct
             {
                 #if DEBUG
@@ -114206,7 +114196,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureSubImage1DEXT")]
             public static 
-            void TextureSubImage1D<T7>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T7[] pixels)
+            void TextureSubImage1D<T7>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T7[,,] pixels)
                 where T7 : struct
             {
                 #if DEBUG
@@ -114229,22 +114219,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureSubImage1DEXT")]
             public static 
-            void TextureSubImage1D(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glTextureSubImage1DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureSubImage1DEXT")]
-            public static 
-            void TextureSubImage1D<T7>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T7 pixels)
+            void TextureSubImage1D<T7>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T7 pixels)
                 where T7 : struct
             {
                 #if DEBUG
@@ -114269,7 +114244,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureSubImage1DEXT")]
             public static 
-            void TextureSubImage1D<T7>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T7[,,] pixels)
+            void TextureSubImage1D(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTextureSubImage1DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureSubImage1DEXT")]
+            public static 
+            void TextureSubImage1D<T7>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T7[] pixels)
                 where T7 : struct
             {
                 #if DEBUG
@@ -114317,7 +114307,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureSubImage1DEXT")]
             public static 
-            void TextureSubImage1D<T7>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T7[] pixels)
+            void TextureSubImage1D<T7>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T7[,,] pixels)
                 where T7 : struct
             {
                 #if DEBUG
@@ -114341,22 +114331,8 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureSubImage1DEXT")]
             public static 
-            void TextureSubImage1D(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glTextureSubImage1DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureSubImage2DEXT")]
-            public static 
-            void TextureSubImage2D<T9>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T9 pixels)
-                where T9 : struct
+            void TextureSubImage1D<T7>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T7 pixels)
+                where T7 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -114365,8 +114341,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glTextureSubImage2DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                    pixels = (T9)pixels_ptr.Target;
+                    Delegates.glTextureSubImage1DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    pixels = (T7)pixels_ptr.Target;
                 }
                 finally
                 {
@@ -114379,7 +114355,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureSubImage2DEXT")]
             public static 
-            void TextureSubImage2D<T9>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[,,] pixels)
+            void TextureSubImage2D(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTextureSubImage2DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureSubImage2DEXT")]
+            public static 
+            void TextureSubImage2D<T9>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[] pixels)
                 where T9 : struct
             {
                 #if DEBUG
@@ -114425,7 +114415,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureSubImage2DEXT")]
             public static 
-            void TextureSubImage2D<T9>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[] pixels)
+            void TextureSubImage2D<T9>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[,,] pixels)
                 where T9 : struct
             {
                 #if DEBUG
@@ -114448,22 +114438,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureSubImage2DEXT")]
             public static 
-            void TextureSubImage2D(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glTextureSubImage2DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureSubImage2DEXT")]
-            public static 
-            void TextureSubImage2D<T9>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T9 pixels)
+            void TextureSubImage2D<T9>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T9 pixels)
                 where T9 : struct
             {
                 #if DEBUG
@@ -114488,7 +114463,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureSubImage2DEXT")]
             public static 
-            void TextureSubImage2D<T9>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[,,] pixels)
+            void TextureSubImage2D(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTextureSubImage2DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureSubImage2DEXT")]
+            public static 
+            void TextureSubImage2D<T9>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[] pixels)
                 where T9 : struct
             {
                 #if DEBUG
@@ -114536,7 +114526,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureSubImage2DEXT")]
             public static 
-            void TextureSubImage2D<T9>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[] pixels)
+            void TextureSubImage2D<T9>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T9[,,] pixels)
                 where T9 : struct
             {
                 #if DEBUG
@@ -114560,22 +114550,8 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureSubImage2DEXT")]
             public static 
-            void TextureSubImage2D(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glTextureSubImage2DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureSubImage3DEXT")]
-            public static 
-            void TextureSubImage3D<T11>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T11 pixels)
-                where T11 : struct
+            void TextureSubImage2D<T9>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T9 pixels)
+                where T9 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -114584,8 +114560,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glTextureSubImage3DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                    pixels = (T11)pixels_ptr.Target;
+                    Delegates.glTextureSubImage2DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)width, (Int32)height, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    pixels = (T9)pixels_ptr.Target;
                 }
                 finally
                 {
@@ -114598,7 +114574,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureSubImage3DEXT")]
             public static 
-            void TextureSubImage3D<T11>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T11[,,] pixels)
+            void TextureSubImage3D(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTextureSubImage3DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureSubImage3DEXT")]
+            public static 
+            void TextureSubImage3D<T11>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T11[] pixels)
                 where T11 : struct
             {
                 #if DEBUG
@@ -114644,7 +114634,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureSubImage3DEXT")]
             public static 
-            void TextureSubImage3D<T11>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T11[] pixels)
+            void TextureSubImage3D<T11>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T11[,,] pixels)
                 where T11 : struct
             {
                 #if DEBUG
@@ -114667,22 +114657,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureSubImage3DEXT")]
             public static 
-            void TextureSubImage3D(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glTextureSubImage3DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureSubImage3DEXT")]
-            public static 
-            void TextureSubImage3D<T11>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T11 pixels)
+            void TextureSubImage3D<T11>(Int32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T11 pixels)
                 where T11 : struct
             {
                 #if DEBUG
@@ -114707,7 +114682,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureSubImage3DEXT")]
             public static 
-            void TextureSubImage3D<T11>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T11[,,] pixels)
+            void TextureSubImage3D(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTextureSubImage3DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureSubImage3DEXT")]
+            public static 
+            void TextureSubImage3D<T11>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T11[] pixels)
                 where T11 : struct
             {
                 #if DEBUG
@@ -114755,7 +114745,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureSubImage3DEXT")]
             public static 
-            void TextureSubImage3D<T11>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T11[] pixels)
+            void TextureSubImage3D<T11>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T11[,,] pixels)
                 where T11 : struct
             {
                 #if DEBUG
@@ -114779,13 +114769,23 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtDirectStateAccess", Version = "", EntryPoint = "glTextureSubImage3DEXT")]
             public static 
-            void TextureSubImage3D(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+            void TextureSubImage3D<T11>(UInt32 texture, OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 width, Int32 height, Int32 depth, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T11 pixels)
+                where T11 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glTextureSubImage3DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+                GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glTextureSubImage3DEXT((UInt32)texture, (OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)width, (Int32)height, (Int32)depth, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    pixels = (T11)pixels_ptr.Target;
+                }
+                finally
+                {
+                    pixels_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -114878,35 +114878,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtGpuShader4", Version = "2.0", EntryPoint = "glUniform1uivEXT")]
-            public static 
-            unsafe void Uniform1(Int32 location, Int32 count, Int32* value)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glUniform1uivEXT((Int32)location, (Int32)count, (UInt32*)value);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -114975,6 +114946,70 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtGpuShader4", Version = "2.0", EntryPoint = "glUniform1uivEXT")]
+            public static 
+            unsafe void Uniform1(Int32 location, Int32 count, Int32* value)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glUniform1uivEXT((Int32)location, (Int32)count, (UInt32*)value);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtGpuShader4", Version = "2.0", EntryPoint = "glUniform1uivEXT")]
+            public static 
+            void Uniform1(Int32 location, Int32 count, UInt32[] value)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* value_ptr = value)
+                    {
+                        Delegates.glUniform1uivEXT((Int32)location, (Int32)count, (UInt32*)value_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -115039,41 +115074,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtGpuShader4", Version = "2.0", EntryPoint = "glUniform1uivEXT")]
-            public static 
-            void Uniform1(Int32 location, Int32 count, UInt32[] value)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* value_ptr = value)
-                    {
-                        Delegates.glUniform1uivEXT((Int32)location, (Int32)count, (UInt32*)value_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -115131,6 +115131,40 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtGpuShader4", Version = "2.0", EntryPoint = "glUniform2uivEXT")]
+            public static 
+            void Uniform2(Int32 location, Int32 count, Int32[] value)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Int32* value_ptr = value)
+                    {
+                        Delegates.glUniform2uivEXT((Int32)location, (Int32)count, (UInt32*)value_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -115173,9 +115207,10 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the new values to be used for the specified uniform variable.
         /// </para>
         /// </param>
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtGpuShader4", Version = "2.0", EntryPoint = "glUniform2uivEXT")]
             public static 
-            void Uniform2(Int32 location, Int32 count, Int32[] value)
+            void Uniform2(Int32 location, Int32 count, UInt32[] value)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -115183,7 +115218,7 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
                 unsafe
                 {
-                    fixed (Int32* value_ptr = value)
+                    fixed (UInt32* value_ptr = value)
                     {
                         Delegates.glUniform2uivEXT((Int32)location, (Int32)count, (UInt32*)value_ptr);
                     }
@@ -115258,41 +115293,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtGpuShader4", Version = "2.0", EntryPoint = "glUniform2uivEXT")]
-            public static 
-            void Uniform2(Int32 location, Int32 count, UInt32[] value)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* value_ptr = value)
-                    {
-                        Delegates.glUniform2uivEXT((Int32)location, (Int32)count, (UInt32*)value_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -115350,35 +115350,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtGpuShader4", Version = "2.0", EntryPoint = "glUniform3uivEXT")]
-            public static 
-            unsafe void Uniform3(Int32 location, Int32 count, Int32* value)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glUniform3uivEXT((Int32)location, (Int32)count, (UInt32*)value);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -115447,6 +115418,70 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtGpuShader4", Version = "2.0", EntryPoint = "glUniform3uivEXT")]
+            public static 
+            unsafe void Uniform3(Int32 location, Int32 count, Int32* value)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glUniform3uivEXT((Int32)location, (Int32)count, (UInt32*)value);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtGpuShader4", Version = "2.0", EntryPoint = "glUniform3uivEXT")]
+            public static 
+            void Uniform3(Int32 location, Int32 count, UInt32[] value)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* value_ptr = value)
+                    {
+                        Delegates.glUniform3uivEXT((Int32)location, (Int32)count, (UInt32*)value_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -115511,41 +115546,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtGpuShader4", Version = "2.0", EntryPoint = "glUniform3uivEXT")]
-            public static 
-            void Uniform3(Int32 location, Int32 count, UInt32[] value)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* value_ptr = value)
-                    {
-                        Delegates.glUniform3uivEXT((Int32)location, (Int32)count, (UInt32*)value_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -115603,35 +115603,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtGpuShader4", Version = "2.0", EntryPoint = "glUniform4uivEXT")]
-            public static 
-            unsafe void Uniform4(Int32 location, Int32 count, Int32* value)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glUniform4uivEXT((Int32)location, (Int32)count, (UInt32*)value);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -115700,6 +115671,70 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtGpuShader4", Version = "2.0", EntryPoint = "glUniform4uivEXT")]
+            public static 
+            unsafe void Uniform4(Int32 location, Int32 count, Int32* value)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glUniform4uivEXT((Int32)location, (Int32)count, (UInt32*)value);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Specify the value of a uniform variable for the current program object
+        /// </summary>
+        /// <param name="location">
+        /// <para>
+        /// Specifies the location of the uniform variable to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified uniform variable.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtGpuShader4", Version = "2.0", EntryPoint = "glUniform4uivEXT")]
+            public static 
+            void Uniform4(Int32 location, Int32 count, UInt32[] value)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* value_ptr = value)
+                    {
+                        Delegates.glUniform4uivEXT((Int32)location, (Int32)count, (UInt32*)value_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specify the value of a uniform variable for the current program object
         /// </summary>
@@ -115763,41 +115798,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            
-        /// <summary>
-        /// Specify the value of a uniform variable for the current program object
-        /// </summary>
-        /// <param name="location">
-        /// <para>
-        /// Specifies the location of the uniform variable to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified uniform variable.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtGpuShader4", Version = "2.0", EntryPoint = "glUniform4uivEXT")]
-            public static 
-            void Uniform4(Int32 location, Int32 count, UInt32[] value)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* value_ptr = value)
-                    {
-                        Delegates.glUniform4uivEXT((Int32)location, (Int32)count, (UInt32*)value_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtBindableUniform", Version = "2.0", EntryPoint = "glUniformBufferEXT")]
             public static 
             void UniformBuffer(Int32 program, Int32 location, Int32 buffer)
@@ -115870,6 +115870,27 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantbvEXT")]
+            public static 
+            void Variant(UInt32 id, SByte[] addr)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (SByte* addr_ptr = addr)
+                    {
+                        Delegates.glVariantbvEXT((UInt32)id, (SByte*)addr_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantbvEXT")]
             public static 
@@ -115906,42 +115927,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantbvEXT")]
-            public static 
-            void Variant(UInt32 id, SByte[] addr)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (SByte* addr_ptr = addr)
-                    {
-                        Delegates.glVariantbvEXT((UInt32)id, (SByte*)addr_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantdvEXT")]
-            public static 
-            unsafe void Variant(Int32 id, Double* addr)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVariantdvEXT((UInt32)id, (Double*)addr);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantdvEXT")]
             public static 
             void Variant(Int32 id, Double[] addr)
@@ -115985,7 +115970,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantdvEXT")]
             public static 
-            unsafe void Variant(UInt32 id, Double* addr)
+            unsafe void Variant(Int32 id, Double* addr)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -116039,6 +116024,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantdvEXT")]
+            public static 
+            unsafe void Variant(UInt32 id, Double* addr)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVariantdvEXT((UInt32)id, (Double*)addr);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantfvEXT")]
+            public static 
+            void Variant(Int32 id, Single[] addr)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* addr_ptr = addr)
+                    {
+                        Delegates.glVariantfvEXT((UInt32)id, (Single*)addr_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantfvEXT")]
             public static 
             void Variant(Int32 id, ref Single addr)
@@ -116074,9 +116094,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantfvEXT")]
             public static 
-            void Variant(Int32 id, Single[] addr)
+            void Variant(UInt32 id, Single[] addr)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -116130,42 +116151,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantfvEXT")]
-            public static 
-            void Variant(UInt32 id, Single[] addr)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* addr_ptr = addr)
-                    {
-                        Delegates.glVariantfvEXT((UInt32)id, (Single*)addr_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantivEXT")]
-            public static 
-            unsafe void Variant(Int32 id, Int32* addr)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVariantivEXT((UInt32)id, (Int32*)addr);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantivEXT")]
             public static 
             void Variant(Int32 id, Int32[] addr)
@@ -116209,7 +116194,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantivEXT")]
             public static 
-            unsafe void Variant(UInt32 id, Int32* addr)
+            unsafe void Variant(Int32 id, Int32* addr)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -116263,25 +116248,16 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantPointerEXT")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantivEXT")]
             public static 
-            void VariantPointer<T3>(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, Int32 stride, [InAttribute, OutAttribute] ref T3 addr)
-                where T3 : struct
+            unsafe void Variant(UInt32 id, Int32* addr)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle addr_ptr = GCHandle.Alloc(addr, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glVariantPointerEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)type, (UInt32)stride, (IntPtr)addr_ptr.AddrOfPinnedObject());
-                    addr = (T3)addr_ptr.Target;
-                }
-                finally
-                {
-                    addr_ptr.Free();
-                }
+                Delegates.glVariantivEXT((UInt32)id, (Int32*)addr);
                 #if DEBUG
                 }
                 #endif
@@ -116289,7 +116265,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantPointerEXT")]
             public static 
-            void VariantPointer<T3>(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, Int32 stride, [InAttribute, OutAttribute] T3[,,] addr)
+            void VariantPointer(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, Int32 stride, IntPtr addr)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVariantPointerEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)type, (UInt32)stride, (IntPtr)addr);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantPointerEXT")]
+            public static 
+            void VariantPointer<T3>(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, Int32 stride, [InAttribute, OutAttribute] T3[] addr)
                 where T3 : struct
             {
                 #if DEBUG
@@ -116335,7 +116325,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantPointerEXT")]
             public static 
-            void VariantPointer<T3>(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, Int32 stride, [InAttribute, OutAttribute] T3[] addr)
+            void VariantPointer<T3>(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, Int32 stride, [InAttribute, OutAttribute] T3[,,] addr)
                 where T3 : struct
             {
                 #if DEBUG
@@ -116358,22 +116348,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantPointerEXT")]
             public static 
-            void VariantPointer(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, Int32 stride, IntPtr addr)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVariantPointerEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)type, (UInt32)stride, (IntPtr)addr);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantPointerEXT")]
-            public static 
-            void VariantPointer<T3>(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, UInt32 stride, [InAttribute, OutAttribute] ref T3 addr)
+            void VariantPointer<T3>(Int32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, Int32 stride, [InAttribute, OutAttribute] ref T3 addr)
                 where T3 : struct
             {
                 #if DEBUG
@@ -116398,7 +116373,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantPointerEXT")]
             public static 
-            void VariantPointer<T3>(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, UInt32 stride, [InAttribute, OutAttribute] T3[,,] addr)
+            void VariantPointer(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, UInt32 stride, IntPtr addr)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVariantPointerEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)type, (UInt32)stride, (IntPtr)addr);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantPointerEXT")]
+            public static 
+            void VariantPointer<T3>(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, UInt32 stride, [InAttribute, OutAttribute] T3[] addr)
                 where T3 : struct
             {
                 #if DEBUG
@@ -116446,7 +116436,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantPointerEXT")]
             public static 
-            void VariantPointer<T3>(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, UInt32 stride, [InAttribute, OutAttribute] T3[] addr)
+            void VariantPointer<T3>(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, UInt32 stride, [InAttribute, OutAttribute] T3[,,] addr)
                 where T3 : struct
             {
                 #if DEBUG
@@ -116470,28 +116460,23 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantPointerEXT")]
             public static 
-            void VariantPointer(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, UInt32 stride, IntPtr addr)
+            void VariantPointer<T3>(UInt32 id, OpenTK.Graphics.OpenGL.ExtVertexShader type, UInt32 stride, [InAttribute, OutAttribute] ref T3 addr)
+                where T3 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glVariantPointerEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)type, (UInt32)stride, (IntPtr)addr);
-                #if DEBUG
+                GCHandle addr_ptr = GCHandle.Alloc(addr, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glVariantPointerEXT((UInt32)id, (OpenTK.Graphics.OpenGL.ExtVertexShader)type, (UInt32)stride, (IntPtr)addr_ptr.AddrOfPinnedObject());
+                    addr = (T3)addr_ptr.Target;
                 }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantsvEXT")]
-            public static 
-            unsafe void Variant(Int32 id, Int16* addr)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                finally
                 {
-                #endif
-                Delegates.glVariantsvEXT((UInt32)id, (Int16*)addr);
+                    addr_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -116540,7 +116525,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantsvEXT")]
             public static 
-            unsafe void Variant(UInt32 id, Int16* addr)
+            unsafe void Variant(Int32 id, Int16* addr)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -116595,15 +116580,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantubvEXT")]
+            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantsvEXT")]
             public static 
-            unsafe void Variant(Int32 id, Byte* addr)
+            unsafe void Variant(UInt32 id, Int16* addr)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glVariantubvEXT((UInt32)id, (Byte*)addr);
+                Delegates.glVariantsvEXT((UInt32)id, (Int16*)addr);
                 #if DEBUG
                 }
                 #endif
@@ -116652,7 +116637,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantubvEXT")]
             public static 
-            unsafe void Variant(UInt32 id, Byte* addr)
+            unsafe void Variant(Int32 id, Byte* addr)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -116706,6 +116691,42 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantubvEXT")]
+            public static 
+            unsafe void Variant(UInt32 id, Byte* addr)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVariantubvEXT((UInt32)id, (Byte*)addr);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantuivEXT")]
+            public static 
+            void Variant(UInt32 id, UInt32[] addr)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* addr_ptr = addr)
+                    {
+                        Delegates.glVariantuivEXT((UInt32)id, (UInt32*)addr_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantuivEXT")]
             public static 
@@ -116743,9 +116764,9 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantuivEXT")]
+            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantusvEXT")]
             public static 
-            void Variant(UInt32 id, UInt32[] addr)
+            void Variant(UInt32 id, UInt16[] addr)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -116753,9 +116774,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
                 unsafe
                 {
-                    fixed (UInt32* addr_ptr = addr)
+                    fixed (UInt16* addr_ptr = addr)
                     {
-                        Delegates.glVariantuivEXT((UInt32)id, (UInt32*)addr_ptr);
+                        Delegates.glVariantusvEXT((UInt32)id, (UInt16*)addr_ptr);
                     }
                 }
                 #if DEBUG
@@ -116799,27 +116820,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "ExtVertexShader", Version = "1.2", EntryPoint = "glVariantusvEXT")]
-            public static 
-            void Variant(UInt32 id, UInt16[] addr)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt16* addr_ptr = addr)
-                    {
-                        Delegates.glVariantusvEXT((UInt32)id, (UInt16*)addr_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI1iEXT")]
             public static 
             void VertexAttribI1(Int32 index, Int32 x)
@@ -116938,21 +116938,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI2ivEXT")]
-            public static 
-            unsafe void VertexAttribI2(Int32 index, Int32* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttribI2ivEXT((UInt32)index, (Int32*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI2ivEXT")]
             public static 
             void VertexAttribI2(Int32 index, Int32[] v)
@@ -116996,7 +116981,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI2ivEXT")]
             public static 
-            unsafe void VertexAttribI2(UInt32 index, Int32* v)
+            unsafe void VertexAttribI2(Int32 index, Int32* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -117050,6 +117035,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI2ivEXT")]
+            public static 
+            unsafe void VertexAttribI2(UInt32 index, Int32* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttribI2ivEXT((UInt32)index, (Int32*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI2uiEXT")]
             public static 
@@ -117065,6 +117065,27 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI2uivEXT")]
+            public static 
+            void VertexAttribI2(UInt32 index, UInt32[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* v_ptr = v)
+                    {
+                        Delegates.glVertexAttribI2uivEXT((UInt32)index, (UInt32*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI2uivEXT")]
             public static 
@@ -117101,27 +117122,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI2uivEXT")]
-            public static 
-            void VertexAttribI2(UInt32 index, UInt32[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* v_ptr = v)
-                    {
-                        Delegates.glVertexAttribI2uivEXT((UInt32)index, (UInt32*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI3iEXT")]
             public static 
             void VertexAttribI3(Int32 index, Int32 x, Int32 y, Int32 z)
@@ -117151,21 +117151,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI3ivEXT")]
-            public static 
-            unsafe void VertexAttribI3(Int32 index, Int32* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttribI3ivEXT((UInt32)index, (Int32*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI3ivEXT")]
             public static 
             void VertexAttribI3(Int32 index, Int32[] v)
@@ -117209,7 +117194,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI3ivEXT")]
             public static 
-            unsafe void VertexAttribI3(UInt32 index, Int32* v)
+            unsafe void VertexAttribI3(Int32 index, Int32* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -117263,6 +117248,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI3ivEXT")]
+            public static 
+            unsafe void VertexAttribI3(UInt32 index, Int32* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttribI3ivEXT((UInt32)index, (Int32*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI3uiEXT")]
             public static 
@@ -117278,6 +117278,27 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI3uivEXT")]
+            public static 
+            void VertexAttribI3(UInt32 index, UInt32[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* v_ptr = v)
+                    {
+                        Delegates.glVertexAttribI3uivEXT((UInt32)index, (UInt32*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI3uivEXT")]
             public static 
@@ -117315,9 +117336,9 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI3uivEXT")]
+            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4bvEXT")]
             public static 
-            void VertexAttribI3(UInt32 index, UInt32[] v)
+            void VertexAttribI4(UInt32 index, SByte[] v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -117325,9 +117346,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
                 unsafe
                 {
-                    fixed (UInt32* v_ptr = v)
+                    fixed (SByte* v_ptr = v)
                     {
-                        Delegates.glVertexAttribI3uivEXT((UInt32)index, (UInt32*)v_ptr);
+                        Delegates.glVertexAttribI4bvEXT((UInt32)index, (SByte*)v_ptr);
                     }
                 }
                 #if DEBUG
@@ -117371,27 +117392,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4bvEXT")]
-            public static 
-            void VertexAttribI4(UInt32 index, SByte[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (SByte* v_ptr = v)
-                    {
-                        Delegates.glVertexAttribI4bvEXT((UInt32)index, (SByte*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4iEXT")]
             public static 
             void VertexAttribI4(Int32 index, Int32 x, Int32 y, Int32 z, Int32 w)
@@ -117421,21 +117421,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4ivEXT")]
-            public static 
-            unsafe void VertexAttribI4(Int32 index, Int32* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttribI4ivEXT((UInt32)index, (Int32*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4ivEXT")]
             public static 
             void VertexAttribI4(Int32 index, Int32[] v)
@@ -117479,7 +117464,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4ivEXT")]
             public static 
-            unsafe void VertexAttribI4(UInt32 index, Int32* v)
+            unsafe void VertexAttribI4(Int32 index, Int32* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -117534,15 +117519,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4svEXT")]
+            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4ivEXT")]
             public static 
-            unsafe void VertexAttribI4(Int32 index, Int16* v)
+            unsafe void VertexAttribI4(UInt32 index, Int32* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glVertexAttribI4svEXT((UInt32)index, (Int16*)v);
+                Delegates.glVertexAttribI4ivEXT((UInt32)index, (Int32*)v);
                 #if DEBUG
                 }
                 #endif
@@ -117591,7 +117576,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4svEXT")]
             public static 
-            unsafe void VertexAttribI4(UInt32 index, Int16* v)
+            unsafe void VertexAttribI4(Int32 index, Int16* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -117646,15 +117631,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4ubvEXT")]
+            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4svEXT")]
             public static 
-            unsafe void VertexAttribI4(Int32 index, Byte* v)
+            unsafe void VertexAttribI4(UInt32 index, Int16* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glVertexAttribI4ubvEXT((UInt32)index, (Byte*)v);
+                Delegates.glVertexAttribI4svEXT((UInt32)index, (Int16*)v);
                 #if DEBUG
                 }
                 #endif
@@ -117703,7 +117688,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4ubvEXT")]
             public static 
-            unsafe void VertexAttribI4(UInt32 index, Byte* v)
+            unsafe void VertexAttribI4(Int32 index, Byte* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -117757,6 +117742,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4ubvEXT")]
+            public static 
+            unsafe void VertexAttribI4(UInt32 index, Byte* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttribI4ubvEXT((UInt32)index, (Byte*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4uiEXT")]
             public static 
@@ -117772,6 +117772,27 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4uivEXT")]
+            public static 
+            void VertexAttribI4(UInt32 index, UInt32[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* v_ptr = v)
+                    {
+                        Delegates.glVertexAttribI4uivEXT((UInt32)index, (UInt32*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4uivEXT")]
             public static 
@@ -117809,9 +117830,9 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4uivEXT")]
+            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4usvEXT")]
             public static 
-            void VertexAttribI4(UInt32 index, UInt32[] v)
+            void VertexAttribI4(UInt32 index, UInt16[] v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -117819,9 +117840,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
                 unsafe
                 {
-                    fixed (UInt32* v_ptr = v)
+                    fixed (UInt16* v_ptr = v)
                     {
-                        Delegates.glVertexAttribI4uivEXT((UInt32)index, (UInt32*)v_ptr);
+                        Delegates.glVertexAttribI4usvEXT((UInt32)index, (UInt16*)v_ptr);
                     }
                 }
                 #if DEBUG
@@ -117865,22 +117886,15 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribI4usvEXT")]
+            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribIPointerEXT")]
             public static 
-            void VertexAttribI4(UInt32 index, UInt16[] v)
+            void VertexAttribIPointer(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.NvVertexProgram4 type, Int32 stride, IntPtr pointer)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                unsafe
-                {
-                    fixed (UInt16* v_ptr = v)
-                    {
-                        Delegates.glVertexAttribI4usvEXT((UInt32)index, (UInt16*)v_ptr);
-                    }
-                }
+                Delegates.glVertexAttribIPointerEXT((UInt32)index, (Int32)size, (OpenTK.Graphics.OpenGL.NvVertexProgram4)type, (Int32)stride, (IntPtr)pointer);
                 #if DEBUG
                 }
                 #endif
@@ -117888,31 +117902,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribIPointerEXT")]
             public static 
-            void VertexAttribIPointer<T4>(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.NvVertexProgram4 type, Int32 stride, [InAttribute, OutAttribute] ref T4 pointer)
-                where T4 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glVertexAttribIPointerEXT((UInt32)index, (Int32)size, (OpenTK.Graphics.OpenGL.NvVertexProgram4)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                    pointer = (T4)pointer_ptr.Target;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribIPointerEXT")]
-            public static 
-            void VertexAttribIPointer<T4>(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.NvVertexProgram4 type, Int32 stride, [InAttribute, OutAttribute] T4[,,] pointer)
+            void VertexAttribIPointer<T4>(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.NvVertexProgram4 type, Int32 stride, [InAttribute, OutAttribute] T4[] pointer)
                 where T4 : struct
             {
                 #if DEBUG
@@ -117958,7 +117948,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribIPointerEXT")]
             public static 
-            void VertexAttribIPointer<T4>(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.NvVertexProgram4 type, Int32 stride, [InAttribute, OutAttribute] T4[] pointer)
+            void VertexAttribIPointer<T4>(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.NvVertexProgram4 type, Int32 stride, [InAttribute, OutAttribute] T4[,,] pointer)
                 where T4 : struct
             {
                 #if DEBUG
@@ -117981,22 +117971,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribIPointerEXT")]
             public static 
-            void VertexAttribIPointer(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.NvVertexProgram4 type, Int32 stride, IntPtr pointer)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttribIPointerEXT((UInt32)index, (Int32)size, (OpenTK.Graphics.OpenGL.NvVertexProgram4)type, (Int32)stride, (IntPtr)pointer);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribIPointerEXT")]
-            public static 
-            void VertexAttribIPointer<T4>(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.NvVertexProgram4 type, Int32 stride, [InAttribute, OutAttribute] ref T4 pointer)
+            void VertexAttribIPointer<T4>(Int32 index, Int32 size, OpenTK.Graphics.OpenGL.NvVertexProgram4 type, Int32 stride, [InAttribute, OutAttribute] ref T4 pointer)
                 where T4 : struct
             {
                 #if DEBUG
@@ -118021,7 +117996,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribIPointerEXT")]
             public static 
-            void VertexAttribIPointer<T4>(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.NvVertexProgram4 type, Int32 stride, [InAttribute, OutAttribute] T4[,,] pointer)
+            void VertexAttribIPointer(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.NvVertexProgram4 type, Int32 stride, IntPtr pointer)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttribIPointerEXT((UInt32)index, (Int32)size, (OpenTK.Graphics.OpenGL.NvVertexProgram4)type, (Int32)stride, (IntPtr)pointer);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribIPointerEXT")]
+            public static 
+            void VertexAttribIPointer<T4>(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.NvVertexProgram4 type, Int32 stride, [InAttribute, OutAttribute] T4[] pointer)
                 where T4 : struct
             {
                 #if DEBUG
@@ -118069,7 +118059,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribIPointerEXT")]
             public static 
-            void VertexAttribIPointer<T4>(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.NvVertexProgram4 type, Int32 stride, [InAttribute, OutAttribute] T4[] pointer)
+            void VertexAttribIPointer<T4>(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.NvVertexProgram4 type, Int32 stride, [InAttribute, OutAttribute] T4[,,] pointer)
                 where T4 : struct
             {
                 #if DEBUG
@@ -118093,45 +118083,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram4", Version = "", EntryPoint = "glVertexAttribIPointerEXT")]
             public static 
-            void VertexAttribIPointer(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.NvVertexProgram4 type, Int32 stride, IntPtr pointer)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttribIPointerEXT((UInt32)index, (Int32)size, (OpenTK.Graphics.OpenGL.NvVertexProgram4)type, (Int32)stride, (IntPtr)pointer);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Define an array of vertex data
-        /// </summary>
-        /// <param name="size">
-        /// <para>
-        /// Specifies the number of coordinates per vertex. Must be 2, 3, or 4. The initial value is 4.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the data type of each coordinate in the array. Symbolic constants GL_SHORT, GL_INT, GL_FLOAT, or GL_DOUBLE are accepted. The initial value is GL_FLOAT.
-        /// </para>
-        /// </param>
-        /// <param name="stride">
-        /// <para>
-        /// Specifies the byte offset between consecutive vertices. If stride is 0, the vertices are understood to be tightly packed in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-        /// <param name="pointer">
-        /// <para>
-        /// Specifies a pointer to the first coordinate of the first vertex in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "ExtVertexArray", Version = "1.0", EntryPoint = "glVertexPointerEXT")]
-            public static 
-            void VertexPointer<T4>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] ref T4 pointer)
+            void VertexAttribIPointer<T4>(UInt32 index, Int32 size, OpenTK.Graphics.OpenGL.NvVertexProgram4 type, Int32 stride, [InAttribute, OutAttribute] ref T4 pointer)
                 where T4 : struct
             {
                 #if DEBUG
@@ -118141,7 +118093,7 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glVertexPointerEXT((Int32)size, (OpenTK.Graphics.OpenGL.VertexPointerType)type, (Int32)stride, (Int32)count, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    Delegates.glVertexAttribIPointerEXT((UInt32)index, (Int32)size, (OpenTK.Graphics.OpenGL.NvVertexProgram4)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
                     pointer = (T4)pointer_ptr.Target;
                 }
                 finally
@@ -118179,7 +118131,45 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtVertexArray", Version = "1.0", EntryPoint = "glVertexPointerEXT")]
             public static 
-            void VertexPointer<T4>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] T4[,,] pointer)
+            void VertexPointer(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, Int32 stride, Int32 count, IntPtr pointer)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexPointerEXT((Int32)size, (OpenTK.Graphics.OpenGL.VertexPointerType)type, (Int32)stride, (Int32)count, (IntPtr)pointer);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Define an array of vertex data
+        /// </summary>
+        /// <param name="size">
+        /// <para>
+        /// Specifies the number of coordinates per vertex. Must be 2, 3, or 4. The initial value is 4.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the data type of each coordinate in the array. Symbolic constants GL_SHORT, GL_INT, GL_FLOAT, or GL_DOUBLE are accepted. The initial value is GL_FLOAT.
+        /// </para>
+        /// </param>
+        /// <param name="stride">
+        /// <para>
+        /// Specifies the byte offset between consecutive vertices. If stride is 0, the vertices are understood to be tightly packed in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+        /// <param name="pointer">
+        /// <para>
+        /// Specifies a pointer to the first coordinate of the first vertex in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "ExtVertexArray", Version = "1.0", EntryPoint = "glVertexPointerEXT")]
+            public static 
+            void VertexPointer<T4>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] T4[] pointer)
                 where T4 : struct
             {
                 #if DEBUG
@@ -118273,7 +118263,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtVertexArray", Version = "1.0", EntryPoint = "glVertexPointerEXT")]
             public static 
-            void VertexPointer<T4>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] T4[] pointer)
+            void VertexPointer<T4>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] T4[,,] pointer)
                 where T4 : struct
             {
                 #if DEBUG
@@ -118320,13 +118310,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "ExtVertexArray", Version = "1.0", EntryPoint = "glVertexPointerEXT")]
             public static 
-            void VertexPointer(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, Int32 stride, Int32 count, IntPtr pointer)
+            void VertexPointer<T4>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, Int32 stride, Int32 count, [InAttribute, OutAttribute] ref T4 pointer)
+                where T4 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glVertexPointerEXT((Int32)size, (OpenTK.Graphics.OpenGL.VertexPointerType)type, (Int32)stride, (Int32)count, (IntPtr)pointer);
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glVertexPointerEXT((Int32)size, (OpenTK.Graphics.OpenGL.VertexPointerType)type, (Int32)stride, (Int32)count, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    pointer = (T4)pointer_ptr.Target;
+                }
+                finally
+                {
+                    pointer_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -118363,23 +118363,13 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtVertexWeighting", Version = "1.1", EntryPoint = "glVertexWeightPointerEXT")]
             public static 
-            void VertexWeightPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ExtVertexWeighting type, Int32 stride, [InAttribute, OutAttribute] ref T3 pointer)
-                where T3 : struct
+            void VertexWeightPointer(Int32 size, OpenTK.Graphics.OpenGL.ExtVertexWeighting type, Int32 stride, IntPtr pointer)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glVertexWeightPointerEXT((Int32)size, (OpenTK.Graphics.OpenGL.ExtVertexWeighting)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                    pointer = (T3)pointer_ptr.Target;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
+                Delegates.glVertexWeightPointerEXT((Int32)size, (OpenTK.Graphics.OpenGL.ExtVertexWeighting)type, (Int32)stride, (IntPtr)pointer);
                 #if DEBUG
                 }
                 #endif
@@ -118387,7 +118377,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtVertexWeighting", Version = "1.1", EntryPoint = "glVertexWeightPointerEXT")]
             public static 
-            void VertexWeightPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ExtVertexWeighting type, Int32 stride, [InAttribute, OutAttribute] T3[,,] pointer)
+            void VertexWeightPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ExtVertexWeighting type, Int32 stride, [InAttribute, OutAttribute] T3[] pointer)
                 where T3 : struct
             {
                 #if DEBUG
@@ -118433,7 +118423,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtVertexWeighting", Version = "1.1", EntryPoint = "glVertexWeightPointerEXT")]
             public static 
-            void VertexWeightPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ExtVertexWeighting type, Int32 stride, [InAttribute, OutAttribute] T3[] pointer)
+            void VertexWeightPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ExtVertexWeighting type, Int32 stride, [InAttribute, OutAttribute] T3[,,] pointer)
                 where T3 : struct
             {
                 #if DEBUG
@@ -118456,13 +118446,23 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "ExtVertexWeighting", Version = "1.1", EntryPoint = "glVertexWeightPointerEXT")]
             public static 
-            void VertexWeightPointer(Int32 size, OpenTK.Graphics.OpenGL.ExtVertexWeighting type, Int32 stride, IntPtr pointer)
+            void VertexWeightPointer<T3>(Int32 size, OpenTK.Graphics.OpenGL.ExtVertexWeighting type, Int32 stride, [InAttribute, OutAttribute] ref T3 pointer)
+                where T3 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glVertexWeightPointerEXT((Int32)size, (OpenTK.Graphics.OpenGL.ExtVertexWeighting)type, (Int32)stride, (IntPtr)pointer);
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glVertexWeightPointerEXT((Int32)size, (OpenTK.Graphics.OpenGL.ExtVertexWeighting)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    pointer = (T3)pointer_ptr.Target;
+                }
+                finally
+                {
+                    pointer_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -118517,23 +118517,13 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "GremedyStringMarker", Version = "1.0", EntryPoint = "glStringMarkerGREMEDY")]
             public static 
-            void StringMarker<T1>(Int32 len, [InAttribute, OutAttribute] ref T1 @string)
-                where T1 : struct
+            void StringMarker(Int32 len, IntPtr @string)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle @string_ptr = GCHandle.Alloc(@string, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glStringMarkerGREMEDY((Int32)len, (IntPtr)@string_ptr.AddrOfPinnedObject());
-                    @string = (T1)@string_ptr.Target;
-                }
-                finally
-                {
-                    @string_ptr.Free();
-                }
+                Delegates.glStringMarkerGREMEDY((Int32)len, (IntPtr)@string);
                 #if DEBUG
                 }
                 #endif
@@ -118541,7 +118531,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "GremedyStringMarker", Version = "1.0", EntryPoint = "glStringMarkerGREMEDY")]
             public static 
-            void StringMarker<T1>(Int32 len, [InAttribute, OutAttribute] T1[,,] @string)
+            void StringMarker<T1>(Int32 len, [InAttribute, OutAttribute] T1[] @string)
                 where T1 : struct
             {
                 #if DEBUG
@@ -118587,7 +118577,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "GremedyStringMarker", Version = "1.0", EntryPoint = "glStringMarkerGREMEDY")]
             public static 
-            void StringMarker<T1>(Int32 len, [InAttribute, OutAttribute] T1[] @string)
+            void StringMarker<T1>(Int32 len, [InAttribute, OutAttribute] T1[,,] @string)
                 where T1 : struct
             {
                 #if DEBUG
@@ -118610,13 +118600,23 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "GremedyStringMarker", Version = "1.0", EntryPoint = "glStringMarkerGREMEDY")]
             public static 
-            void StringMarker(Int32 len, IntPtr @string)
+            void StringMarker<T1>(Int32 len, [InAttribute, OutAttribute] ref T1 @string)
+                where T1 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glStringMarkerGREMEDY((Int32)len, (IntPtr)@string);
+                GCHandle @string_ptr = GCHandle.Alloc(@string, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glStringMarkerGREMEDY((Int32)len, (IntPtr)@string_ptr.AddrOfPinnedObject());
+                    @string = (T1)@string_ptr.Target;
+                }
+                finally
+                {
+                    @string_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -118626,6 +118626,26 @@ namespace OpenTK.Graphics.OpenGL
 
         public static partial class HP
         {
+            [AutoGenerated(Category = "HpImageTransform", Version = "1.1", EntryPoint = "glGetImageTransformParameterfvHP")]
+            public static 
+            void GetImageTransformParameter(OpenTK.Graphics.OpenGL.HpImageTransform target, OpenTK.Graphics.OpenGL.HpImageTransform pname, [OutAttribute] Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glGetImageTransformParameterfvHP((OpenTK.Graphics.OpenGL.HpImageTransform)target, (OpenTK.Graphics.OpenGL.HpImageTransform)pname, (Single*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "HpImageTransform", Version = "1.1", EntryPoint = "glGetImageTransformParameterfvHP")]
             public static 
             void GetImageTransformParameter(OpenTK.Graphics.OpenGL.HpImageTransform target, OpenTK.Graphics.OpenGL.HpImageTransform pname, [OutAttribute] out Single @params)
@@ -118662,41 +118682,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "HpImageTransform", Version = "1.1", EntryPoint = "glGetImageTransformParameterfvHP")]
-            public static 
-            void GetImageTransformParameter(OpenTK.Graphics.OpenGL.HpImageTransform target, OpenTK.Graphics.OpenGL.HpImageTransform pname, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetImageTransformParameterfvHP((OpenTK.Graphics.OpenGL.HpImageTransform)target, (OpenTK.Graphics.OpenGL.HpImageTransform)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "HpImageTransform", Version = "1.1", EntryPoint = "glGetImageTransformParameterivHP")]
-            public static 
-            unsafe void GetImageTransformParameter(OpenTK.Graphics.OpenGL.HpImageTransform target, OpenTK.Graphics.OpenGL.HpImageTransform pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetImageTransformParameterivHP((OpenTK.Graphics.OpenGL.HpImageTransform)target, (OpenTK.Graphics.OpenGL.HpImageTransform)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "HpImageTransform", Version = "1.1", EntryPoint = "glGetImageTransformParameterivHP")]
             public static 
             void GetImageTransformParameter(OpenTK.Graphics.OpenGL.HpImageTransform target, OpenTK.Graphics.OpenGL.HpImageTransform pname, [OutAttribute] Int32[] @params)
@@ -118738,6 +118723,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "HpImageTransform", Version = "1.1", EntryPoint = "glGetImageTransformParameterivHP")]
+            public static 
+            unsafe void GetImageTransformParameter(OpenTK.Graphics.OpenGL.HpImageTransform target, OpenTK.Graphics.OpenGL.HpImageTransform pname, [OutAttribute] Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetImageTransformParameterivHP((OpenTK.Graphics.OpenGL.HpImageTransform)target, (OpenTK.Graphics.OpenGL.HpImageTransform)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "HpImageTransform", Version = "1.1", EntryPoint = "glImageTransformParameterfHP")]
             public static 
             void ImageTransformParameter(OpenTK.Graphics.OpenGL.HpImageTransform target, OpenTK.Graphics.OpenGL.HpImageTransform pname, Single param)
@@ -118752,21 +118752,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "HpImageTransform", Version = "1.1", EntryPoint = "glImageTransformParameterfvHP")]
-            public static 
-            unsafe void ImageTransformParameter(OpenTK.Graphics.OpenGL.HpImageTransform target, OpenTK.Graphics.OpenGL.HpImageTransform pname, Single* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glImageTransformParameterfvHP((OpenTK.Graphics.OpenGL.HpImageTransform)target, (OpenTK.Graphics.OpenGL.HpImageTransform)pname, (Single*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "HpImageTransform", Version = "1.1", EntryPoint = "glImageTransformParameterfvHP")]
             public static 
             void ImageTransformParameter(OpenTK.Graphics.OpenGL.HpImageTransform target, OpenTK.Graphics.OpenGL.HpImageTransform pname, Single[] @params)
@@ -118787,6 +118772,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "HpImageTransform", Version = "1.1", EntryPoint = "glImageTransformParameterfvHP")]
+            public static 
+            unsafe void ImageTransformParameter(OpenTK.Graphics.OpenGL.HpImageTransform target, OpenTK.Graphics.OpenGL.HpImageTransform pname, Single* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glImageTransformParameterfvHP((OpenTK.Graphics.OpenGL.HpImageTransform)target, (OpenTK.Graphics.OpenGL.HpImageTransform)pname, (Single*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "HpImageTransform", Version = "1.1", EntryPoint = "glImageTransformParameteriHP")]
             public static 
             void ImageTransformParameter(OpenTK.Graphics.OpenGL.HpImageTransform target, OpenTK.Graphics.OpenGL.HpImageTransform pname, Int32 param)
@@ -118801,21 +118801,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "HpImageTransform", Version = "1.1", EntryPoint = "glImageTransformParameterivHP")]
-            public static 
-            unsafe void ImageTransformParameter(OpenTK.Graphics.OpenGL.HpImageTransform target, OpenTK.Graphics.OpenGL.HpImageTransform pname, Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glImageTransformParameterivHP((OpenTK.Graphics.OpenGL.HpImageTransform)target, (OpenTK.Graphics.OpenGL.HpImageTransform)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "HpImageTransform", Version = "1.1", EntryPoint = "glImageTransformParameterivHP")]
             public static 
             void ImageTransformParameter(OpenTK.Graphics.OpenGL.HpImageTransform target, OpenTK.Graphics.OpenGL.HpImageTransform pname, Int32[] @params)
@@ -118836,29 +118821,34 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "HpImageTransform", Version = "1.1", EntryPoint = "glImageTransformParameterivHP")]
+            public static 
+            unsafe void ImageTransformParameter(OpenTK.Graphics.OpenGL.HpImageTransform target, OpenTK.Graphics.OpenGL.HpImageTransform pname, Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glImageTransformParameterivHP((OpenTK.Graphics.OpenGL.HpImageTransform)target, (OpenTK.Graphics.OpenGL.HpImageTransform)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
         }
 
         public static partial class Ibm
         {
             [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glColorPointerListIBM")]
             public static 
-            void ColorPointerList<T3>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T3 pointer, Int32 ptrstride)
-                where T3 : struct
+            void ColorPointerList(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, IntPtr pointer, Int32 ptrstride)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glColorPointerListIBM((Int32)size, (OpenTK.Graphics.OpenGL.ColorPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject(), (Int32)ptrstride);
-                    pointer = (T3)pointer_ptr.Target;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
+                Delegates.glColorPointerListIBM((Int32)size, (OpenTK.Graphics.OpenGL.ColorPointerType)type, (Int32)stride, (IntPtr)pointer, (Int32)ptrstride);
                 #if DEBUG
                 }
                 #endif
@@ -118866,7 +118856,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glColorPointerListIBM")]
             public static 
-            void ColorPointerList<T3>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[,,] pointer, Int32 ptrstride)
+            void ColorPointerList<T3>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[] pointer, Int32 ptrstride)
                 where T3 : struct
             {
                 #if DEBUG
@@ -118912,7 +118902,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glColorPointerListIBM")]
             public static 
-            void ColorPointerList<T3>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[] pointer, Int32 ptrstride)
+            void ColorPointerList<T3>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[,,] pointer, Int32 ptrstride)
                 where T3 : struct
             {
                 #if DEBUG
@@ -118935,28 +118925,23 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glColorPointerListIBM")]
             public static 
-            void ColorPointerList(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, IntPtr pointer, Int32 ptrstride)
+            void ColorPointerList<T3>(Int32 size, OpenTK.Graphics.OpenGL.ColorPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T3 pointer, Int32 ptrstride)
+                where T3 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glColorPointerListIBM((Int32)size, (OpenTK.Graphics.OpenGL.ColorPointerType)type, (Int32)stride, (IntPtr)pointer, (Int32)ptrstride);
-                #if DEBUG
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glColorPointerListIBM((Int32)size, (OpenTK.Graphics.OpenGL.ColorPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject(), (Int32)ptrstride);
+                    pointer = (T3)pointer_ptr.Target;
                 }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glEdgeFlagPointerListIBM")]
-            public static 
-            unsafe void EdgeFlagPointerList(Int32 stride, bool* pointer, Int32 ptrstride)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                finally
                 {
-                #endif
-                Delegates.glEdgeFlagPointerListIBM((Int32)stride, (bool*)pointer, (Int32)ptrstride);
+                    pointer_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -119002,25 +118987,16 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glFogCoordPointerListIBM")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glEdgeFlagPointerListIBM")]
             public static 
-            void FogCoordPointerList<T2>(OpenTK.Graphics.OpenGL.IbmVertexArrayLists type, Int32 stride, [InAttribute, OutAttribute] ref T2 pointer, Int32 ptrstride)
-                where T2 : struct
+            unsafe void EdgeFlagPointerList(Int32 stride, bool* pointer, Int32 ptrstride)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glFogCoordPointerListIBM((OpenTK.Graphics.OpenGL.IbmVertexArrayLists)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject(), (Int32)ptrstride);
-                    pointer = (T2)pointer_ptr.Target;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
+                Delegates.glEdgeFlagPointerListIBM((Int32)stride, (bool*)pointer, (Int32)ptrstride);
                 #if DEBUG
                 }
                 #endif
@@ -119028,7 +119004,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glFogCoordPointerListIBM")]
             public static 
-            void FogCoordPointerList<T2>(OpenTK.Graphics.OpenGL.IbmVertexArrayLists type, Int32 stride, [InAttribute, OutAttribute] T2[,,] pointer, Int32 ptrstride)
+            void FogCoordPointerList(OpenTK.Graphics.OpenGL.IbmVertexArrayLists type, Int32 stride, IntPtr pointer, Int32 ptrstride)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glFogCoordPointerListIBM((OpenTK.Graphics.OpenGL.IbmVertexArrayLists)type, (Int32)stride, (IntPtr)pointer, (Int32)ptrstride);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glFogCoordPointerListIBM")]
+            public static 
+            void FogCoordPointerList<T2>(OpenTK.Graphics.OpenGL.IbmVertexArrayLists type, Int32 stride, [InAttribute, OutAttribute] T2[] pointer, Int32 ptrstride)
                 where T2 : struct
             {
                 #if DEBUG
@@ -119074,7 +119064,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glFogCoordPointerListIBM")]
             public static 
-            void FogCoordPointerList<T2>(OpenTK.Graphics.OpenGL.IbmVertexArrayLists type, Int32 stride, [InAttribute, OutAttribute] T2[] pointer, Int32 ptrstride)
+            void FogCoordPointerList<T2>(OpenTK.Graphics.OpenGL.IbmVertexArrayLists type, Int32 stride, [InAttribute, OutAttribute] T2[,,] pointer, Int32 ptrstride)
                 where T2 : struct
             {
                 #if DEBUG
@@ -119097,21 +119087,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glFogCoordPointerListIBM")]
             public static 
-            void FogCoordPointerList(OpenTK.Graphics.OpenGL.IbmVertexArrayLists type, Int32 stride, IntPtr pointer, Int32 ptrstride)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glFogCoordPointerListIBM((OpenTK.Graphics.OpenGL.IbmVertexArrayLists)type, (Int32)stride, (IntPtr)pointer, (Int32)ptrstride);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glIndexPointerListIBM")]
-            public static 
-            void IndexPointerList<T2>(OpenTK.Graphics.OpenGL.IndexPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T2 pointer, Int32 ptrstride)
+            void FogCoordPointerList<T2>(OpenTK.Graphics.OpenGL.IbmVertexArrayLists type, Int32 stride, [InAttribute, OutAttribute] ref T2 pointer, Int32 ptrstride)
                 where T2 : struct
             {
                 #if DEBUG
@@ -119121,7 +119097,7 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glIndexPointerListIBM((OpenTK.Graphics.OpenGL.IndexPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject(), (Int32)ptrstride);
+                    Delegates.glFogCoordPointerListIBM((OpenTK.Graphics.OpenGL.IbmVertexArrayLists)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject(), (Int32)ptrstride);
                     pointer = (T2)pointer_ptr.Target;
                 }
                 finally
@@ -119135,7 +119111,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glIndexPointerListIBM")]
             public static 
-            void IndexPointerList<T2>(OpenTK.Graphics.OpenGL.IndexPointerType type, Int32 stride, [InAttribute, OutAttribute] T2[,,] pointer, Int32 ptrstride)
+            void IndexPointerList(OpenTK.Graphics.OpenGL.IndexPointerType type, Int32 stride, IntPtr pointer, Int32 ptrstride)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glIndexPointerListIBM((OpenTK.Graphics.OpenGL.IndexPointerType)type, (Int32)stride, (IntPtr)pointer, (Int32)ptrstride);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glIndexPointerListIBM")]
+            public static 
+            void IndexPointerList<T2>(OpenTK.Graphics.OpenGL.IndexPointerType type, Int32 stride, [InAttribute, OutAttribute] T2[] pointer, Int32 ptrstride)
                 where T2 : struct
             {
                 #if DEBUG
@@ -119181,7 +119171,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glIndexPointerListIBM")]
             public static 
-            void IndexPointerList<T2>(OpenTK.Graphics.OpenGL.IndexPointerType type, Int32 stride, [InAttribute, OutAttribute] T2[] pointer, Int32 ptrstride)
+            void IndexPointerList<T2>(OpenTK.Graphics.OpenGL.IndexPointerType type, Int32 stride, [InAttribute, OutAttribute] T2[,,] pointer, Int32 ptrstride)
                 where T2 : struct
             {
                 #if DEBUG
@@ -119204,28 +119194,23 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glIndexPointerListIBM")]
             public static 
-            void IndexPointerList(OpenTK.Graphics.OpenGL.IndexPointerType type, Int32 stride, IntPtr pointer, Int32 ptrstride)
+            void IndexPointerList<T2>(OpenTK.Graphics.OpenGL.IndexPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T2 pointer, Int32 ptrstride)
+                where T2 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glIndexPointerListIBM((OpenTK.Graphics.OpenGL.IndexPointerType)type, (Int32)stride, (IntPtr)pointer, (Int32)ptrstride);
-                #if DEBUG
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glIndexPointerListIBM((OpenTK.Graphics.OpenGL.IndexPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject(), (Int32)ptrstride);
+                    pointer = (T2)pointer_ptr.Target;
                 }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawArraysIBM")]
-            public static 
-            unsafe void MultiModeDrawArrays(OpenTK.Graphics.OpenGL.BeginMode* mode, Int32* first, Int32* count, Int32 primcount, Int32 modestride)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                finally
                 {
-                #endif
-                Delegates.glMultiModeDrawArraysIBM((OpenTK.Graphics.OpenGL.BeginMode*)mode, (Int32*)first, (Int32*)count, (Int32)primcount, (Int32)modestride);
+                    pointer_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -119276,112 +119261,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")]
+            [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawArraysIBM")]
             public static 
-            unsafe void MultiModeDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode* mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount, Int32 modestride)
-                where T3 : struct
+            unsafe void MultiModeDrawArrays(OpenTK.Graphics.OpenGL.BeginMode* mode, Int32* first, Int32* count, Int32 primcount, Int32 modestride)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glMultiModeDrawElementsIBM((OpenTK.Graphics.OpenGL.BeginMode*)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount, (Int32)modestride);
-                    indices = (T3)indices_ptr.Target;
-                }
-                finally
-                {
-                    indices_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")]
-            public static 
-            unsafe void MultiModeDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode* mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount, Int32 modestride)
-                where T3 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glMultiModeDrawElementsIBM((OpenTK.Graphics.OpenGL.BeginMode*)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount, (Int32)modestride);
-                }
-                finally
-                {
-                    indices_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")]
-            public static 
-            unsafe void MultiModeDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode* mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,] indices, Int32 primcount, Int32 modestride)
-                where T3 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glMultiModeDrawElementsIBM((OpenTK.Graphics.OpenGL.BeginMode*)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount, (Int32)modestride);
-                }
-                finally
-                {
-                    indices_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")]
-            public static 
-            unsafe void MultiModeDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode* mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount, Int32 modestride)
-                where T3 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glMultiModeDrawElementsIBM((OpenTK.Graphics.OpenGL.BeginMode*)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount, (Int32)modestride);
-                }
-                finally
-                {
-                    indices_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")]
-            public static 
-            unsafe void MultiModeDrawElements(OpenTK.Graphics.OpenGL.BeginMode* mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount, Int32 modestride)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMultiModeDrawElementsIBM((OpenTK.Graphics.OpenGL.BeginMode*)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount, (Int32)modestride);
+                Delegates.glMultiModeDrawArraysIBM((OpenTK.Graphics.OpenGL.BeginMode*)mode, (Int32*)first, (Int32*)count, (Int32)primcount, (Int32)modestride);
                 #if DEBUG
                 }
                 #endif
@@ -119389,8 +119277,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")]
             public static 
-            void MultiModeDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode[] mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount, Int32 modestride)
-                where T3 : struct
+            void MultiModeDrawElements(OpenTK.Graphics.OpenGL.BeginMode[] mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount, Int32 modestride)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -119401,16 +119288,7 @@ namespace OpenTK.Graphics.OpenGL
                     fixed (OpenTK.Graphics.OpenGL.BeginMode* mode_ptr = mode)
                     fixed (Int32* count_ptr = count)
                     {
-                        GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
-                        try
-                        {
-                            Delegates.glMultiModeDrawElementsIBM((OpenTK.Graphics.OpenGL.BeginMode*)mode_ptr, (Int32*)count_ptr, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount, (Int32)modestride);
-                            indices = (T3)indices_ptr.Target;
-                        }
-                        finally
-                        {
-                            indices_ptr.Free();
-                        }
+                        Delegates.glMultiModeDrawElementsIBM((OpenTK.Graphics.OpenGL.BeginMode*)mode_ptr, (Int32*)count_ptr, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount, (Int32)modestride);
                     }
                 }
                 #if DEBUG
@@ -119420,7 +119298,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")]
             public static 
-            void MultiModeDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode[] mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount, Int32 modestride)
+            void MultiModeDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode[] mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount, Int32 modestride)
                 where T3 : struct
             {
                 #if DEBUG
@@ -119480,7 +119358,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")]
             public static 
-            void MultiModeDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode[] mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount, Int32 modestride)
+            void MultiModeDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode[] mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount, Int32 modestride)
                 where T3 : struct
             {
                 #if DEBUG
@@ -119510,7 +119388,8 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")]
             public static 
-            void MultiModeDrawElements(OpenTK.Graphics.OpenGL.BeginMode[] mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount, Int32 modestride)
+            void MultiModeDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode[] mode, Int32[] count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount, Int32 modestride)
+                where T3 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -119520,28 +119399,6 @@ namespace OpenTK.Graphics.OpenGL
                 {
                     fixed (OpenTK.Graphics.OpenGL.BeginMode* mode_ptr = mode)
                     fixed (Int32* count_ptr = count)
-                    {
-                        Delegates.glMultiModeDrawElementsIBM((OpenTK.Graphics.OpenGL.BeginMode*)mode_ptr, (Int32*)count_ptr, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount, (Int32)modestride);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")]
-            public static 
-            void MultiModeDrawElements<T3>(ref OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount, Int32 modestride)
-                where T3 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (OpenTK.Graphics.OpenGL.BeginMode* mode_ptr = &mode)
-                    fixed (Int32* count_ptr = &count)
                     {
                         GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
                         try
@@ -119562,7 +119419,28 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")]
             public static 
-            void MultiModeDrawElements<T3>(ref OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount, Int32 modestride)
+            void MultiModeDrawElements(ref OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount, Int32 modestride)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (OpenTK.Graphics.OpenGL.BeginMode* mode_ptr = &mode)
+                    fixed (Int32* count_ptr = &count)
+                    {
+                        Delegates.glMultiModeDrawElementsIBM((OpenTK.Graphics.OpenGL.BeginMode*)mode_ptr, (Int32*)count_ptr, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount, (Int32)modestride);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")]
+            public static 
+            void MultiModeDrawElements<T3>(ref OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount, Int32 modestride)
                 where T3 : struct
             {
                 #if DEBUG
@@ -119622,7 +119500,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")]
             public static 
-            void MultiModeDrawElements<T3>(ref OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount, Int32 modestride)
+            void MultiModeDrawElements<T3>(ref OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount, Int32 modestride)
                 where T3 : struct
             {
                 #if DEBUG
@@ -119652,7 +119530,8 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")]
             public static 
-            void MultiModeDrawElements(ref OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount, Int32 modestride)
+            void MultiModeDrawElements<T3>(ref OpenTK.Graphics.OpenGL.BeginMode mode, ref Int32 count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount, Int32 modestride)
+                where T3 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -119663,7 +119542,16 @@ namespace OpenTK.Graphics.OpenGL
                     fixed (OpenTK.Graphics.OpenGL.BeginMode* mode_ptr = &mode)
                     fixed (Int32* count_ptr = &count)
                     {
-                        Delegates.glMultiModeDrawElementsIBM((OpenTK.Graphics.OpenGL.BeginMode*)mode_ptr, (Int32*)count_ptr, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount, (Int32)modestride);
+                        GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
+                        try
+                        {
+                            Delegates.glMultiModeDrawElementsIBM((OpenTK.Graphics.OpenGL.BeginMode*)mode_ptr, (Int32*)count_ptr, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount, (Int32)modestride);
+                            indices = (T3)indices_ptr.Target;
+                        }
+                        finally
+                        {
+                            indices_ptr.Free();
+                        }
                     }
                 }
                 #if DEBUG
@@ -119671,24 +119559,112 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glNormalPointerListIBM")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")]
             public static 
-            void NormalPointerList<T2>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T2 pointer, Int32 ptrstride)
-                where T2 : struct
+            unsafe void MultiModeDrawElements(OpenTK.Graphics.OpenGL.BeginMode* mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, IntPtr indices, Int32 primcount, Int32 modestride)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                Delegates.glMultiModeDrawElementsIBM((OpenTK.Graphics.OpenGL.BeginMode*)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices, (Int32)primcount, (Int32)modestride);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")]
+            public static 
+            unsafe void MultiModeDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode* mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[] indices, Int32 primcount, Int32 modestride)
+                where T3 : struct
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glNormalPointerListIBM((OpenTK.Graphics.OpenGL.NormalPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject(), (Int32)ptrstride);
-                    pointer = (T2)pointer_ptr.Target;
+                    Delegates.glMultiModeDrawElementsIBM((OpenTK.Graphics.OpenGL.BeginMode*)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount, (Int32)modestride);
                 }
                 finally
                 {
-                    pointer_ptr.Free();
+                    indices_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")]
+            public static 
+            unsafe void MultiModeDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode* mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,] indices, Int32 primcount, Int32 modestride)
+                where T3 : struct
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glMultiModeDrawElementsIBM((OpenTK.Graphics.OpenGL.BeginMode*)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount, (Int32)modestride);
+                }
+                finally
+                {
+                    indices_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")]
+            public static 
+            unsafe void MultiModeDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode* mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] T3[,,] indices, Int32 primcount, Int32 modestride)
+                where T3 : struct
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glMultiModeDrawElementsIBM((OpenTK.Graphics.OpenGL.BeginMode*)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount, (Int32)modestride);
+                }
+                finally
+                {
+                    indices_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "IbmMultimodeDrawArrays", Version = "1.1", EntryPoint = "glMultiModeDrawElementsIBM")]
+            public static 
+            unsafe void MultiModeDrawElements<T3>(OpenTK.Graphics.OpenGL.BeginMode* mode, Int32* count, OpenTK.Graphics.OpenGL.DrawElementsType type, [InAttribute, OutAttribute] ref T3 indices, Int32 primcount, Int32 modestride)
+                where T3 : struct
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                GCHandle indices_ptr = GCHandle.Alloc(indices, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glMultiModeDrawElementsIBM((OpenTK.Graphics.OpenGL.BeginMode*)mode, (Int32*)count, (OpenTK.Graphics.OpenGL.DrawElementsType)type, (IntPtr)indices_ptr.AddrOfPinnedObject(), (Int32)primcount, (Int32)modestride);
+                    indices = (T3)indices_ptr.Target;
+                }
+                finally
+                {
+                    indices_ptr.Free();
                 }
                 #if DEBUG
                 }
@@ -119697,7 +119673,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glNormalPointerListIBM")]
             public static 
-            void NormalPointerList<T2>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, [InAttribute, OutAttribute] T2[,,] pointer, Int32 ptrstride)
+            void NormalPointerList(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, IntPtr pointer, Int32 ptrstride)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glNormalPointerListIBM((OpenTK.Graphics.OpenGL.NormalPointerType)type, (Int32)stride, (IntPtr)pointer, (Int32)ptrstride);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glNormalPointerListIBM")]
+            public static 
+            void NormalPointerList<T2>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, [InAttribute, OutAttribute] T2[] pointer, Int32 ptrstride)
                 where T2 : struct
             {
                 #if DEBUG
@@ -119743,7 +119733,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glNormalPointerListIBM")]
             public static 
-            void NormalPointerList<T2>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, [InAttribute, OutAttribute] T2[] pointer, Int32 ptrstride)
+            void NormalPointerList<T2>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, [InAttribute, OutAttribute] T2[,,] pointer, Int32 ptrstride)
                 where T2 : struct
             {
                 #if DEBUG
@@ -119766,22 +119756,8 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glNormalPointerListIBM")]
             public static 
-            void NormalPointerList(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, IntPtr pointer, Int32 ptrstride)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glNormalPointerListIBM((OpenTK.Graphics.OpenGL.NormalPointerType)type, (Int32)stride, (IntPtr)pointer, (Int32)ptrstride);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glSecondaryColorPointerListIBM")]
-            public static 
-            void SecondaryColorPointerList<T3>(Int32 size, OpenTK.Graphics.OpenGL.IbmVertexArrayLists type, Int32 stride, [InAttribute, OutAttribute] ref T3 pointer, Int32 ptrstride)
-                where T3 : struct
+            void NormalPointerList<T2>(OpenTK.Graphics.OpenGL.NormalPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T2 pointer, Int32 ptrstride)
+                where T2 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -119790,8 +119766,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glSecondaryColorPointerListIBM((Int32)size, (OpenTK.Graphics.OpenGL.IbmVertexArrayLists)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject(), (Int32)ptrstride);
-                    pointer = (T3)pointer_ptr.Target;
+                    Delegates.glNormalPointerListIBM((OpenTK.Graphics.OpenGL.NormalPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject(), (Int32)ptrstride);
+                    pointer = (T2)pointer_ptr.Target;
                 }
                 finally
                 {
@@ -119804,7 +119780,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glSecondaryColorPointerListIBM")]
             public static 
-            void SecondaryColorPointerList<T3>(Int32 size, OpenTK.Graphics.OpenGL.IbmVertexArrayLists type, Int32 stride, [InAttribute, OutAttribute] T3[,,] pointer, Int32 ptrstride)
+            void SecondaryColorPointerList(Int32 size, OpenTK.Graphics.OpenGL.IbmVertexArrayLists type, Int32 stride, IntPtr pointer, Int32 ptrstride)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glSecondaryColorPointerListIBM((Int32)size, (OpenTK.Graphics.OpenGL.IbmVertexArrayLists)type, (Int32)stride, (IntPtr)pointer, (Int32)ptrstride);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glSecondaryColorPointerListIBM")]
+            public static 
+            void SecondaryColorPointerList<T3>(Int32 size, OpenTK.Graphics.OpenGL.IbmVertexArrayLists type, Int32 stride, [InAttribute, OutAttribute] T3[] pointer, Int32 ptrstride)
                 where T3 : struct
             {
                 #if DEBUG
@@ -119850,7 +119840,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glSecondaryColorPointerListIBM")]
             public static 
-            void SecondaryColorPointerList<T3>(Int32 size, OpenTK.Graphics.OpenGL.IbmVertexArrayLists type, Int32 stride, [InAttribute, OutAttribute] T3[] pointer, Int32 ptrstride)
+            void SecondaryColorPointerList<T3>(Int32 size, OpenTK.Graphics.OpenGL.IbmVertexArrayLists type, Int32 stride, [InAttribute, OutAttribute] T3[,,] pointer, Int32 ptrstride)
                 where T3 : struct
             {
                 #if DEBUG
@@ -119873,21 +119863,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glSecondaryColorPointerListIBM")]
             public static 
-            void SecondaryColorPointerList(Int32 size, OpenTK.Graphics.OpenGL.IbmVertexArrayLists type, Int32 stride, IntPtr pointer, Int32 ptrstride)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glSecondaryColorPointerListIBM((Int32)size, (OpenTK.Graphics.OpenGL.IbmVertexArrayLists)type, (Int32)stride, (IntPtr)pointer, (Int32)ptrstride);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glTexCoordPointerListIBM")]
-            public static 
-            void TexCoordPointerList<T3>(Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T3 pointer, Int32 ptrstride)
+            void SecondaryColorPointerList<T3>(Int32 size, OpenTK.Graphics.OpenGL.IbmVertexArrayLists type, Int32 stride, [InAttribute, OutAttribute] ref T3 pointer, Int32 ptrstride)
                 where T3 : struct
             {
                 #if DEBUG
@@ -119897,7 +119873,7 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glTexCoordPointerListIBM((Int32)size, (OpenTK.Graphics.OpenGL.TexCoordPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject(), (Int32)ptrstride);
+                    Delegates.glSecondaryColorPointerListIBM((Int32)size, (OpenTK.Graphics.OpenGL.IbmVertexArrayLists)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject(), (Int32)ptrstride);
                     pointer = (T3)pointer_ptr.Target;
                 }
                 finally
@@ -119911,7 +119887,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glTexCoordPointerListIBM")]
             public static 
-            void TexCoordPointerList<T3>(Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[,,] pointer, Int32 ptrstride)
+            void TexCoordPointerList(Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, IntPtr pointer, Int32 ptrstride)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTexCoordPointerListIBM((Int32)size, (OpenTK.Graphics.OpenGL.TexCoordPointerType)type, (Int32)stride, (IntPtr)pointer, (Int32)ptrstride);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glTexCoordPointerListIBM")]
+            public static 
+            void TexCoordPointerList<T3>(Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[] pointer, Int32 ptrstride)
                 where T3 : struct
             {
                 #if DEBUG
@@ -119957,7 +119947,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glTexCoordPointerListIBM")]
             public static 
-            void TexCoordPointerList<T3>(Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[] pointer, Int32 ptrstride)
+            void TexCoordPointerList<T3>(Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[,,] pointer, Int32 ptrstride)
                 where T3 : struct
             {
                 #if DEBUG
@@ -119980,21 +119970,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glTexCoordPointerListIBM")]
             public static 
-            void TexCoordPointerList(Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, IntPtr pointer, Int32 ptrstride)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glTexCoordPointerListIBM((Int32)size, (OpenTK.Graphics.OpenGL.TexCoordPointerType)type, (Int32)stride, (IntPtr)pointer, (Int32)ptrstride);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glVertexPointerListIBM")]
-            public static 
-            void VertexPointerList<T3>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T3 pointer, Int32 ptrstride)
+            void TexCoordPointerList<T3>(Int32 size, OpenTK.Graphics.OpenGL.TexCoordPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T3 pointer, Int32 ptrstride)
                 where T3 : struct
             {
                 #if DEBUG
@@ -120004,7 +119980,7 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glVertexPointerListIBM((Int32)size, (OpenTK.Graphics.OpenGL.VertexPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject(), (Int32)ptrstride);
+                    Delegates.glTexCoordPointerListIBM((Int32)size, (OpenTK.Graphics.OpenGL.TexCoordPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject(), (Int32)ptrstride);
                     pointer = (T3)pointer_ptr.Target;
                 }
                 finally
@@ -120018,7 +119994,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glVertexPointerListIBM")]
             public static 
-            void VertexPointerList<T3>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[,,] pointer, Int32 ptrstride)
+            void VertexPointerList(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, Int32 stride, IntPtr pointer, Int32 ptrstride)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexPointerListIBM((Int32)size, (OpenTK.Graphics.OpenGL.VertexPointerType)type, (Int32)stride, (IntPtr)pointer, (Int32)ptrstride);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glVertexPointerListIBM")]
+            public static 
+            void VertexPointerList<T3>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[] pointer, Int32 ptrstride)
                 where T3 : struct
             {
                 #if DEBUG
@@ -120064,7 +120054,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glVertexPointerListIBM")]
             public static 
-            void VertexPointerList<T3>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[] pointer, Int32 ptrstride)
+            void VertexPointerList<T3>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, Int32 stride, [InAttribute, OutAttribute] T3[,,] pointer, Int32 ptrstride)
                 where T3 : struct
             {
                 #if DEBUG
@@ -120087,13 +120077,23 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "IbmVertexArrayLists", Version = "1.1", EntryPoint = "glVertexPointerListIBM")]
             public static 
-            void VertexPointerList(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, Int32 stride, IntPtr pointer, Int32 ptrstride)
+            void VertexPointerList<T3>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, Int32 stride, [InAttribute, OutAttribute] ref T3 pointer, Int32 ptrstride)
+                where T3 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glVertexPointerListIBM((Int32)size, (OpenTK.Graphics.OpenGL.VertexPointerType)type, (Int32)stride, (IntPtr)pointer, (Int32)ptrstride);
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glVertexPointerListIBM((Int32)size, (OpenTK.Graphics.OpenGL.VertexPointerType)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject(), (Int32)ptrstride);
+                    pointer = (T3)pointer_ptr.Target;
+                }
+                finally
+                {
+                    pointer_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -120171,23 +120171,13 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "IntelParallelArrays", Version = "1.1", EntryPoint = "glColorPointervINTEL")]
             public static 
-            void ColorPointer<T2>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, [InAttribute, OutAttribute] ref T2 pointer)
-                where T2 : struct
+            void ColorPointer(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, IntPtr pointer)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glColorPointervINTEL((Int32)size, (OpenTK.Graphics.OpenGL.VertexPointerType)type, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                    pointer = (T2)pointer_ptr.Target;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
+                Delegates.glColorPointervINTEL((Int32)size, (OpenTK.Graphics.OpenGL.VertexPointerType)type, (IntPtr)pointer);
                 #if DEBUG
                 }
                 #endif
@@ -120219,7 +120209,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "IntelParallelArrays", Version = "1.1", EntryPoint = "glColorPointervINTEL")]
             public static 
-            void ColorPointer<T2>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, [InAttribute, OutAttribute] T2[,,] pointer)
+            void ColorPointer<T2>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, [InAttribute, OutAttribute] T2[] pointer)
                 where T2 : struct
             {
                 #if DEBUG
@@ -120313,7 +120303,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "IntelParallelArrays", Version = "1.1", EntryPoint = "glColorPointervINTEL")]
             public static 
-            void ColorPointer<T2>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, [InAttribute, OutAttribute] T2[] pointer)
+            void ColorPointer<T2>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, [InAttribute, OutAttribute] T2[,,] pointer)
                 where T2 : struct
             {
                 #if DEBUG
@@ -120360,41 +120350,8 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "IntelParallelArrays", Version = "1.1", EntryPoint = "glColorPointervINTEL")]
             public static 
-            void ColorPointer(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, IntPtr pointer)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glColorPointervINTEL((Int32)size, (OpenTK.Graphics.OpenGL.VertexPointerType)type, (IntPtr)pointer);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Define an array of normals
-        /// </summary>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the data type of each coordinate in the array. Symbolic constants GL_BYTE, GL_SHORT, GL_INT, GL_FLOAT, and GL_DOUBLE are accepted. The initial value is GL_FLOAT.
-        /// </para>
-        /// </param>
-        /// <param name="stride">
-        /// <para>
-        /// Specifies the byte offset between consecutive normals. If stride is 0, the normals are understood to be tightly packed in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-        /// <param name="pointer">
-        /// <para>
-        /// Specifies a pointer to the first coordinate of the first normal in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "IntelParallelArrays", Version = "1.1", EntryPoint = "glNormalPointervINTEL")]
-            public static 
-            void NormalPointer<T1>(OpenTK.Graphics.OpenGL.NormalPointerType type, [InAttribute, OutAttribute] ref T1 pointer)
-                where T1 : struct
+            void ColorPointer<T2>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, [InAttribute, OutAttribute] ref T2 pointer)
+                where T2 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -120403,8 +120360,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glNormalPointervINTEL((OpenTK.Graphics.OpenGL.NormalPointerType)type, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                    pointer = (T1)pointer_ptr.Target;
+                    Delegates.glColorPointervINTEL((Int32)size, (OpenTK.Graphics.OpenGL.VertexPointerType)type, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    pointer = (T2)pointer_ptr.Target;
                 }
                 finally
                 {
@@ -120436,7 +120393,40 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "IntelParallelArrays", Version = "1.1", EntryPoint = "glNormalPointervINTEL")]
             public static 
-            void NormalPointer<T1>(OpenTK.Graphics.OpenGL.NormalPointerType type, [InAttribute, OutAttribute] T1[,,] pointer)
+            void NormalPointer(OpenTK.Graphics.OpenGL.NormalPointerType type, IntPtr pointer)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glNormalPointervINTEL((OpenTK.Graphics.OpenGL.NormalPointerType)type, (IntPtr)pointer);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Define an array of normals
+        /// </summary>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the data type of each coordinate in the array. Symbolic constants GL_BYTE, GL_SHORT, GL_INT, GL_FLOAT, and GL_DOUBLE are accepted. The initial value is GL_FLOAT.
+        /// </para>
+        /// </param>
+        /// <param name="stride">
+        /// <para>
+        /// Specifies the byte offset between consecutive normals. If stride is 0, the normals are understood to be tightly packed in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+        /// <param name="pointer">
+        /// <para>
+        /// Specifies a pointer to the first coordinate of the first normal in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "IntelParallelArrays", Version = "1.1", EntryPoint = "glNormalPointervINTEL")]
+            public static 
+            void NormalPointer<T1>(OpenTK.Graphics.OpenGL.NormalPointerType type, [InAttribute, OutAttribute] T1[] pointer)
                 where T1 : struct
             {
                 #if DEBUG
@@ -120520,7 +120510,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "IntelParallelArrays", Version = "1.1", EntryPoint = "glNormalPointervINTEL")]
             public static 
-            void NormalPointer<T1>(OpenTK.Graphics.OpenGL.NormalPointerType type, [InAttribute, OutAttribute] T1[] pointer)
+            void NormalPointer<T1>(OpenTK.Graphics.OpenGL.NormalPointerType type, [InAttribute, OutAttribute] T1[,,] pointer)
                 where T1 : struct
             {
                 #if DEBUG
@@ -120562,46 +120552,8 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "IntelParallelArrays", Version = "1.1", EntryPoint = "glNormalPointervINTEL")]
             public static 
-            void NormalPointer(OpenTK.Graphics.OpenGL.NormalPointerType type, IntPtr pointer)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glNormalPointervINTEL((OpenTK.Graphics.OpenGL.NormalPointerType)type, (IntPtr)pointer);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Define an array of texture coordinates
-        /// </summary>
-        /// <param name="size">
-        /// <para>
-        /// Specifies the number of coordinates per array element. Must be 1, 2, 3, or 4. The initial value is 4.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the data type of each texture coordinate. Symbolic constants GL_SHORT, GL_INT, GL_FLOAT, or GL_DOUBLE are accepted. The initial value is GL_FLOAT.
-        /// </para>
-        /// </param>
-        /// <param name="stride">
-        /// <para>
-        /// Specifies the byte offset between consecutive texture coordinate sets. If stride is 0, the array elements are understood to be tightly packed. The initial value is 0.
-        /// </para>
-        /// </param>
-        /// <param name="pointer">
-        /// <para>
-        /// Specifies a pointer to the first coordinate of the first texture coordinate set in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "IntelParallelArrays", Version = "1.1", EntryPoint = "glTexCoordPointervINTEL")]
-            public static 
-            void TexCoordPointer<T2>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, [InAttribute, OutAttribute] ref T2 pointer)
-                where T2 : struct
+            void NormalPointer<T1>(OpenTK.Graphics.OpenGL.NormalPointerType type, [InAttribute, OutAttribute] ref T1 pointer)
+                where T1 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -120610,8 +120562,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glTexCoordPointervINTEL((Int32)size, (OpenTK.Graphics.OpenGL.VertexPointerType)type, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                    pointer = (T2)pointer_ptr.Target;
+                    Delegates.glNormalPointervINTEL((OpenTK.Graphics.OpenGL.NormalPointerType)type, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    pointer = (T1)pointer_ptr.Target;
                 }
                 finally
                 {
@@ -120648,7 +120600,45 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "IntelParallelArrays", Version = "1.1", EntryPoint = "glTexCoordPointervINTEL")]
             public static 
-            void TexCoordPointer<T2>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, [InAttribute, OutAttribute] T2[,,] pointer)
+            void TexCoordPointer(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, IntPtr pointer)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTexCoordPointervINTEL((Int32)size, (OpenTK.Graphics.OpenGL.VertexPointerType)type, (IntPtr)pointer);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Define an array of texture coordinates
+        /// </summary>
+        /// <param name="size">
+        /// <para>
+        /// Specifies the number of coordinates per array element. Must be 1, 2, 3, or 4. The initial value is 4.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the data type of each texture coordinate. Symbolic constants GL_SHORT, GL_INT, GL_FLOAT, or GL_DOUBLE are accepted. The initial value is GL_FLOAT.
+        /// </para>
+        /// </param>
+        /// <param name="stride">
+        /// <para>
+        /// Specifies the byte offset between consecutive texture coordinate sets. If stride is 0, the array elements are understood to be tightly packed. The initial value is 0.
+        /// </para>
+        /// </param>
+        /// <param name="pointer">
+        /// <para>
+        /// Specifies a pointer to the first coordinate of the first texture coordinate set in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "IntelParallelArrays", Version = "1.1", EntryPoint = "glTexCoordPointervINTEL")]
+            public static 
+            void TexCoordPointer<T2>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, [InAttribute, OutAttribute] T2[] pointer)
                 where T2 : struct
             {
                 #if DEBUG
@@ -120742,7 +120732,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "IntelParallelArrays", Version = "1.1", EntryPoint = "glTexCoordPointervINTEL")]
             public static 
-            void TexCoordPointer<T2>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, [InAttribute, OutAttribute] T2[] pointer)
+            void TexCoordPointer<T2>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, [InAttribute, OutAttribute] T2[,,] pointer)
                 where T2 : struct
             {
                 #if DEBUG
@@ -120789,45 +120779,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "IntelParallelArrays", Version = "1.1", EntryPoint = "glTexCoordPointervINTEL")]
             public static 
-            void TexCoordPointer(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, IntPtr pointer)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glTexCoordPointervINTEL((Int32)size, (OpenTK.Graphics.OpenGL.VertexPointerType)type, (IntPtr)pointer);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Define an array of vertex data
-        /// </summary>
-        /// <param name="size">
-        /// <para>
-        /// Specifies the number of coordinates per vertex. Must be 2, 3, or 4. The initial value is 4.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the data type of each coordinate in the array. Symbolic constants GL_SHORT, GL_INT, GL_FLOAT, or GL_DOUBLE are accepted. The initial value is GL_FLOAT.
-        /// </para>
-        /// </param>
-        /// <param name="stride">
-        /// <para>
-        /// Specifies the byte offset between consecutive vertices. If stride is 0, the vertices are understood to be tightly packed in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-        /// <param name="pointer">
-        /// <para>
-        /// Specifies a pointer to the first coordinate of the first vertex in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "IntelParallelArrays", Version = "1.1", EntryPoint = "glVertexPointervINTEL")]
-            public static 
-            void VertexPointer<T2>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, [InAttribute, OutAttribute] ref T2 pointer)
+            void TexCoordPointer<T2>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, [InAttribute, OutAttribute] ref T2 pointer)
                 where T2 : struct
             {
                 #if DEBUG
@@ -120837,7 +120789,7 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glVertexPointervINTEL((Int32)size, (OpenTK.Graphics.OpenGL.VertexPointerType)type, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    Delegates.glTexCoordPointervINTEL((Int32)size, (OpenTK.Graphics.OpenGL.VertexPointerType)type, (IntPtr)pointer_ptr.AddrOfPinnedObject());
                     pointer = (T2)pointer_ptr.Target;
                 }
                 finally
@@ -120875,7 +120827,45 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "IntelParallelArrays", Version = "1.1", EntryPoint = "glVertexPointervINTEL")]
             public static 
-            void VertexPointer<T2>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, [InAttribute, OutAttribute] T2[,,] pointer)
+            void VertexPointer(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, IntPtr pointer)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexPointervINTEL((Int32)size, (OpenTK.Graphics.OpenGL.VertexPointerType)type, (IntPtr)pointer);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Define an array of vertex data
+        /// </summary>
+        /// <param name="size">
+        /// <para>
+        /// Specifies the number of coordinates per vertex. Must be 2, 3, or 4. The initial value is 4.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the data type of each coordinate in the array. Symbolic constants GL_SHORT, GL_INT, GL_FLOAT, or GL_DOUBLE are accepted. The initial value is GL_FLOAT.
+        /// </para>
+        /// </param>
+        /// <param name="stride">
+        /// <para>
+        /// Specifies the byte offset between consecutive vertices. If stride is 0, the vertices are understood to be tightly packed in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+        /// <param name="pointer">
+        /// <para>
+        /// Specifies a pointer to the first coordinate of the first vertex in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "IntelParallelArrays", Version = "1.1", EntryPoint = "glVertexPointervINTEL")]
+            public static 
+            void VertexPointer<T2>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, [InAttribute, OutAttribute] T2[] pointer)
                 where T2 : struct
             {
                 #if DEBUG
@@ -120969,7 +120959,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "IntelParallelArrays", Version = "1.1", EntryPoint = "glVertexPointervINTEL")]
             public static 
-            void VertexPointer<T2>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, [InAttribute, OutAttribute] T2[] pointer)
+            void VertexPointer<T2>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, [InAttribute, OutAttribute] T2[,,] pointer)
                 where T2 : struct
             {
                 #if DEBUG
@@ -121016,13 +121006,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "IntelParallelArrays", Version = "1.1", EntryPoint = "glVertexPointervINTEL")]
             public static 
-            void VertexPointer(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, IntPtr pointer)
+            void VertexPointer<T2>(Int32 size, OpenTK.Graphics.OpenGL.VertexPointerType type, [InAttribute, OutAttribute] ref T2 pointer)
+                where T2 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glVertexPointervINTEL((Int32)size, (OpenTK.Graphics.OpenGL.VertexPointerType)type, (IntPtr)pointer);
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glVertexPointervINTEL((Int32)size, (OpenTK.Graphics.OpenGL.VertexPointerType)type, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    pointer = (T2)pointer_ptr.Target;
+                }
+                finally
+                {
+                    pointer_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -121070,30 +121070,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specify the raster position in window coordinates for pixel operations
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify the , , coordinates for the raster position.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos2dvMESA")]
-            public static 
-            unsafe void WindowPos2(Double* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glWindowPos2dvMESA((Double*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -121152,6 +121128,30 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specify the raster position in window coordinates for pixel operations
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify the , , coordinates for the raster position.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos2dvMESA")]
+            public static 
+            unsafe void WindowPos2(Double* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glWindowPos2dvMESA((Double*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -121175,6 +121175,35 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specify the raster position in window coordinates for pixel operations
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify the , , coordinates for the raster position.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos2fvMESA")]
+            public static 
+            void WindowPos2(Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glWindowPos2fvMESA((Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -121228,35 +121257,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specify the raster position in window coordinates for pixel operations
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify the , , coordinates for the raster position.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos2fvMESA")]
-            public static 
-            void WindowPos2(Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glWindowPos2fvMESA((Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -121280,30 +121280,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specify the raster position in window coordinates for pixel operations
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify the , , coordinates for the raster position.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos2ivMESA")]
-            public static 
-            unsafe void WindowPos2(Int32* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glWindowPos2ivMESA((Int32*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -121370,15 +121346,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , coordinates for the raster position.
         /// </para>
         /// </param>
-            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos2sMESA")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos2ivMESA")]
             public static 
-            void WindowPos2(Int16 x, Int16 y)
+            unsafe void WindowPos2(Int32* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glWindowPos2sMESA((Int16)x, (Int16)y);
+                Delegates.glWindowPos2ivMESA((Int32*)v);
                 #if DEBUG
                 }
                 #endif
@@ -121393,16 +121370,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , coordinates for the raster position.
         /// </para>
         /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos2svMESA")]
+            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos2sMESA")]
             public static 
-            unsafe void WindowPos2(Int16* v)
+            void WindowPos2(Int16 x, Int16 y)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glWindowPos2svMESA((Int16*)v);
+                Delegates.glWindowPos2sMESA((Int16)x, (Int16)y);
                 #if DEBUG
                 }
                 #endif
@@ -121475,15 +121451,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , coordinates for the raster position.
         /// </para>
         /// </param>
-            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos3dMESA")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos2svMESA")]
             public static 
-            void WindowPos3(Double x, Double y, Double z)
+            unsafe void WindowPos2(Int16* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glWindowPos3dMESA((Double)x, (Double)y, (Double)z);
+                Delegates.glWindowPos2svMESA((Int16*)v);
                 #if DEBUG
                 }
                 #endif
@@ -121498,16 +121475,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , coordinates for the raster position.
         /// </para>
         /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos3dvMESA")]
+            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos3dMESA")]
             public static 
-            unsafe void WindowPos3(Double* v)
+            void WindowPos3(Double x, Double y, Double z)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glWindowPos3dvMESA((Double*)v);
+                Delegates.glWindowPos3dMESA((Double)x, (Double)y, (Double)z);
                 #if DEBUG
                 }
                 #endif
@@ -121572,6 +121548,30 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specify the raster position in window coordinates for pixel operations
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify the , , coordinates for the raster position.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos3dvMESA")]
+            public static 
+            unsafe void WindowPos3(Double* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glWindowPos3dvMESA((Double*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -121595,6 +121595,35 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specify the raster position in window coordinates for pixel operations
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify the , , coordinates for the raster position.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos3fvMESA")]
+            public static 
+            void WindowPos3(Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glWindowPos3fvMESA((Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -121648,35 +121677,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specify the raster position in window coordinates for pixel operations
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify the , , coordinates for the raster position.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos3fvMESA")]
-            public static 
-            void WindowPos3(Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glWindowPos3fvMESA((Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -121700,30 +121700,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specify the raster position in window coordinates for pixel operations
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify the , , coordinates for the raster position.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos3ivMESA")]
-            public static 
-            unsafe void WindowPos3(Int32* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glWindowPos3ivMESA((Int32*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -121790,15 +121766,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , coordinates for the raster position.
         /// </para>
         /// </param>
-            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos3sMESA")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos3ivMESA")]
             public static 
-            void WindowPos3(Int16 x, Int16 y, Int16 z)
+            unsafe void WindowPos3(Int32* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glWindowPos3sMESA((Int16)x, (Int16)y, (Int16)z);
+                Delegates.glWindowPos3ivMESA((Int32*)v);
                 #if DEBUG
                 }
                 #endif
@@ -121813,16 +121790,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , coordinates for the raster position.
         /// </para>
         /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos3svMESA")]
+            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos3sMESA")]
             public static 
-            unsafe void WindowPos3(Int16* v)
+            void WindowPos3(Int16 x, Int16 y, Int16 z)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glWindowPos3svMESA((Int16*)v);
+                Delegates.glWindowPos3sMESA((Int16)x, (Int16)y, (Int16)z);
                 #if DEBUG
                 }
                 #endif
@@ -121895,15 +121871,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , coordinates for the raster position.
         /// </para>
         /// </param>
-            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos4dMESA")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos3svMESA")]
             public static 
-            void WindowPos4(Double x, Double y, Double z, Double w)
+            unsafe void WindowPos3(Int16* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glWindowPos4dMESA((Double)x, (Double)y, (Double)z, (Double)w);
+                Delegates.glWindowPos3svMESA((Int16*)v);
                 #if DEBUG
                 }
                 #endif
@@ -121918,16 +121895,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , coordinates for the raster position.
         /// </para>
         /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos4dvMESA")]
+            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos4dMESA")]
             public static 
-            unsafe void WindowPos4(Double* v)
+            void WindowPos4(Double x, Double y, Double z, Double w)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glWindowPos4dvMESA((Double*)v);
+                Delegates.glWindowPos4dMESA((Double)x, (Double)y, (Double)z, (Double)w);
                 #if DEBUG
                 }
                 #endif
@@ -121992,6 +121968,30 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specify the raster position in window coordinates for pixel operations
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify the , , coordinates for the raster position.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos4dvMESA")]
+            public static 
+            unsafe void WindowPos4(Double* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glWindowPos4dvMESA((Double*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -122015,6 +122015,35 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specify the raster position in window coordinates for pixel operations
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify the , , coordinates for the raster position.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos4fvMESA")]
+            public static 
+            void WindowPos4(Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glWindowPos4fvMESA((Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -122068,35 +122097,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specify the raster position in window coordinates for pixel operations
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify the , , coordinates for the raster position.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos4fvMESA")]
-            public static 
-            void WindowPos4(Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glWindowPos4fvMESA((Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -122120,30 +122120,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specify the raster position in window coordinates for pixel operations
-        /// </summary>
-        /// <param name="x">
-        /// <para>
-        /// Specify the , , coordinates for the raster position.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos4ivMESA")]
-            public static 
-            unsafe void WindowPos4(Int32* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glWindowPos4ivMESA((Int32*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specify the raster position in window coordinates for pixel operations
         /// </summary>
@@ -122210,15 +122186,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , coordinates for the raster position.
         /// </para>
         /// </param>
-            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos4sMESA")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos4ivMESA")]
             public static 
-            void WindowPos4(Int16 x, Int16 y, Int16 z, Int16 w)
+            unsafe void WindowPos4(Int32* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glWindowPos4sMESA((Int16)x, (Int16)y, (Int16)z, (Int16)w);
+                Delegates.glWindowPos4ivMESA((Int32*)v);
                 #if DEBUG
                 }
                 #endif
@@ -122233,16 +122210,15 @@ namespace OpenTK.Graphics.OpenGL
         /// Specify the , , coordinates for the raster position.
         /// </para>
         /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos4svMESA")]
+            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos4sMESA")]
             public static 
-            unsafe void WindowPos4(Int16* v)
+            void WindowPos4(Int16 x, Int16 y, Int16 z, Int16 w)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glWindowPos4svMESA((Int16*)v);
+                Delegates.glWindowPos4sMESA((Int16)x, (Int16)y, (Int16)z, (Int16)w);
                 #if DEBUG
                 }
                 #endif
@@ -122306,6 +122282,30 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            
+        /// <summary>
+        /// Specify the raster position in window coordinates for pixel operations
+        /// </summary>
+        /// <param name="x">
+        /// <para>
+        /// Specify the , , coordinates for the raster position.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "MesaWindowPos", Version = "1.0", EntryPoint = "glWindowPos4svMESA")]
+            public static 
+            unsafe void WindowPos4(Int16* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glWindowPos4svMESA((Int16*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
         }
 
         public static partial class NV
@@ -122339,21 +122339,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glAreProgramsResidentNV")]
-            public static 
-            unsafe bool AreProgramsResident(Int32 n, Int32* programs, [OutAttribute] bool* residences)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                return Delegates.glAreProgramsResidentNV((Int32)n, (UInt32*)programs, (bool*)residences);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glAreProgramsResidentNV")]
             public static 
             bool AreProgramsResident(Int32 n, Int32[] programs, [OutAttribute] bool[] residences)
@@ -122398,6 +122383,43 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glAreProgramsResidentNV")]
+            public static 
+            unsafe bool AreProgramsResident(Int32 n, Int32* programs, [OutAttribute] bool* residences)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                return Delegates.glAreProgramsResidentNV((Int32)n, (UInt32*)programs, (bool*)residences);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glAreProgramsResidentNV")]
+            public static 
+            bool AreProgramsResident(Int32 n, UInt32[] programs, [OutAttribute] bool[] residences)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* programs_ptr = programs)
+                    fixed (bool* residences_ptr = residences)
+                    {
+                        return Delegates.glAreProgramsResidentNV((Int32)n, (UInt32*)programs_ptr, (bool*)residences_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glAreProgramsResidentNV")]
             public static 
@@ -122437,28 +122459,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glAreProgramsResidentNV")]
-            public static 
-            bool AreProgramsResident(Int32 n, UInt32[] programs, [OutAttribute] bool[] residences)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* programs_ptr = programs)
-                    fixed (bool* residences_ptr = residences)
-                    {
-                        return Delegates.glAreProgramsResidentNV((Int32)n, (UInt32*)programs_ptr, (bool*)residences_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvConditionalRender", Version = "", EntryPoint = "glBeginConditionalRenderNV")]
             public static 
             void BeginConditionalRender(Int32 id, OpenTK.Graphics.OpenGL.NvConditionalRender mode)
@@ -122713,21 +122713,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glColor3hvNV")]
-            public static 
-            unsafe void Color3h(OpenTK.Half* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glColor3hvNV((OpenTK.Half*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glColor3hvNV")]
             public static 
             void Color3h(OpenTK.Half[] v)
@@ -122768,6 +122753,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glColor3hvNV")]
+            public static 
+            unsafe void Color3h(OpenTK.Half* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glColor3hvNV((OpenTK.Half*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glColor4hNV")]
             public static 
             void Color4h(OpenTK.Half red, OpenTK.Half green, OpenTK.Half blue, OpenTK.Half alpha)
@@ -122782,21 +122782,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glColor4hvNV")]
-            public static 
-            unsafe void Color4h(OpenTK.Half* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glColor4hvNV((OpenTK.Half*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glColor4hvNV")]
             public static 
             void Color4h(OpenTK.Half[] v)
@@ -122837,6 +122822,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glColor4hvNV")]
+            public static 
+            unsafe void Color4h(OpenTK.Half* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glColor4hvNV((OpenTK.Half*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvRegisterCombiners", Version = "1.1", EntryPoint = "glCombinerInputNV")]
             public static 
             void CombinerInput(OpenTK.Graphics.OpenGL.NvRegisterCombiners stage, OpenTK.Graphics.OpenGL.NvRegisterCombiners portion, OpenTK.Graphics.OpenGL.NvRegisterCombiners variable, OpenTK.Graphics.OpenGL.NvRegisterCombiners input, OpenTK.Graphics.OpenGL.NvRegisterCombiners mapping, OpenTK.Graphics.OpenGL.NvRegisterCombiners componentUsage)
@@ -122879,21 +122879,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvRegisterCombiners", Version = "1.1", EntryPoint = "glCombinerParameterfvNV")]
-            public static 
-            unsafe void CombinerParameter(OpenTK.Graphics.OpenGL.NvRegisterCombiners pname, Single* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glCombinerParameterfvNV((OpenTK.Graphics.OpenGL.NvRegisterCombiners)pname, (Single*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvRegisterCombiners", Version = "1.1", EntryPoint = "glCombinerParameterfvNV")]
             public static 
             void CombinerParameter(OpenTK.Graphics.OpenGL.NvRegisterCombiners pname, Single[] @params)
@@ -122914,6 +122899,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvRegisterCombiners", Version = "1.1", EntryPoint = "glCombinerParameterfvNV")]
+            public static 
+            unsafe void CombinerParameter(OpenTK.Graphics.OpenGL.NvRegisterCombiners pname, Single* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glCombinerParameterfvNV((OpenTK.Graphics.OpenGL.NvRegisterCombiners)pname, (Single*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvRegisterCombiners", Version = "1.1", EntryPoint = "glCombinerParameteriNV")]
             public static 
             void CombinerParameter(OpenTK.Graphics.OpenGL.NvRegisterCombiners pname, Int32 param)
@@ -122928,6 +122928,26 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "NvRegisterCombiners", Version = "1.1", EntryPoint = "glCombinerParameterivNV")]
+            public static 
+            void CombinerParameter(OpenTK.Graphics.OpenGL.NvRegisterCombiners pname, Int32[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Int32* @params_ptr = @params)
+                    {
+                        Delegates.glCombinerParameterivNV((OpenTK.Graphics.OpenGL.NvRegisterCombiners)pname, (Int32*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvRegisterCombiners", Version = "1.1", EntryPoint = "glCombinerParameterivNV")]
             public static 
@@ -122943,9 +122963,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "NvRegisterCombiners", Version = "1.1", EntryPoint = "glCombinerParameterivNV")]
+            [AutoGenerated(Category = "NvRegisterCombiners2", Version = "1.1", EntryPoint = "glCombinerStageParameterfvNV")]
             public static 
-            void CombinerParameter(OpenTK.Graphics.OpenGL.NvRegisterCombiners pname, Int32[] @params)
+            void CombinerStageParameter(OpenTK.Graphics.OpenGL.NvRegisterCombiners2 stage, OpenTK.Graphics.OpenGL.NvRegisterCombiners2 pname, Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -122953,9 +122973,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
                 unsafe
                 {
-                    fixed (Int32* @params_ptr = @params)
+                    fixed (Single* @params_ptr = @params)
                     {
-                        Delegates.glCombinerParameterivNV((OpenTK.Graphics.OpenGL.NvRegisterCombiners)pname, (Int32*)@params_ptr);
+                        Delegates.glCombinerStageParameterfvNV((OpenTK.Graphics.OpenGL.NvRegisterCombiners2)stage, (OpenTK.Graphics.OpenGL.NvRegisterCombiners2)pname, (Single*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -122998,41 +123018,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "NvRegisterCombiners2", Version = "1.1", EntryPoint = "glCombinerStageParameterfvNV")]
-            public static 
-            void CombinerStageParameter(OpenTK.Graphics.OpenGL.NvRegisterCombiners2 stage, OpenTK.Graphics.OpenGL.NvRegisterCombiners2 pname, Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glCombinerStageParameterfvNV((OpenTK.Graphics.OpenGL.NvRegisterCombiners2)stage, (OpenTK.Graphics.OpenGL.NvRegisterCombiners2)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvFence", Version = "1.2", EntryPoint = "glDeleteFencesNV")]
-            public static 
-            unsafe void DeleteFences(Int32 n, Int32* fences)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glDeleteFencesNV((Int32)n, (UInt32*)fences);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvFence", Version = "1.2", EntryPoint = "glDeleteFencesNV")]
             public static 
             void DeleteFences(Int32 n, Int32[] fences)
@@ -123076,28 +123061,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvFence", Version = "1.2", EntryPoint = "glDeleteFencesNV")]
             public static 
-            void DeleteFences(Int32 n, ref UInt32 fences)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* fences_ptr = &fences)
-                    {
-                        Delegates.glDeleteFencesNV((Int32)n, (UInt32*)fences_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvFence", Version = "1.2", EntryPoint = "glDeleteFencesNV")]
-            public static 
-            unsafe void DeleteFences(Int32 n, UInt32* fences)
+            unsafe void DeleteFences(Int32 n, Int32* fences)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -123131,15 +123095,36 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvOcclusionQuery", Version = "1.2", EntryPoint = "glDeleteOcclusionQueriesNV")]
+            [AutoGenerated(Category = "NvFence", Version = "1.2", EntryPoint = "glDeleteFencesNV")]
             public static 
-            unsafe void DeleteOcclusionQueries(Int32 n, Int32* ids)
+            void DeleteFences(Int32 n, ref UInt32 fences)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glDeleteOcclusionQueriesNV((Int32)n, (UInt32*)ids);
+                unsafe
+                {
+                    fixed (UInt32* fences_ptr = &fences)
+                    {
+                        Delegates.glDeleteFencesNV((Int32)n, (UInt32*)fences_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvFence", Version = "1.2", EntryPoint = "glDeleteFencesNV")]
+            public static 
+            unsafe void DeleteFences(Int32 n, UInt32* fences)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glDeleteFencesNV((Int32)n, (UInt32*)fences);
                 #if DEBUG
                 }
                 #endif
@@ -123188,28 +123173,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvOcclusionQuery", Version = "1.2", EntryPoint = "glDeleteOcclusionQueriesNV")]
             public static 
-            void DeleteOcclusionQueries(Int32 n, ref UInt32 ids)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* ids_ptr = &ids)
-                    {
-                        Delegates.glDeleteOcclusionQueriesNV((Int32)n, (UInt32*)ids_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvOcclusionQuery", Version = "1.2", EntryPoint = "glDeleteOcclusionQueriesNV")]
-            public static 
-            unsafe void DeleteOcclusionQueries(Int32 n, UInt32* ids)
+            unsafe void DeleteOcclusionQueries(Int32 n, Int32* ids)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -123242,25 +123206,37 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            
-        /// <summary>
-        /// Deletes a program object
-        /// </summary>
-        /// <param name="program">
-        /// <para>
-        /// Specifies the program object to be deleted.
-        /// </para>
-        /// </param>
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glDeleteProgramsNV")]
+            [AutoGenerated(Category = "NvOcclusionQuery", Version = "1.2", EntryPoint = "glDeleteOcclusionQueriesNV")]
             public static 
-            unsafe void DeleteProgram(Int32 n, Int32* programs)
+            void DeleteOcclusionQueries(Int32 n, ref UInt32 ids)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glDeleteProgramsNV((Int32)n, (UInt32*)programs);
+                unsafe
+                {
+                    fixed (UInt32* ids_ptr = &ids)
+                    {
+                        Delegates.glDeleteOcclusionQueriesNV((Int32)n, (UInt32*)ids_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvOcclusionQuery", Version = "1.2", EntryPoint = "glDeleteOcclusionQueriesNV")]
+            public static 
+            unsafe void DeleteOcclusionQueries(Int32 n, UInt32* ids)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glDeleteOcclusionQueriesNV((Int32)n, (UInt32*)ids);
                 #if DEBUG
                 }
                 #endif
@@ -123336,37 +123312,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glDeleteProgramsNV")]
             public static 
-            void DeleteProgram(Int32 n, ref UInt32 programs)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* programs_ptr = &programs)
-                    {
-                        Delegates.glDeleteProgramsNV((Int32)n, (UInt32*)programs_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Deletes a program object
-        /// </summary>
-        /// <param name="program">
-        /// <para>
-        /// Specifies the program object to be deleted.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glDeleteProgramsNV")]
-            public static 
-            unsafe void DeleteProgram(Int32 n, UInt32* programs)
+            unsafe void DeleteProgram(Int32 n, Int32* programs)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -123408,16 +123354,55 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            
+        /// <summary>
+        /// Deletes a program object
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// Specifies the program object to be deleted.
+        /// </para>
+        /// </param>
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvTransformFeedback2", Version = "", EntryPoint = "glDeleteTransformFeedbacksNV")]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glDeleteProgramsNV")]
             public static 
-            unsafe void DeleteTransformFeedback(Int32 n, Int32* ids)
+            void DeleteProgram(Int32 n, ref UInt32 programs)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glDeleteTransformFeedbacksNV((Int32)n, (UInt32*)ids);
+                unsafe
+                {
+                    fixed (UInt32* programs_ptr = &programs)
+                    {
+                        Delegates.glDeleteProgramsNV((Int32)n, (UInt32*)programs_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Deletes a program object
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// Specifies the program object to be deleted.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glDeleteProgramsNV")]
+            public static 
+            unsafe void DeleteProgram(Int32 n, UInt32* programs)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glDeleteProgramsNV((Int32)n, (UInt32*)programs);
                 #if DEBUG
                 }
                 #endif
@@ -123463,6 +123448,42 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvTransformFeedback2", Version = "", EntryPoint = "glDeleteTransformFeedbacksNV")]
+            public static 
+            unsafe void DeleteTransformFeedback(Int32 n, Int32* ids)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glDeleteTransformFeedbacksNV((Int32)n, (UInt32*)ids);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvTransformFeedback2", Version = "", EntryPoint = "glDeleteTransformFeedbacksNV")]
+            public static 
+            void DeleteTransformFeedback(Int32 n, UInt32[] ids)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* ids_ptr = ids)
+                    {
+                        Delegates.glDeleteTransformFeedbacksNV((Int32)n, (UInt32*)ids_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvTransformFeedback2", Version = "", EntryPoint = "glDeleteTransformFeedbacksNV")]
             public static 
@@ -123499,27 +123520,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvTransformFeedback2", Version = "", EntryPoint = "glDeleteTransformFeedbacksNV")]
-            public static 
-            void DeleteTransformFeedback(Int32 n, UInt32[] ids)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* ids_ptr = ids)
-                    {
-                        Delegates.glDeleteTransformFeedbacksNV((Int32)n, (UInt32*)ids_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvDepthBufferFloat", Version = "2.0", EntryPoint = "glDepthBoundsdNV")]
             public static 
             void DepthBounds(Double zmin, Double zmax)
@@ -123647,6 +123647,26 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glExecuteProgramNV")]
+            public static 
+            void ExecuteProgram(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 id, Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glExecuteProgramNV((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (UInt32)id, (Single*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glExecuteProgramNV")]
             public static 
             void ExecuteProgram(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 id, ref Single @params)
@@ -123682,9 +123702,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glExecuteProgramNV")]
             public static 
-            void ExecuteProgram(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 id, Single[] @params)
+            void ExecuteProgram(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 id, Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -123738,27 +123759,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glExecuteProgramNV")]
-            public static 
-            void ExecuteProgram(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 id, Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glExecuteProgramNV((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (UInt32)id, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvRegisterCombiners", Version = "1.1", EntryPoint = "glFinalCombinerInputNV")]
             public static 
             void FinalCombinerInput(OpenTK.Graphics.OpenGL.NvRegisterCombiners variable, OpenTK.Graphics.OpenGL.NvRegisterCombiners input, OpenTK.Graphics.OpenGL.NvRegisterCombiners mapping, OpenTK.Graphics.OpenGL.NvRegisterCombiners componentUsage)
@@ -123859,21 +123859,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvFence", Version = "1.2", EntryPoint = "glGenFencesNV")]
-            public static 
-            unsafe void GenFences(Int32 n, [OutAttribute] Int32* fences)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGenFencesNV((Int32)n, (UInt32*)fences);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvFence", Version = "1.2", EntryPoint = "glGenFencesNV")]
             public static 
             void GenFences(Int32 n, [OutAttribute] Int32[] fences)
@@ -123918,29 +123903,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvFence", Version = "1.2", EntryPoint = "glGenFencesNV")]
             public static 
-            void GenFences(Int32 n, [OutAttribute] out UInt32 fences)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* fences_ptr = &fences)
-                    {
-                        Delegates.glGenFencesNV((Int32)n, (UInt32*)fences_ptr);
-                        fences = *fences_ptr;
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvFence", Version = "1.2", EntryPoint = "glGenFencesNV")]
-            public static 
-            unsafe void GenFences(Int32 n, [OutAttribute] UInt32* fences)
+            unsafe void GenFences(Int32 n, [OutAttribute] Int32* fences)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -123974,15 +123937,37 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvOcclusionQuery", Version = "1.2", EntryPoint = "glGenOcclusionQueriesNV")]
+            [AutoGenerated(Category = "NvFence", Version = "1.2", EntryPoint = "glGenFencesNV")]
             public static 
-            unsafe void GenOcclusionQueries(Int32 n, [OutAttribute] Int32* ids)
+            void GenFences(Int32 n, [OutAttribute] out UInt32 fences)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGenOcclusionQueriesNV((Int32)n, (UInt32*)ids);
+                unsafe
+                {
+                    fixed (UInt32* fences_ptr = &fences)
+                    {
+                        Delegates.glGenFencesNV((Int32)n, (UInt32*)fences_ptr);
+                        fences = *fences_ptr;
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvFence", Version = "1.2", EntryPoint = "glGenFencesNV")]
+            public static 
+            unsafe void GenFences(Int32 n, [OutAttribute] UInt32* fences)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGenFencesNV((Int32)n, (UInt32*)fences);
                 #if DEBUG
                 }
                 #endif
@@ -124032,29 +124017,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvOcclusionQuery", Version = "1.2", EntryPoint = "glGenOcclusionQueriesNV")]
             public static 
-            void GenOcclusionQueries(Int32 n, [OutAttribute] out UInt32 ids)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* ids_ptr = &ids)
-                    {
-                        Delegates.glGenOcclusionQueriesNV((Int32)n, (UInt32*)ids_ptr);
-                        ids = *ids_ptr;
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvOcclusionQuery", Version = "1.2", EntryPoint = "glGenOcclusionQueriesNV")]
-            public static 
-            unsafe void GenOcclusionQueries(Int32 n, [OutAttribute] UInt32* ids)
+            unsafe void GenOcclusionQueries(Int32 n, [OutAttribute] Int32* ids)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -124088,15 +124051,37 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGenProgramsNV")]
+            [AutoGenerated(Category = "NvOcclusionQuery", Version = "1.2", EntryPoint = "glGenOcclusionQueriesNV")]
             public static 
-            unsafe void GenProgram(Int32 n, [OutAttribute] Int32* programs)
+            void GenOcclusionQueries(Int32 n, [OutAttribute] out UInt32 ids)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGenProgramsNV((Int32)n, (UInt32*)programs);
+                unsafe
+                {
+                    fixed (UInt32* ids_ptr = &ids)
+                    {
+                        Delegates.glGenOcclusionQueriesNV((Int32)n, (UInt32*)ids_ptr);
+                        ids = *ids_ptr;
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvOcclusionQuery", Version = "1.2", EntryPoint = "glGenOcclusionQueriesNV")]
+            public static 
+            unsafe void GenOcclusionQueries(Int32 n, [OutAttribute] UInt32* ids)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGenOcclusionQueriesNV((Int32)n, (UInt32*)ids);
                 #if DEBUG
                 }
                 #endif
@@ -124146,29 +124131,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGenProgramsNV")]
             public static 
-            void GenProgram(Int32 n, [OutAttribute] out UInt32 programs)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* programs_ptr = &programs)
-                    {
-                        Delegates.glGenProgramsNV((Int32)n, (UInt32*)programs_ptr);
-                        programs = *programs_ptr;
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGenProgramsNV")]
-            public static 
-            unsafe void GenProgram(Int32 n, [OutAttribute] UInt32* programs)
+            unsafe void GenProgram(Int32 n, [OutAttribute] Int32* programs)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -124202,15 +124165,37 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvTransformFeedback2", Version = "", EntryPoint = "glGenTransformFeedbacksNV")]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGenProgramsNV")]
             public static 
-            unsafe void GenTransformFeedback(Int32 n, [OutAttribute] Int32* ids)
+            void GenProgram(Int32 n, [OutAttribute] out UInt32 programs)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGenTransformFeedbacksNV((Int32)n, (UInt32*)ids);
+                unsafe
+                {
+                    fixed (UInt32* programs_ptr = &programs)
+                    {
+                        Delegates.glGenProgramsNV((Int32)n, (UInt32*)programs_ptr);
+                        programs = *programs_ptr;
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGenProgramsNV")]
+            public static 
+            unsafe void GenProgram(Int32 n, [OutAttribute] UInt32* programs)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGenProgramsNV((Int32)n, (UInt32*)programs);
                 #if DEBUG
                 }
                 #endif
@@ -124257,6 +124242,42 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvTransformFeedback2", Version = "", EntryPoint = "glGenTransformFeedbacksNV")]
+            public static 
+            unsafe void GenTransformFeedback(Int32 n, [OutAttribute] Int32* ids)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGenTransformFeedbacksNV((Int32)n, (UInt32*)ids);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvTransformFeedback2", Version = "", EntryPoint = "glGenTransformFeedbacksNV")]
+            public static 
+            void GenTransformFeedback(Int32 n, [OutAttribute] UInt32[] ids)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* ids_ptr = ids)
+                    {
+                        Delegates.glGenTransformFeedbacksNV((Int32)n, (UInt32*)ids_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvTransformFeedback2", Version = "", EntryPoint = "glGenTransformFeedbacksNV")]
             public static 
@@ -124294,10 +124315,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvTransformFeedback2", Version = "", EntryPoint = "glGenTransformFeedbacksNV")]
+            [AutoGenerated(Category = "NvTransformFeedback", Version = "1.5", EntryPoint = "glGetActiveVaryingNV")]
             public static 
-            void GenTransformFeedback(Int32 n, [OutAttribute] UInt32[] ids)
+            void GetActiveVarying(Int32 program, Int32 index, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 size, [OutAttribute] out OpenTK.Graphics.OpenGL.NvTransformFeedback type, [OutAttribute] StringBuilder name)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -124305,9 +124325,14 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
                 unsafe
                 {
-                    fixed (UInt32* ids_ptr = ids)
+                    fixed (Int32* length_ptr = &length)
+                    fixed (Int32* size_ptr = &size)
+                    fixed (OpenTK.Graphics.OpenGL.NvTransformFeedback* type_ptr = &type)
                     {
-                        Delegates.glGenTransformFeedbacksNV((Int32)n, (UInt32*)ids_ptr);
+                        Delegates.glGetActiveVaryingNV((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length_ptr, (Int32*)size_ptr, (OpenTK.Graphics.OpenGL.NvTransformFeedback*)type_ptr, (StringBuilder)name);
+                        length = *length_ptr;
+                        size = *size_ptr;
+                        type = *type_ptr;
                     }
                 }
                 #if DEBUG
@@ -124330,9 +124355,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvTransformFeedback", Version = "1.5", EntryPoint = "glGetActiveVaryingNV")]
             public static 
-            void GetActiveVarying(Int32 program, Int32 index, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 size, [OutAttribute] out OpenTK.Graphics.OpenGL.NvTransformFeedback type, [OutAttribute] StringBuilder name)
+            void GetActiveVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 size, [OutAttribute] out OpenTK.Graphics.OpenGL.NvTransformFeedback type, [OutAttribute] StringBuilder name)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -124370,10 +124396,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvTransformFeedback", Version = "1.5", EntryPoint = "glGetActiveVaryingNV")]
+            [AutoGenerated(Category = "NvRegisterCombiners", Version = "1.1", EntryPoint = "glGetCombinerInputParameterfvNV")]
             public static 
-            void GetActiveVarying(UInt32 program, UInt32 index, Int32 bufSize, [OutAttribute] out Int32 length, [OutAttribute] out Int32 size, [OutAttribute] out OpenTK.Graphics.OpenGL.NvTransformFeedback type, [OutAttribute] StringBuilder name)
+            void GetCombinerInputParameter(OpenTK.Graphics.OpenGL.NvRegisterCombiners stage, OpenTK.Graphics.OpenGL.NvRegisterCombiners portion, OpenTK.Graphics.OpenGL.NvRegisterCombiners variable, OpenTK.Graphics.OpenGL.NvRegisterCombiners pname, [OutAttribute] Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -124381,14 +124406,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
                 unsafe
                 {
-                    fixed (Int32* length_ptr = &length)
-                    fixed (Int32* size_ptr = &size)
-                    fixed (OpenTK.Graphics.OpenGL.NvTransformFeedback* type_ptr = &type)
+                    fixed (Single* @params_ptr = @params)
                     {
-                        Delegates.glGetActiveVaryingNV((UInt32)program, (UInt32)index, (Int32)bufSize, (Int32*)length_ptr, (Int32*)size_ptr, (OpenTK.Graphics.OpenGL.NvTransformFeedback*)type_ptr, (StringBuilder)name);
-                        length = *length_ptr;
-                        size = *size_ptr;
-                        type = *type_ptr;
+                        Delegates.glGetCombinerInputParameterfvNV((OpenTK.Graphics.OpenGL.NvRegisterCombiners)stage, (OpenTK.Graphics.OpenGL.NvRegisterCombiners)portion, (OpenTK.Graphics.OpenGL.NvRegisterCombiners)variable, (OpenTK.Graphics.OpenGL.NvRegisterCombiners)pname, (Single*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -124432,41 +124452,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "NvRegisterCombiners", Version = "1.1", EntryPoint = "glGetCombinerInputParameterfvNV")]
-            public static 
-            void GetCombinerInputParameter(OpenTK.Graphics.OpenGL.NvRegisterCombiners stage, OpenTK.Graphics.OpenGL.NvRegisterCombiners portion, OpenTK.Graphics.OpenGL.NvRegisterCombiners variable, OpenTK.Graphics.OpenGL.NvRegisterCombiners pname, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetCombinerInputParameterfvNV((OpenTK.Graphics.OpenGL.NvRegisterCombiners)stage, (OpenTK.Graphics.OpenGL.NvRegisterCombiners)portion, (OpenTK.Graphics.OpenGL.NvRegisterCombiners)variable, (OpenTK.Graphics.OpenGL.NvRegisterCombiners)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvRegisterCombiners", Version = "1.1", EntryPoint = "glGetCombinerInputParameterivNV")]
-            public static 
-            unsafe void GetCombinerInputParameter(OpenTK.Graphics.OpenGL.NvRegisterCombiners stage, OpenTK.Graphics.OpenGL.NvRegisterCombiners portion, OpenTK.Graphics.OpenGL.NvRegisterCombiners variable, OpenTK.Graphics.OpenGL.NvRegisterCombiners pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetCombinerInputParameterivNV((OpenTK.Graphics.OpenGL.NvRegisterCombiners)stage, (OpenTK.Graphics.OpenGL.NvRegisterCombiners)portion, (OpenTK.Graphics.OpenGL.NvRegisterCombiners)variable, (OpenTK.Graphics.OpenGL.NvRegisterCombiners)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvRegisterCombiners", Version = "1.1", EntryPoint = "glGetCombinerInputParameterivNV")]
             public static 
             void GetCombinerInputParameter(OpenTK.Graphics.OpenGL.NvRegisterCombiners stage, OpenTK.Graphics.OpenGL.NvRegisterCombiners portion, OpenTK.Graphics.OpenGL.NvRegisterCombiners variable, OpenTK.Graphics.OpenGL.NvRegisterCombiners pname, [OutAttribute] Int32[] @params)
@@ -124508,6 +124493,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvRegisterCombiners", Version = "1.1", EntryPoint = "glGetCombinerInputParameterivNV")]
+            public static 
+            unsafe void GetCombinerInputParameter(OpenTK.Graphics.OpenGL.NvRegisterCombiners stage, OpenTK.Graphics.OpenGL.NvRegisterCombiners portion, OpenTK.Graphics.OpenGL.NvRegisterCombiners variable, OpenTK.Graphics.OpenGL.NvRegisterCombiners pname, [OutAttribute] Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetCombinerInputParameterivNV((OpenTK.Graphics.OpenGL.NvRegisterCombiners)stage, (OpenTK.Graphics.OpenGL.NvRegisterCombiners)portion, (OpenTK.Graphics.OpenGL.NvRegisterCombiners)variable, (OpenTK.Graphics.OpenGL.NvRegisterCombiners)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "NvRegisterCombiners", Version = "1.1", EntryPoint = "glGetCombinerOutputParameterfvNV")]
+            public static 
+            void GetCombinerOutputParameter(OpenTK.Graphics.OpenGL.NvRegisterCombiners stage, OpenTK.Graphics.OpenGL.NvRegisterCombiners portion, OpenTK.Graphics.OpenGL.NvRegisterCombiners pname, [OutAttribute] Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glGetCombinerOutputParameterfvNV((OpenTK.Graphics.OpenGL.NvRegisterCombiners)stage, (OpenTK.Graphics.OpenGL.NvRegisterCombiners)portion, (OpenTK.Graphics.OpenGL.NvRegisterCombiners)pname, (Single*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvRegisterCombiners", Version = "1.1", EntryPoint = "glGetCombinerOutputParameterfvNV")]
             public static 
             void GetCombinerOutputParameter(OpenTK.Graphics.OpenGL.NvRegisterCombiners stage, OpenTK.Graphics.OpenGL.NvRegisterCombiners portion, OpenTK.Graphics.OpenGL.NvRegisterCombiners pname, [OutAttribute] out Single @params)
@@ -124544,41 +124564,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "NvRegisterCombiners", Version = "1.1", EntryPoint = "glGetCombinerOutputParameterfvNV")]
-            public static 
-            void GetCombinerOutputParameter(OpenTK.Graphics.OpenGL.NvRegisterCombiners stage, OpenTK.Graphics.OpenGL.NvRegisterCombiners portion, OpenTK.Graphics.OpenGL.NvRegisterCombiners pname, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetCombinerOutputParameterfvNV((OpenTK.Graphics.OpenGL.NvRegisterCombiners)stage, (OpenTK.Graphics.OpenGL.NvRegisterCombiners)portion, (OpenTK.Graphics.OpenGL.NvRegisterCombiners)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvRegisterCombiners", Version = "1.1", EntryPoint = "glGetCombinerOutputParameterivNV")]
-            public static 
-            unsafe void GetCombinerOutputParameter(OpenTK.Graphics.OpenGL.NvRegisterCombiners stage, OpenTK.Graphics.OpenGL.NvRegisterCombiners portion, OpenTK.Graphics.OpenGL.NvRegisterCombiners pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetCombinerOutputParameterivNV((OpenTK.Graphics.OpenGL.NvRegisterCombiners)stage, (OpenTK.Graphics.OpenGL.NvRegisterCombiners)portion, (OpenTK.Graphics.OpenGL.NvRegisterCombiners)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvRegisterCombiners", Version = "1.1", EntryPoint = "glGetCombinerOutputParameterivNV")]
             public static 
             void GetCombinerOutputParameter(OpenTK.Graphics.OpenGL.NvRegisterCombiners stage, OpenTK.Graphics.OpenGL.NvRegisterCombiners portion, OpenTK.Graphics.OpenGL.NvRegisterCombiners pname, [OutAttribute] Int32[] @params)
@@ -124620,6 +124605,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvRegisterCombiners", Version = "1.1", EntryPoint = "glGetCombinerOutputParameterivNV")]
+            public static 
+            unsafe void GetCombinerOutputParameter(OpenTK.Graphics.OpenGL.NvRegisterCombiners stage, OpenTK.Graphics.OpenGL.NvRegisterCombiners portion, OpenTK.Graphics.OpenGL.NvRegisterCombiners pname, [OutAttribute] Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetCombinerOutputParameterivNV((OpenTK.Graphics.OpenGL.NvRegisterCombiners)stage, (OpenTK.Graphics.OpenGL.NvRegisterCombiners)portion, (OpenTK.Graphics.OpenGL.NvRegisterCombiners)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "NvRegisterCombiners2", Version = "1.1", EntryPoint = "glGetCombinerStageParameterfvNV")]
+            public static 
+            void GetCombinerStageParameter(OpenTK.Graphics.OpenGL.NvRegisterCombiners2 stage, OpenTK.Graphics.OpenGL.NvRegisterCombiners2 pname, [OutAttribute] Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glGetCombinerStageParameterfvNV((OpenTK.Graphics.OpenGL.NvRegisterCombiners2)stage, (OpenTK.Graphics.OpenGL.NvRegisterCombiners2)pname, (Single*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvRegisterCombiners2", Version = "1.1", EntryPoint = "glGetCombinerStageParameterfvNV")]
             public static 
             void GetCombinerStageParameter(OpenTK.Graphics.OpenGL.NvRegisterCombiners2 stage, OpenTK.Graphics.OpenGL.NvRegisterCombiners2 pname, [OutAttribute] out Single @params)
@@ -124656,41 +124676,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "NvRegisterCombiners2", Version = "1.1", EntryPoint = "glGetCombinerStageParameterfvNV")]
-            public static 
-            void GetCombinerStageParameter(OpenTK.Graphics.OpenGL.NvRegisterCombiners2 stage, OpenTK.Graphics.OpenGL.NvRegisterCombiners2 pname, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetCombinerStageParameterfvNV((OpenTK.Graphics.OpenGL.NvRegisterCombiners2)stage, (OpenTK.Graphics.OpenGL.NvRegisterCombiners2)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvFence", Version = "1.2", EntryPoint = "glGetFenceivNV")]
-            public static 
-            unsafe void GetFence(Int32 fence, OpenTK.Graphics.OpenGL.NvFence pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetFenceivNV((UInt32)fence, (OpenTK.Graphics.OpenGL.NvFence)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvFence", Version = "1.2", EntryPoint = "glGetFenceivNV")]
             public static 
             void GetFence(Int32 fence, OpenTK.Graphics.OpenGL.NvFence pname, [OutAttribute] Int32[] @params)
@@ -124735,7 +124720,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvFence", Version = "1.2", EntryPoint = "glGetFenceivNV")]
             public static 
-            unsafe void GetFence(UInt32 fence, OpenTK.Graphics.OpenGL.NvFence pname, [OutAttribute] Int32* @params)
+            unsafe void GetFence(Int32 fence, OpenTK.Graphics.OpenGL.NvFence pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -124790,6 +124775,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvFence", Version = "1.2", EntryPoint = "glGetFenceivNV")]
+            public static 
+            unsafe void GetFence(UInt32 fence, OpenTK.Graphics.OpenGL.NvFence pname, [OutAttribute] Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetFenceivNV((UInt32)fence, (OpenTK.Graphics.OpenGL.NvFence)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "NvRegisterCombiners", Version = "1.1", EntryPoint = "glGetFinalCombinerInputParameterfvNV")]
+            public static 
+            void GetFinalCombinerInputParameter(OpenTK.Graphics.OpenGL.NvRegisterCombiners variable, OpenTK.Graphics.OpenGL.NvRegisterCombiners pname, [OutAttribute] Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glGetFinalCombinerInputParameterfvNV((OpenTK.Graphics.OpenGL.NvRegisterCombiners)variable, (OpenTK.Graphics.OpenGL.NvRegisterCombiners)pname, (Single*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvRegisterCombiners", Version = "1.1", EntryPoint = "glGetFinalCombinerInputParameterfvNV")]
             public static 
             void GetFinalCombinerInputParameter(OpenTK.Graphics.OpenGL.NvRegisterCombiners variable, OpenTK.Graphics.OpenGL.NvRegisterCombiners pname, [OutAttribute] out Single @params)
@@ -124826,41 +124846,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "NvRegisterCombiners", Version = "1.1", EntryPoint = "glGetFinalCombinerInputParameterfvNV")]
-            public static 
-            void GetFinalCombinerInputParameter(OpenTK.Graphics.OpenGL.NvRegisterCombiners variable, OpenTK.Graphics.OpenGL.NvRegisterCombiners pname, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetFinalCombinerInputParameterfvNV((OpenTK.Graphics.OpenGL.NvRegisterCombiners)variable, (OpenTK.Graphics.OpenGL.NvRegisterCombiners)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvRegisterCombiners", Version = "1.1", EntryPoint = "glGetFinalCombinerInputParameterivNV")]
-            public static 
-            unsafe void GetFinalCombinerInputParameter(OpenTK.Graphics.OpenGL.NvRegisterCombiners variable, OpenTK.Graphics.OpenGL.NvRegisterCombiners pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetFinalCombinerInputParameterivNV((OpenTK.Graphics.OpenGL.NvRegisterCombiners)variable, (OpenTK.Graphics.OpenGL.NvRegisterCombiners)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvRegisterCombiners", Version = "1.1", EntryPoint = "glGetFinalCombinerInputParameterivNV")]
             public static 
             void GetFinalCombinerInputParameter(OpenTK.Graphics.OpenGL.NvRegisterCombiners variable, OpenTK.Graphics.OpenGL.NvRegisterCombiners pname, [OutAttribute] Int32[] @params)
@@ -124902,6 +124887,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvRegisterCombiners", Version = "1.1", EntryPoint = "glGetFinalCombinerInputParameterivNV")]
+            public static 
+            unsafe void GetFinalCombinerInputParameter(OpenTK.Graphics.OpenGL.NvRegisterCombiners variable, OpenTK.Graphics.OpenGL.NvRegisterCombiners pname, [OutAttribute] Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetFinalCombinerInputParameterivNV((OpenTK.Graphics.OpenGL.NvRegisterCombiners)variable, (OpenTK.Graphics.OpenGL.NvRegisterCombiners)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glGetMapAttribParameterfvNV")]
+            public static 
+            void GetMapAttribParameter(OpenTK.Graphics.OpenGL.NvEvaluators target, Int32 index, OpenTK.Graphics.OpenGL.NvEvaluators pname, [OutAttribute] Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glGetMapAttribParameterfvNV((OpenTK.Graphics.OpenGL.NvEvaluators)target, (UInt32)index, (OpenTK.Graphics.OpenGL.NvEvaluators)pname, (Single*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glGetMapAttribParameterfvNV")]
             public static 
             void GetMapAttribParameter(OpenTK.Graphics.OpenGL.NvEvaluators target, Int32 index, OpenTK.Graphics.OpenGL.NvEvaluators pname, [OutAttribute] out Single @params)
@@ -124938,9 +124958,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glGetMapAttribParameterfvNV")]
             public static 
-            void GetMapAttribParameter(OpenTK.Graphics.OpenGL.NvEvaluators target, Int32 index, OpenTK.Graphics.OpenGL.NvEvaluators pname, [OutAttribute] Single[] @params)
+            void GetMapAttribParameter(OpenTK.Graphics.OpenGL.NvEvaluators target, UInt32 index, OpenTK.Graphics.OpenGL.NvEvaluators pname, [OutAttribute] Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -124995,42 +125016,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glGetMapAttribParameterfvNV")]
-            public static 
-            void GetMapAttribParameter(OpenTK.Graphics.OpenGL.NvEvaluators target, UInt32 index, OpenTK.Graphics.OpenGL.NvEvaluators pname, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetMapAttribParameterfvNV((OpenTK.Graphics.OpenGL.NvEvaluators)target, (UInt32)index, (OpenTK.Graphics.OpenGL.NvEvaluators)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glGetMapAttribParameterivNV")]
-            public static 
-            unsafe void GetMapAttribParameter(OpenTK.Graphics.OpenGL.NvEvaluators target, Int32 index, OpenTK.Graphics.OpenGL.NvEvaluators pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetMapAttribParameterivNV((OpenTK.Graphics.OpenGL.NvEvaluators)target, (UInt32)index, (OpenTK.Graphics.OpenGL.NvEvaluators)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glGetMapAttribParameterivNV")]
             public static 
             void GetMapAttribParameter(OpenTK.Graphics.OpenGL.NvEvaluators target, Int32 index, OpenTK.Graphics.OpenGL.NvEvaluators pname, [OutAttribute] Int32[] @params)
@@ -125075,7 +125060,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glGetMapAttribParameterivNV")]
             public static 
-            unsafe void GetMapAttribParameter(OpenTK.Graphics.OpenGL.NvEvaluators target, UInt32 index, OpenTK.Graphics.OpenGL.NvEvaluators pname, [OutAttribute] Int32* @params)
+            unsafe void GetMapAttribParameter(OpenTK.Graphics.OpenGL.NvEvaluators target, Int32 index, OpenTK.Graphics.OpenGL.NvEvaluators pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -125130,25 +125115,16 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glGetMapControlPointsNV")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glGetMapAttribParameterivNV")]
             public static 
-            void GetMapControlPoints<T6>(OpenTK.Graphics.OpenGL.NvEvaluators target, Int32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, bool packed, [InAttribute, OutAttribute] ref T6 points)
-                where T6 : struct
+            unsafe void GetMapAttribParameter(OpenTK.Graphics.OpenGL.NvEvaluators target, UInt32 index, OpenTK.Graphics.OpenGL.NvEvaluators pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle points_ptr = GCHandle.Alloc(points, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetMapControlPointsNV((OpenTK.Graphics.OpenGL.NvEvaluators)target, (UInt32)index, (OpenTK.Graphics.OpenGL.NvEvaluators)type, (Int32)ustride, (Int32)vstride, (bool)packed, (IntPtr)points_ptr.AddrOfPinnedObject());
-                    points = (T6)points_ptr.Target;
-                }
-                finally
-                {
-                    points_ptr.Free();
-                }
+                Delegates.glGetMapAttribParameterivNV((OpenTK.Graphics.OpenGL.NvEvaluators)target, (UInt32)index, (OpenTK.Graphics.OpenGL.NvEvaluators)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -125156,7 +125132,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glGetMapControlPointsNV")]
             public static 
-            void GetMapControlPoints<T6>(OpenTK.Graphics.OpenGL.NvEvaluators target, Int32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, bool packed, [InAttribute, OutAttribute] T6[,,] points)
+            void GetMapControlPoints(OpenTK.Graphics.OpenGL.NvEvaluators target, Int32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, bool packed, [OutAttribute] IntPtr points)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetMapControlPointsNV((OpenTK.Graphics.OpenGL.NvEvaluators)target, (UInt32)index, (OpenTK.Graphics.OpenGL.NvEvaluators)type, (Int32)ustride, (Int32)vstride, (bool)packed, (IntPtr)points);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glGetMapControlPointsNV")]
+            public static 
+            void GetMapControlPoints<T6>(OpenTK.Graphics.OpenGL.NvEvaluators target, Int32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, bool packed, [InAttribute, OutAttribute] T6[] points)
                 where T6 : struct
             {
                 #if DEBUG
@@ -125202,7 +125192,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glGetMapControlPointsNV")]
             public static 
-            void GetMapControlPoints<T6>(OpenTK.Graphics.OpenGL.NvEvaluators target, Int32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, bool packed, [InAttribute, OutAttribute] T6[] points)
+            void GetMapControlPoints<T6>(OpenTK.Graphics.OpenGL.NvEvaluators target, Int32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, bool packed, [InAttribute, OutAttribute] T6[,,] points)
                 where T6 : struct
             {
                 #if DEBUG
@@ -125225,22 +125215,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glGetMapControlPointsNV")]
             public static 
-            void GetMapControlPoints(OpenTK.Graphics.OpenGL.NvEvaluators target, Int32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, bool packed, [OutAttribute] IntPtr points)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetMapControlPointsNV((OpenTK.Graphics.OpenGL.NvEvaluators)target, (UInt32)index, (OpenTK.Graphics.OpenGL.NvEvaluators)type, (Int32)ustride, (Int32)vstride, (bool)packed, (IntPtr)points);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glGetMapControlPointsNV")]
-            public static 
-            void GetMapControlPoints<T6>(OpenTK.Graphics.OpenGL.NvEvaluators target, UInt32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, bool packed, [InAttribute, OutAttribute] ref T6 points)
+            void GetMapControlPoints<T6>(OpenTK.Graphics.OpenGL.NvEvaluators target, Int32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, bool packed, [InAttribute, OutAttribute] ref T6 points)
                 where T6 : struct
             {
                 #if DEBUG
@@ -125265,7 +125240,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glGetMapControlPointsNV")]
             public static 
-            void GetMapControlPoints<T6>(OpenTK.Graphics.OpenGL.NvEvaluators target, UInt32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, bool packed, [InAttribute, OutAttribute] T6[,,] points)
+            void GetMapControlPoints(OpenTK.Graphics.OpenGL.NvEvaluators target, UInt32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, bool packed, [OutAttribute] IntPtr points)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetMapControlPointsNV((OpenTK.Graphics.OpenGL.NvEvaluators)target, (UInt32)index, (OpenTK.Graphics.OpenGL.NvEvaluators)type, (Int32)ustride, (Int32)vstride, (bool)packed, (IntPtr)points);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glGetMapControlPointsNV")]
+            public static 
+            void GetMapControlPoints<T6>(OpenTK.Graphics.OpenGL.NvEvaluators target, UInt32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, bool packed, [InAttribute, OutAttribute] T6[] points)
                 where T6 : struct
             {
                 #if DEBUG
@@ -125313,7 +125303,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glGetMapControlPointsNV")]
             public static 
-            void GetMapControlPoints<T6>(OpenTK.Graphics.OpenGL.NvEvaluators target, UInt32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, bool packed, [InAttribute, OutAttribute] T6[] points)
+            void GetMapControlPoints<T6>(OpenTK.Graphics.OpenGL.NvEvaluators target, UInt32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, bool packed, [InAttribute, OutAttribute] T6[,,] points)
                 where T6 : struct
             {
                 #if DEBUG
@@ -125337,13 +125327,43 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glGetMapControlPointsNV")]
             public static 
-            void GetMapControlPoints(OpenTK.Graphics.OpenGL.NvEvaluators target, UInt32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, bool packed, [OutAttribute] IntPtr points)
+            void GetMapControlPoints<T6>(OpenTK.Graphics.OpenGL.NvEvaluators target, UInt32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, bool packed, [InAttribute, OutAttribute] ref T6 points)
+                where T6 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetMapControlPointsNV((OpenTK.Graphics.OpenGL.NvEvaluators)target, (UInt32)index, (OpenTK.Graphics.OpenGL.NvEvaluators)type, (Int32)ustride, (Int32)vstride, (bool)packed, (IntPtr)points);
+                GCHandle points_ptr = GCHandle.Alloc(points, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetMapControlPointsNV((OpenTK.Graphics.OpenGL.NvEvaluators)target, (UInt32)index, (OpenTK.Graphics.OpenGL.NvEvaluators)type, (Int32)ustride, (Int32)vstride, (bool)packed, (IntPtr)points_ptr.AddrOfPinnedObject());
+                    points = (T6)points_ptr.Target;
+                }
+                finally
+                {
+                    points_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glGetMapParameterfvNV")]
+            public static 
+            void GetMapParameter(OpenTK.Graphics.OpenGL.NvEvaluators target, OpenTK.Graphics.OpenGL.NvEvaluators pname, [OutAttribute] Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glGetMapParameterfvNV((OpenTK.Graphics.OpenGL.NvEvaluators)target, (OpenTK.Graphics.OpenGL.NvEvaluators)pname, (Single*)@params_ptr);
+                    }
+                }
                 #if DEBUG
                 }
                 #endif
@@ -125385,41 +125405,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glGetMapParameterfvNV")]
-            public static 
-            void GetMapParameter(OpenTK.Graphics.OpenGL.NvEvaluators target, OpenTK.Graphics.OpenGL.NvEvaluators pname, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetMapParameterfvNV((OpenTK.Graphics.OpenGL.NvEvaluators)target, (OpenTK.Graphics.OpenGL.NvEvaluators)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glGetMapParameterivNV")]
-            public static 
-            unsafe void GetMapParameter(OpenTK.Graphics.OpenGL.NvEvaluators target, OpenTK.Graphics.OpenGL.NvEvaluators pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetMapParameterivNV((OpenTK.Graphics.OpenGL.NvEvaluators)target, (OpenTK.Graphics.OpenGL.NvEvaluators)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glGetMapParameterivNV")]
             public static 
             void GetMapParameter(OpenTK.Graphics.OpenGL.NvEvaluators target, OpenTK.Graphics.OpenGL.NvEvaluators pname, [OutAttribute] Int32[] @params)
@@ -125461,6 +125446,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glGetMapParameterivNV")]
+            public static 
+            unsafe void GetMapParameter(OpenTK.Graphics.OpenGL.NvEvaluators target, OpenTK.Graphics.OpenGL.NvEvaluators pname, [OutAttribute] Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetMapParameterivNV((OpenTK.Graphics.OpenGL.NvEvaluators)target, (OpenTK.Graphics.OpenGL.NvEvaluators)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "NvExplicitMultisample", Version = "", EntryPoint = "glGetMultisamplefvNV")]
+            public static 
+            void GetMultisample(OpenTK.Graphics.OpenGL.NvExplicitMultisample pname, Int32 index, [OutAttribute] Single[] val)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* val_ptr = val)
+                    {
+                        Delegates.glGetMultisamplefvNV((OpenTK.Graphics.OpenGL.NvExplicitMultisample)pname, (UInt32)index, (Single*)val_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvExplicitMultisample", Version = "", EntryPoint = "glGetMultisamplefvNV")]
             public static 
             void GetMultisample(OpenTK.Graphics.OpenGL.NvExplicitMultisample pname, Int32 index, [OutAttribute] out Single val)
@@ -125497,9 +125517,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvExplicitMultisample", Version = "", EntryPoint = "glGetMultisamplefvNV")]
             public static 
-            void GetMultisample(OpenTK.Graphics.OpenGL.NvExplicitMultisample pname, Int32 index, [OutAttribute] Single[] val)
+            void GetMultisample(OpenTK.Graphics.OpenGL.NvExplicitMultisample pname, UInt32 index, [OutAttribute] Single[] val)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -125554,42 +125575,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvExplicitMultisample", Version = "", EntryPoint = "glGetMultisamplefvNV")]
-            public static 
-            void GetMultisample(OpenTK.Graphics.OpenGL.NvExplicitMultisample pname, UInt32 index, [OutAttribute] Single[] val)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* val_ptr = val)
-                    {
-                        Delegates.glGetMultisamplefvNV((OpenTK.Graphics.OpenGL.NvExplicitMultisample)pname, (UInt32)index, (Single*)val_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvOcclusionQuery", Version = "1.2", EntryPoint = "glGetOcclusionQueryivNV")]
-            public static 
-            unsafe void GetOcclusionQuery(Int32 id, OpenTK.Graphics.OpenGL.NvOcclusionQuery pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetOcclusionQueryivNV((UInt32)id, (OpenTK.Graphics.OpenGL.NvOcclusionQuery)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvOcclusionQuery", Version = "1.2", EntryPoint = "glGetOcclusionQueryivNV")]
             public static 
             void GetOcclusionQuery(Int32 id, OpenTK.Graphics.OpenGL.NvOcclusionQuery pname, [OutAttribute] Int32[] @params)
@@ -125634,7 +125619,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvOcclusionQuery", Version = "1.2", EntryPoint = "glGetOcclusionQueryivNV")]
             public static 
-            unsafe void GetOcclusionQuery(UInt32 id, OpenTK.Graphics.OpenGL.NvOcclusionQuery pname, [OutAttribute] Int32* @params)
+            unsafe void GetOcclusionQuery(Int32 id, OpenTK.Graphics.OpenGL.NvOcclusionQuery pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -125689,6 +125674,42 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvOcclusionQuery", Version = "1.2", EntryPoint = "glGetOcclusionQueryivNV")]
+            public static 
+            unsafe void GetOcclusionQuery(UInt32 id, OpenTK.Graphics.OpenGL.NvOcclusionQuery pname, [OutAttribute] Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetOcclusionQueryivNV((UInt32)id, (OpenTK.Graphics.OpenGL.NvOcclusionQuery)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvOcclusionQuery", Version = "1.2", EntryPoint = "glGetOcclusionQueryuivNV")]
+            public static 
+            void GetOcclusionQuery(UInt32 id, OpenTK.Graphics.OpenGL.NvOcclusionQuery pname, [OutAttribute] UInt32[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* @params_ptr = @params)
+                    {
+                        Delegates.glGetOcclusionQueryuivNV((UInt32)id, (OpenTK.Graphics.OpenGL.NvOcclusionQuery)pname, (UInt32*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvOcclusionQuery", Version = "1.2", EntryPoint = "glGetOcclusionQueryuivNV")]
             public static 
@@ -125726,42 +125747,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvOcclusionQuery", Version = "1.2", EntryPoint = "glGetOcclusionQueryuivNV")]
-            public static 
-            void GetOcclusionQuery(UInt32 id, OpenTK.Graphics.OpenGL.NvOcclusionQuery pname, [OutAttribute] UInt32[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* @params_ptr = @params)
-                    {
-                        Delegates.glGetOcclusionQueryuivNV((UInt32)id, (OpenTK.Graphics.OpenGL.NvOcclusionQuery)pname, (UInt32*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glGetProgramEnvParameterIivNV")]
-            public static 
-            unsafe void GetProgramEnvParameterI(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, Int32 index, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetProgramEnvParameterIivNV((OpenTK.Graphics.OpenGL.NvGpuProgram4)target, (UInt32)index, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glGetProgramEnvParameterIivNV")]
             public static 
             void GetProgramEnvParameterI(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, Int32 index, [OutAttribute] Int32[] @params)
@@ -125806,7 +125791,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glGetProgramEnvParameterIivNV")]
             public static 
-            unsafe void GetProgramEnvParameterI(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, UInt32 index, [OutAttribute] Int32* @params)
+            unsafe void GetProgramEnvParameterI(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, Int32 index, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -125861,6 +125846,42 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glGetProgramEnvParameterIivNV")]
+            public static 
+            unsafe void GetProgramEnvParameterI(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, UInt32 index, [OutAttribute] Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetProgramEnvParameterIivNV((OpenTK.Graphics.OpenGL.NvGpuProgram4)target, (UInt32)index, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glGetProgramEnvParameterIuivNV")]
+            public static 
+            void GetProgramEnvParameterI(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, UInt32 index, [OutAttribute] UInt32[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* @params_ptr = @params)
+                    {
+                        Delegates.glGetProgramEnvParameterIuivNV((OpenTK.Graphics.OpenGL.NvGpuProgram4)target, (UInt32)index, (UInt32*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glGetProgramEnvParameterIuivNV")]
             public static 
@@ -125898,61 +125919,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glGetProgramEnvParameterIuivNV")]
-            public static 
-            void GetProgramEnvParameterI(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, UInt32 index, [OutAttribute] UInt32[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* @params_ptr = @params)
-                    {
-                        Delegates.glGetProgramEnvParameterIuivNV((OpenTK.Graphics.OpenGL.NvGpuProgram4)target, (UInt32)index, (UInt32*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Returns a parameter from a program object
-        /// </summary>
-        /// <param name="program">
-        /// <para>
-        /// Specifies the program object to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the object parameter. Accepted symbolic names are GL_DELETE_STATUS, GL_LINK_STATUS, GL_VALIDATE_STATUS, GL_INFO_LOG_LENGTH, GL_ATTACHED_SHADERS, GL_ACTIVE_ATTRIBUTES, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, GL_ACTIVE_UNIFORMS, GL_ACTIVE_UNIFORM_MAX_LENGTH.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the requested object parameter.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetProgramivNV")]
-            public static 
-            unsafe void GetProgram(Int32 id, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetProgramivNV((UInt32)id, (OpenTK.Graphics.OpenGL.NvVertexProgram)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             
         /// <summary>
         /// Returns a parameter from a program object
@@ -126054,7 +126020,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetProgramivNV")]
             public static 
-            unsafe void GetProgram(UInt32 id, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [OutAttribute] Int32* @params)
+            unsafe void GetProgram(Int32 id, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -126147,16 +126113,35 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            
+        /// <summary>
+        /// Returns a parameter from a program object
+        /// </summary>
+        /// <param name="program">
+        /// <para>
+        /// Specifies the program object to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the object parameter. Accepted symbolic names are GL_DELETE_STATUS, GL_LINK_STATUS, GL_VALIDATE_STATUS, GL_INFO_LOG_LENGTH, GL_ATTACHED_SHADERS, GL_ACTIVE_ATTRIBUTES, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, GL_ACTIVE_UNIFORMS, GL_ACTIVE_UNIFORM_MAX_LENGTH.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the requested object parameter.
+        /// </para>
+        /// </param>
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glGetProgramLocalParameterIivNV")]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetProgramivNV")]
             public static 
-            unsafe void GetProgramLocalParameterI(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, Int32 index, [OutAttribute] Int32* @params)
+            unsafe void GetProgram(UInt32 id, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetProgramLocalParameterIivNV((OpenTK.Graphics.OpenGL.NvGpuProgram4)target, (UInt32)index, (Int32*)@params);
+                Delegates.glGetProgramivNV((UInt32)id, (OpenTK.Graphics.OpenGL.NvVertexProgram)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -126206,7 +126191,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glGetProgramLocalParameterIivNV")]
             public static 
-            unsafe void GetProgramLocalParameterI(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, UInt32 index, [OutAttribute] Int32* @params)
+            unsafe void GetProgramLocalParameterI(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, Int32 index, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -126261,6 +126246,42 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glGetProgramLocalParameterIivNV")]
+            public static 
+            unsafe void GetProgramLocalParameterI(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, UInt32 index, [OutAttribute] Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetProgramLocalParameterIivNV((OpenTK.Graphics.OpenGL.NvGpuProgram4)target, (UInt32)index, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glGetProgramLocalParameterIuivNV")]
+            public static 
+            void GetProgramLocalParameterI(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, UInt32 index, [OutAttribute] UInt32[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* @params_ptr = @params)
+                    {
+                        Delegates.glGetProgramLocalParameterIuivNV((OpenTK.Graphics.OpenGL.NvGpuProgram4)target, (UInt32)index, (UInt32*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glGetProgramLocalParameterIuivNV")]
             public static 
@@ -126298,60 +126319,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glGetProgramLocalParameterIuivNV")]
-            public static 
-            void GetProgramLocalParameterI(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, UInt32 index, [OutAttribute] UInt32[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* @params_ptr = @params)
-                    {
-                        Delegates.glGetProgramLocalParameterIuivNV((OpenTK.Graphics.OpenGL.NvGpuProgram4)target, (UInt32)index, (UInt32*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glGetProgramNamedParameterdvNV")]
-            public static 
-            unsafe void GetProgramNamedParameter(Int32 id, Int32 len, Byte* name, [OutAttribute] Double* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetProgramNamedParameterdvNV((UInt32)id, (Int32)len, (Byte*)name, (Double*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glGetProgramNamedParameterdvNV")]
-            public static 
-            unsafe void GetProgramNamedParameter(Int32 id, Int32 len, Byte* name, [OutAttribute] Double[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                fixed (Double* @params_ptr = @params)
-                {
-                    Delegates.glGetProgramNamedParameterdvNV((UInt32)id, (Int32)len, (Byte*)name, (Double*)@params_ptr);
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glGetProgramNamedParameterdvNV")]
             public static 
             void GetProgramNamedParameter(Int32 id, Int32 len, ref Byte name, [OutAttribute] out Double @params)
@@ -126377,22 +126344,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glGetProgramNamedParameterdvNV")]
             public static 
-            unsafe void GetProgramNamedParameter(UInt32 id, Int32 len, Byte* name, [OutAttribute] Double* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetProgramNamedParameterdvNV((UInt32)id, (Int32)len, (Byte*)name, (Double*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glGetProgramNamedParameterdvNV")]
-            public static 
-            unsafe void GetProgramNamedParameter(UInt32 id, Int32 len, Byte* name, [OutAttribute] Double[] @params)
+            unsafe void GetProgramNamedParameter(Int32 id, Int32 len, Byte* name, [OutAttribute] Double[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -126407,6 +126359,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glGetProgramNamedParameterdvNV")]
+            public static 
+            unsafe void GetProgramNamedParameter(Int32 id, Int32 len, Byte* name, [OutAttribute] Double* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetProgramNamedParameterdvNV((UInt32)id, (Int32)len, (Byte*)name, (Double*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glGetProgramNamedParameterdvNV")]
             public static 
@@ -126431,33 +126398,33 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glGetProgramNamedParameterfvNV")]
+            [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glGetProgramNamedParameterdvNV")]
             public static 
-            unsafe void GetProgramNamedParameter(Int32 id, Int32 len, Byte* name, [OutAttribute] Single* @params)
+            unsafe void GetProgramNamedParameter(UInt32 id, Int32 len, Byte* name, [OutAttribute] Double[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetProgramNamedParameterfvNV((UInt32)id, (Int32)len, (Byte*)name, (Single*)@params);
+                fixed (Double* @params_ptr = @params)
+                {
+                    Delegates.glGetProgramNamedParameterdvNV((UInt32)id, (Int32)len, (Byte*)name, (Double*)@params_ptr);
+                }
                 #if DEBUG
                 }
                 #endif
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glGetProgramNamedParameterfvNV")]
+            [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glGetProgramNamedParameterdvNV")]
             public static 
-            unsafe void GetProgramNamedParameter(Int32 id, Int32 len, Byte* name, [OutAttribute] Single[] @params)
+            unsafe void GetProgramNamedParameter(UInt32 id, Int32 len, Byte* name, [OutAttribute] Double* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                fixed (Single* @params_ptr = @params)
-                {
-                    Delegates.glGetProgramNamedParameterfvNV((UInt32)id, (Int32)len, (Byte*)name, (Single*)@params_ptr);
-                }
+                Delegates.glGetProgramNamedParameterdvNV((UInt32)id, (Int32)len, (Byte*)name, (Double*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -126488,22 +126455,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glGetProgramNamedParameterfvNV")]
             public static 
-            unsafe void GetProgramNamedParameter(UInt32 id, Int32 len, Byte* name, [OutAttribute] Single* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetProgramNamedParameterfvNV((UInt32)id, (Int32)len, (Byte*)name, (Single*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glGetProgramNamedParameterfvNV")]
-            public static 
-            unsafe void GetProgramNamedParameter(UInt32 id, Int32 len, Byte* name, [OutAttribute] Single[] @params)
+            unsafe void GetProgramNamedParameter(Int32 id, Int32 len, Byte* name, [OutAttribute] Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -126518,6 +126470,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glGetProgramNamedParameterfvNV")]
+            public static 
+            unsafe void GetProgramNamedParameter(Int32 id, Int32 len, Byte* name, [OutAttribute] Single* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetProgramNamedParameterfvNV((UInt32)id, (Int32)len, (Byte*)name, (Single*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glGetProgramNamedParameterfvNV")]
             public static 
@@ -126542,15 +126509,33 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetProgramParameterdvNV")]
+            [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glGetProgramNamedParameterfvNV")]
             public static 
-            unsafe void GetProgramParameter(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, [OutAttribute] Double* @params)
+            unsafe void GetProgramNamedParameter(UInt32 id, Int32 len, Byte* name, [OutAttribute] Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetProgramParameterdvNV((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (UInt32)index, (OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb)pname, (Double*)@params);
+                fixed (Single* @params_ptr = @params)
+                {
+                    Delegates.glGetProgramNamedParameterfvNV((UInt32)id, (Int32)len, (Byte*)name, (Single*)@params_ptr);
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glGetProgramNamedParameterfvNV")]
+            public static 
+            unsafe void GetProgramNamedParameter(UInt32 id, Int32 len, Byte* name, [OutAttribute] Single* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetProgramNamedParameterfvNV((UInt32)id, (Int32)len, (Byte*)name, (Single*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -126600,7 +126585,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetProgramParameterdvNV")]
             public static 
-            unsafe void GetProgramParameter(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 index, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, [OutAttribute] Double* @params)
+            unsafe void GetProgramParameter(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, [OutAttribute] Double* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -126655,6 +126640,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetProgramParameterdvNV")]
+            public static 
+            unsafe void GetProgramParameter(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 index, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, [OutAttribute] Double* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetProgramParameterdvNV((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (UInt32)index, (OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb)pname, (Double*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetProgramParameterfvNV")]
+            public static 
+            void GetProgramParameter(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, [OutAttribute] Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glGetProgramParameterfvNV((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (UInt32)index, (OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb)pname, (Single*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetProgramParameterfvNV")]
             public static 
             void GetProgramParameter(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, [OutAttribute] out Single @params)
@@ -126691,9 +126711,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetProgramParameterfvNV")]
             public static 
-            void GetProgramParameter(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, [OutAttribute] Single[] @params)
+            void GetProgramParameter(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 index, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, [OutAttribute] Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -126748,42 +126769,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetProgramParameterfvNV")]
-            public static 
-            void GetProgramParameter(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 index, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetProgramParameterfvNV((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (UInt32)index, (OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetProgramStringNV")]
-            public static 
-            unsafe void GetProgramString(Int32 id, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [OutAttribute] Byte* program)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetProgramStringNV((UInt32)id, (OpenTK.Graphics.OpenGL.NvVertexProgram)pname, (Byte*)program);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetProgramStringNV")]
             public static 
             void GetProgramString(Int32 id, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [OutAttribute] Byte[] program)
@@ -126828,7 +126813,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetProgramStringNV")]
             public static 
-            unsafe void GetProgramString(UInt32 id, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [OutAttribute] Byte* program)
+            unsafe void GetProgramString(Int32 id, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [OutAttribute] Byte* program)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -126884,15 +126869,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetTrackMatrixivNV")]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetProgramStringNV")]
             public static 
-            unsafe void GetTrackMatrix(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 address, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, [OutAttribute] Int32* @params)
+            unsafe void GetProgramString(UInt32 id, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [OutAttribute] Byte* program)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetTrackMatrixivNV((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (UInt32)address, (OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb)pname, (Int32*)@params);
+                Delegates.glGetProgramStringNV((UInt32)id, (OpenTK.Graphics.OpenGL.NvVertexProgram)pname, (Byte*)program);
                 #if DEBUG
                 }
                 #endif
@@ -126922,7 +126907,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetTrackMatrixivNV")]
             public static 
-            unsafe void GetTrackMatrix(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 address, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, [OutAttribute] Int32* @params)
+            unsafe void GetTrackMatrix(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 address, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -126957,15 +126942,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvTransformFeedback", Version = "1.5", EntryPoint = "glGetTransformFeedbackVaryingNV")]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetTrackMatrixivNV")]
             public static 
-            unsafe void GetTransformFeedbackVarying(Int32 program, Int32 index, [OutAttribute] Int32* location)
+            unsafe void GetTrackMatrix(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 address, OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetTransformFeedbackVaryingNV((UInt32)program, (UInt32)index, (Int32*)location);
+                Delegates.glGetTrackMatrixivNV((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (UInt32)address, (OpenTK.Graphics.OpenGL.AssemblyProgramParameterArb)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -126995,7 +126980,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvTransformFeedback", Version = "1.5", EntryPoint = "glGetTransformFeedbackVaryingNV")]
             public static 
-            unsafe void GetTransformFeedbackVarying(UInt32 program, UInt32 index, [OutAttribute] Int32* location)
+            unsafe void GetTransformFeedbackVarying(Int32 program, Int32 index, [OutAttribute] Int32* location)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -127029,6 +127014,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvTransformFeedback", Version = "1.5", EntryPoint = "glGetTransformFeedbackVaryingNV")]
+            public static 
+            unsafe void GetTransformFeedbackVarying(UInt32 program, UInt32 index, [OutAttribute] Int32* location)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetTransformFeedbackVaryingNV((UInt32)program, (UInt32)index, (Int32*)location);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvTransformFeedback", Version = "1.5", EntryPoint = "glGetVaryingLocationNV")]
             public static 
             Int32 GetVaryingLocation(Int32 program, String name)
@@ -127059,40 +127059,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Return a generic vertex attribute parameter
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the generic vertex attribute parameter to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the symbolic name of the vertex attribute parameter to be queried. Accepted values are GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, GL_VERTEX_ATTRIB_ARRAY_ENABLED, GL_VERTEX_ATTRIB_ARRAY_SIZE, GL_VERTEX_ATTRIB_ARRAY_STRIDE, GL_VERTEX_ATTRIB_ARRAY_TYPE, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, or GL_CURRENT_VERTEX_ATTRIB.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the requested data.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetVertexAttribdvNV")]
-            public static 
-            unsafe void GetVertexAttrib(Int32 index, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [OutAttribute] Double* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetVertexAttribdvNV((UInt32)index, (OpenTK.Graphics.OpenGL.NvVertexProgram)pname, (Double*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Return a generic vertex attribute parameter
         /// </summary>
@@ -127154,7 +127120,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetVertexAttribdvNV")]
             public static 
-            unsafe void GetVertexAttrib(UInt32 index, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [OutAttribute] Double* @params)
+            unsafe void GetVertexAttrib(Int32 index, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [OutAttribute] Double* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -127208,6 +127174,40 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Return a generic vertex attribute parameter
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the generic vertex attribute parameter to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the symbolic name of the vertex attribute parameter to be queried. Accepted values are GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, GL_VERTEX_ATTRIB_ARRAY_ENABLED, GL_VERTEX_ATTRIB_ARRAY_SIZE, GL_VERTEX_ATTRIB_ARRAY_STRIDE, GL_VERTEX_ATTRIB_ARRAY_TYPE, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, or GL_CURRENT_VERTEX_ATTRIB.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the requested data.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetVertexAttribdvNV")]
+            public static 
+            unsafe void GetVertexAttrib(UInt32 index, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [OutAttribute] Double* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetVertexAttribdvNV((UInt32)index, (OpenTK.Graphics.OpenGL.NvVertexProgram)pname, (Double*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Return a generic vertex attribute parameter
         /// </summary>
@@ -127357,40 +127357,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Return a generic vertex attribute parameter
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the generic vertex attribute parameter to be queried.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// Specifies the symbolic name of the vertex attribute parameter to be queried. Accepted values are GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, GL_VERTEX_ATTRIB_ARRAY_ENABLED, GL_VERTEX_ATTRIB_ARRAY_SIZE, GL_VERTEX_ATTRIB_ARRAY_STRIDE, GL_VERTEX_ATTRIB_ARRAY_TYPE, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, or GL_CURRENT_VERTEX_ATTRIB.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// Returns the requested data.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetVertexAttribivNV")]
-            public static 
-            unsafe void GetVertexAttrib(Int32 index, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetVertexAttribivNV((UInt32)index, (OpenTK.Graphics.OpenGL.NvVertexProgram)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Return a generic vertex attribute parameter
         /// </summary>
@@ -127452,7 +127418,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetVertexAttribivNV")]
             public static 
-            unsafe void GetVertexAttrib(UInt32 index, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [OutAttribute] Int32* @params)
+            unsafe void GetVertexAttrib(Int32 index, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -127505,25 +127471,35 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetVertexAttribPointervNV")]
+            
+        /// <summary>
+        /// Return a generic vertex attribute parameter
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the generic vertex attribute parameter to be queried.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// Specifies the symbolic name of the vertex attribute parameter to be queried. Accepted values are GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, GL_VERTEX_ATTRIB_ARRAY_ENABLED, GL_VERTEX_ATTRIB_ARRAY_SIZE, GL_VERTEX_ATTRIB_ARRAY_STRIDE, GL_VERTEX_ATTRIB_ARRAY_TYPE, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, or GL_CURRENT_VERTEX_ATTRIB.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// Returns the requested data.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetVertexAttribivNV")]
             public static 
-            void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [InAttribute, OutAttribute] ref T2 pointer)
-                where T2 : struct
+            unsafe void GetVertexAttrib(UInt32 index, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetVertexAttribPointervNV((UInt32)index, (OpenTK.Graphics.OpenGL.NvVertexProgram)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                    pointer = (T2)pointer_ptr.Target;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
+                Delegates.glGetVertexAttribivNV((UInt32)index, (OpenTK.Graphics.OpenGL.NvVertexProgram)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -127531,7 +127507,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetVertexAttribPointervNV")]
             public static 
-            void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [InAttribute, OutAttribute] T2[,,] pointer)
+            void GetVertexAttribPointer(Int32 index, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [OutAttribute] IntPtr pointer)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetVertexAttribPointervNV((UInt32)index, (OpenTK.Graphics.OpenGL.NvVertexProgram)pname, (IntPtr)pointer);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetVertexAttribPointervNV")]
+            public static 
+            void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [InAttribute, OutAttribute] T2[] pointer)
                 where T2 : struct
             {
                 #if DEBUG
@@ -127577,7 +127567,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetVertexAttribPointervNV")]
             public static 
-            void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [InAttribute, OutAttribute] T2[] pointer)
+            void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [InAttribute, OutAttribute] T2[,,] pointer)
                 where T2 : struct
             {
                 #if DEBUG
@@ -127600,22 +127590,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetVertexAttribPointervNV")]
             public static 
-            void GetVertexAttribPointer(Int32 index, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [OutAttribute] IntPtr pointer)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetVertexAttribPointervNV((UInt32)index, (OpenTK.Graphics.OpenGL.NvVertexProgram)pname, (IntPtr)pointer);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetVertexAttribPointervNV")]
-            public static 
-            void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [InAttribute, OutAttribute] ref T2 pointer)
+            void GetVertexAttribPointer<T2>(Int32 index, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [InAttribute, OutAttribute] ref T2 pointer)
                 where T2 : struct
             {
                 #if DEBUG
@@ -127640,7 +127615,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetVertexAttribPointervNV")]
             public static 
-            void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [InAttribute, OutAttribute] T2[,,] pointer)
+            void GetVertexAttribPointer(UInt32 index, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [OutAttribute] IntPtr pointer)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetVertexAttribPointervNV((UInt32)index, (OpenTK.Graphics.OpenGL.NvVertexProgram)pname, (IntPtr)pointer);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetVertexAttribPointervNV")]
+            public static 
+            void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [InAttribute, OutAttribute] T2[] pointer)
                 where T2 : struct
             {
                 #if DEBUG
@@ -127688,7 +127678,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetVertexAttribPointervNV")]
             public static 
-            void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [InAttribute, OutAttribute] T2[] pointer)
+            void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [InAttribute, OutAttribute] T2[,,] pointer)
                 where T2 : struct
             {
                 #if DEBUG
@@ -127712,28 +127702,23 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glGetVertexAttribPointervNV")]
             public static 
-            void GetVertexAttribPointer(UInt32 index, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [OutAttribute] IntPtr pointer)
+            void GetVertexAttribPointer<T2>(UInt32 index, OpenTK.Graphics.OpenGL.NvVertexProgram pname, [InAttribute, OutAttribute] ref T2 pointer)
+                where T2 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetVertexAttribPointervNV((UInt32)index, (OpenTK.Graphics.OpenGL.NvVertexProgram)pname, (IntPtr)pointer);
-                #if DEBUG
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetVertexAttribPointervNV((UInt32)index, (OpenTK.Graphics.OpenGL.NvVertexProgram)pname, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    pointer = (T2)pointer_ptr.Target;
                 }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvPresentVideo", Version = "1.2", EntryPoint = "glGetVideoi64vNV")]
-            public static 
-            unsafe void GetVideoi64(Int32 video_slot, OpenTK.Graphics.OpenGL.NvPresentVideo pname, [OutAttribute] Int64* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                finally
                 {
-                #endif
-                Delegates.glGetVideoi64vNV((UInt32)video_slot, (OpenTK.Graphics.OpenGL.NvPresentVideo)pname, (Int64*)@params);
+                    pointer_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -127783,7 +127768,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvPresentVideo", Version = "1.2", EntryPoint = "glGetVideoi64vNV")]
             public static 
-            unsafe void GetVideoi64(UInt32 video_slot, OpenTK.Graphics.OpenGL.NvPresentVideo pname, [OutAttribute] Int64* @params)
+            unsafe void GetVideoi64(Int32 video_slot, OpenTK.Graphics.OpenGL.NvPresentVideo pname, [OutAttribute] Int64* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -127839,15 +127824,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvPresentVideo", Version = "1.2", EntryPoint = "glGetVideoivNV")]
+            [AutoGenerated(Category = "NvPresentVideo", Version = "1.2", EntryPoint = "glGetVideoi64vNV")]
             public static 
-            unsafe void GetVideo(Int32 video_slot, OpenTK.Graphics.OpenGL.NvPresentVideo pname, [OutAttribute] Int32* @params)
+            unsafe void GetVideoi64(UInt32 video_slot, OpenTK.Graphics.OpenGL.NvPresentVideo pname, [OutAttribute] Int64* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetVideoivNV((UInt32)video_slot, (OpenTK.Graphics.OpenGL.NvPresentVideo)pname, (Int32*)@params);
+                Delegates.glGetVideoi64vNV((UInt32)video_slot, (OpenTK.Graphics.OpenGL.NvPresentVideo)pname, (Int64*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -127897,7 +127882,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvPresentVideo", Version = "1.2", EntryPoint = "glGetVideoivNV")]
             public static 
-            unsafe void GetVideo(UInt32 video_slot, OpenTK.Graphics.OpenGL.NvPresentVideo pname, [OutAttribute] Int32* @params)
+            unsafe void GetVideo(Int32 video_slot, OpenTK.Graphics.OpenGL.NvPresentVideo pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -127953,15 +127938,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvPresentVideo", Version = "1.2", EntryPoint = "glGetVideoui64vNV")]
+            [AutoGenerated(Category = "NvPresentVideo", Version = "1.2", EntryPoint = "glGetVideoivNV")]
             public static 
-            unsafe void GetVideoui64(Int32 video_slot, OpenTK.Graphics.OpenGL.NvPresentVideo pname, [OutAttribute] Int64* @params)
+            unsafe void GetVideo(UInt32 video_slot, OpenTK.Graphics.OpenGL.NvPresentVideo pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetVideoui64vNV((UInt32)video_slot, (OpenTK.Graphics.OpenGL.NvPresentVideo)pname, (UInt64*)@params);
+                Delegates.glGetVideoivNV((UInt32)video_slot, (OpenTK.Graphics.OpenGL.NvPresentVideo)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -128008,6 +127993,42 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvPresentVideo", Version = "1.2", EntryPoint = "glGetVideoui64vNV")]
+            public static 
+            unsafe void GetVideoui64(Int32 video_slot, OpenTK.Graphics.OpenGL.NvPresentVideo pname, [OutAttribute] Int64* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetVideoui64vNV((UInt32)video_slot, (OpenTK.Graphics.OpenGL.NvPresentVideo)pname, (UInt64*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvPresentVideo", Version = "1.2", EntryPoint = "glGetVideoui64vNV")]
+            public static 
+            void GetVideoui64(UInt32 video_slot, OpenTK.Graphics.OpenGL.NvPresentVideo pname, [OutAttribute] UInt64[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt64* @params_ptr = @params)
+                    {
+                        Delegates.glGetVideoui64vNV((UInt32)video_slot, (OpenTK.Graphics.OpenGL.NvPresentVideo)pname, (UInt64*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvPresentVideo", Version = "1.2", EntryPoint = "glGetVideoui64vNV")]
             public static 
@@ -128046,9 +128067,9 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvPresentVideo", Version = "1.2", EntryPoint = "glGetVideoui64vNV")]
+            [AutoGenerated(Category = "NvPresentVideo", Version = "1.2", EntryPoint = "glGetVideouivNV")]
             public static 
-            void GetVideoui64(UInt32 video_slot, OpenTK.Graphics.OpenGL.NvPresentVideo pname, [OutAttribute] UInt64[] @params)
+            void GetVideo(UInt32 video_slot, OpenTK.Graphics.OpenGL.NvPresentVideo pname, [OutAttribute] UInt32[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -128056,9 +128077,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
                 unsafe
                 {
-                    fixed (UInt64* @params_ptr = @params)
+                    fixed (UInt32* @params_ptr = @params)
                     {
-                        Delegates.glGetVideoui64vNV((UInt32)video_slot, (OpenTK.Graphics.OpenGL.NvPresentVideo)pname, (UInt64*)@params_ptr);
+                        Delegates.glGetVideouivNV((UInt32)video_slot, (OpenTK.Graphics.OpenGL.NvPresentVideo)pname, (UInt32*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -128103,27 +128124,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvPresentVideo", Version = "1.2", EntryPoint = "glGetVideouivNV")]
-            public static 
-            void GetVideo(UInt32 video_slot, OpenTK.Graphics.OpenGL.NvPresentVideo pname, [OutAttribute] UInt32[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* @params_ptr = @params)
-                    {
-                        Delegates.glGetVideouivNV((UInt32)video_slot, (OpenTK.Graphics.OpenGL.NvPresentVideo)pname, (UInt32*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvFence", Version = "1.2", EntryPoint = "glIsFenceNV")]
             public static 
             bool IsFence(Int32 fence)
@@ -128258,21 +128258,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glLoadProgramNV")]
-            public static 
-            unsafe void LoadProgram(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 id, Int32 len, Byte* program)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glLoadProgramNV((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (UInt32)id, (Int32)len, (Byte*)program);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glLoadProgramNV")]
             public static 
             void LoadProgram(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 id, Int32 len, Byte[] program)
@@ -128316,7 +128301,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glLoadProgramNV")]
             public static 
-            unsafe void LoadProgram(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 id, Int32 len, Byte* program)
+            unsafe void LoadProgram(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 id, Int32 len, Byte* program)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -128370,25 +128355,16 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glMapControlPointsNV")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glLoadProgramNV")]
             public static 
-            void MapControlPoints<T8>(OpenTK.Graphics.OpenGL.NvEvaluators target, Int32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, Int32 uorder, Int32 vorder, bool packed, [InAttribute, OutAttribute] ref T8 points)
-                where T8 : struct
+            unsafe void LoadProgram(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 id, Int32 len, Byte* program)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle points_ptr = GCHandle.Alloc(points, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glMapControlPointsNV((OpenTK.Graphics.OpenGL.NvEvaluators)target, (UInt32)index, (OpenTK.Graphics.OpenGL.NvEvaluators)type, (Int32)ustride, (Int32)vstride, (Int32)uorder, (Int32)vorder, (bool)packed, (IntPtr)points_ptr.AddrOfPinnedObject());
-                    points = (T8)points_ptr.Target;
-                }
-                finally
-                {
-                    points_ptr.Free();
-                }
+                Delegates.glLoadProgramNV((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (UInt32)id, (Int32)len, (Byte*)program);
                 #if DEBUG
                 }
                 #endif
@@ -128396,7 +128372,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glMapControlPointsNV")]
             public static 
-            void MapControlPoints<T8>(OpenTK.Graphics.OpenGL.NvEvaluators target, Int32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, Int32 uorder, Int32 vorder, bool packed, [InAttribute, OutAttribute] T8[,,] points)
+            void MapControlPoints(OpenTK.Graphics.OpenGL.NvEvaluators target, Int32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, Int32 uorder, Int32 vorder, bool packed, IntPtr points)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMapControlPointsNV((OpenTK.Graphics.OpenGL.NvEvaluators)target, (UInt32)index, (OpenTK.Graphics.OpenGL.NvEvaluators)type, (Int32)ustride, (Int32)vstride, (Int32)uorder, (Int32)vorder, (bool)packed, (IntPtr)points);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glMapControlPointsNV")]
+            public static 
+            void MapControlPoints<T8>(OpenTK.Graphics.OpenGL.NvEvaluators target, Int32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, Int32 uorder, Int32 vorder, bool packed, [InAttribute, OutAttribute] T8[] points)
                 where T8 : struct
             {
                 #if DEBUG
@@ -128442,7 +128432,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glMapControlPointsNV")]
             public static 
-            void MapControlPoints<T8>(OpenTK.Graphics.OpenGL.NvEvaluators target, Int32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, Int32 uorder, Int32 vorder, bool packed, [InAttribute, OutAttribute] T8[] points)
+            void MapControlPoints<T8>(OpenTK.Graphics.OpenGL.NvEvaluators target, Int32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, Int32 uorder, Int32 vorder, bool packed, [InAttribute, OutAttribute] T8[,,] points)
                 where T8 : struct
             {
                 #if DEBUG
@@ -128465,22 +128455,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glMapControlPointsNV")]
             public static 
-            void MapControlPoints(OpenTK.Graphics.OpenGL.NvEvaluators target, Int32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, Int32 uorder, Int32 vorder, bool packed, IntPtr points)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMapControlPointsNV((OpenTK.Graphics.OpenGL.NvEvaluators)target, (UInt32)index, (OpenTK.Graphics.OpenGL.NvEvaluators)type, (Int32)ustride, (Int32)vstride, (Int32)uorder, (Int32)vorder, (bool)packed, (IntPtr)points);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glMapControlPointsNV")]
-            public static 
-            void MapControlPoints<T8>(OpenTK.Graphics.OpenGL.NvEvaluators target, UInt32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, Int32 uorder, Int32 vorder, bool packed, [InAttribute, OutAttribute] ref T8 points)
+            void MapControlPoints<T8>(OpenTK.Graphics.OpenGL.NvEvaluators target, Int32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, Int32 uorder, Int32 vorder, bool packed, [InAttribute, OutAttribute] ref T8 points)
                 where T8 : struct
             {
                 #if DEBUG
@@ -128505,7 +128480,22 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glMapControlPointsNV")]
             public static 
-            void MapControlPoints<T8>(OpenTK.Graphics.OpenGL.NvEvaluators target, UInt32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, Int32 uorder, Int32 vorder, bool packed, [InAttribute, OutAttribute] T8[,,] points)
+            void MapControlPoints(OpenTK.Graphics.OpenGL.NvEvaluators target, UInt32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, Int32 uorder, Int32 vorder, bool packed, IntPtr points)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMapControlPointsNV((OpenTK.Graphics.OpenGL.NvEvaluators)target, (UInt32)index, (OpenTK.Graphics.OpenGL.NvEvaluators)type, (Int32)ustride, (Int32)vstride, (Int32)uorder, (Int32)vorder, (bool)packed, (IntPtr)points);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glMapControlPointsNV")]
+            public static 
+            void MapControlPoints<T8>(OpenTK.Graphics.OpenGL.NvEvaluators target, UInt32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, Int32 uorder, Int32 vorder, bool packed, [InAttribute, OutAttribute] T8[] points)
                 where T8 : struct
             {
                 #if DEBUG
@@ -128553,7 +128543,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glMapControlPointsNV")]
             public static 
-            void MapControlPoints<T8>(OpenTK.Graphics.OpenGL.NvEvaluators target, UInt32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, Int32 uorder, Int32 vorder, bool packed, [InAttribute, OutAttribute] T8[] points)
+            void MapControlPoints<T8>(OpenTK.Graphics.OpenGL.NvEvaluators target, UInt32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, Int32 uorder, Int32 vorder, bool packed, [InAttribute, OutAttribute] T8[,,] points)
                 where T8 : struct
             {
                 #if DEBUG
@@ -128577,13 +128567,43 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glMapControlPointsNV")]
             public static 
-            void MapControlPoints(OpenTK.Graphics.OpenGL.NvEvaluators target, UInt32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, Int32 uorder, Int32 vorder, bool packed, IntPtr points)
+            void MapControlPoints<T8>(OpenTK.Graphics.OpenGL.NvEvaluators target, UInt32 index, OpenTK.Graphics.OpenGL.NvEvaluators type, Int32 ustride, Int32 vstride, Int32 uorder, Int32 vorder, bool packed, [InAttribute, OutAttribute] ref T8 points)
+                where T8 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glMapControlPointsNV((OpenTK.Graphics.OpenGL.NvEvaluators)target, (UInt32)index, (OpenTK.Graphics.OpenGL.NvEvaluators)type, (Int32)ustride, (Int32)vstride, (Int32)uorder, (Int32)vorder, (bool)packed, (IntPtr)points);
+                GCHandle points_ptr = GCHandle.Alloc(points, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glMapControlPointsNV((OpenTK.Graphics.OpenGL.NvEvaluators)target, (UInt32)index, (OpenTK.Graphics.OpenGL.NvEvaluators)type, (Int32)ustride, (Int32)vstride, (Int32)uorder, (Int32)vorder, (bool)packed, (IntPtr)points_ptr.AddrOfPinnedObject());
+                    points = (T8)points_ptr.Target;
+                }
+                finally
+                {
+                    points_ptr.Free();
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glMapParameterfvNV")]
+            public static 
+            void MapParameter(OpenTK.Graphics.OpenGL.NvEvaluators target, OpenTK.Graphics.OpenGL.NvEvaluators pname, Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glMapParameterfvNV((OpenTK.Graphics.OpenGL.NvEvaluators)target, (OpenTK.Graphics.OpenGL.NvEvaluators)pname, (Single*)@params_ptr);
+                    }
+                }
                 #if DEBUG
                 }
                 #endif
@@ -128624,41 +128644,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glMapParameterfvNV")]
-            public static 
-            void MapParameter(OpenTK.Graphics.OpenGL.NvEvaluators target, OpenTK.Graphics.OpenGL.NvEvaluators pname, Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glMapParameterfvNV((OpenTK.Graphics.OpenGL.NvEvaluators)target, (OpenTK.Graphics.OpenGL.NvEvaluators)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glMapParameterivNV")]
-            public static 
-            unsafe void MapParameter(OpenTK.Graphics.OpenGL.NvEvaluators target, OpenTK.Graphics.OpenGL.NvEvaluators pname, Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMapParameterivNV((OpenTK.Graphics.OpenGL.NvEvaluators)target, (OpenTK.Graphics.OpenGL.NvEvaluators)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glMapParameterivNV")]
             public static 
             void MapParameter(OpenTK.Graphics.OpenGL.NvEvaluators target, OpenTK.Graphics.OpenGL.NvEvaluators pname, Int32[] @params)
@@ -128699,6 +128684,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvEvaluators", Version = "1.1", EntryPoint = "glMapParameterivNV")]
+            public static 
+            unsafe void MapParameter(OpenTK.Graphics.OpenGL.NvEvaluators target, OpenTK.Graphics.OpenGL.NvEvaluators pname, Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMapParameterivNV((OpenTK.Graphics.OpenGL.NvEvaluators)target, (OpenTK.Graphics.OpenGL.NvEvaluators)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glMultiTexCoord1hNV")]
             public static 
             void MultiTexCoord1h(OpenTK.Graphics.OpenGL.TextureUnit target, OpenTK.Half s)
@@ -128742,21 +128742,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glMultiTexCoord2hvNV")]
-            public static 
-            unsafe void MultiTexCoord2h(OpenTK.Graphics.OpenGL.TextureUnit target, OpenTK.Half* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMultiTexCoord2hvNV((OpenTK.Graphics.OpenGL.TextureUnit)target, (OpenTK.Half*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glMultiTexCoord2hvNV")]
             public static 
             void MultiTexCoord2h(OpenTK.Graphics.OpenGL.TextureUnit target, OpenTK.Half[] v)
@@ -128797,6 +128782,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glMultiTexCoord2hvNV")]
+            public static 
+            unsafe void MultiTexCoord2h(OpenTK.Graphics.OpenGL.TextureUnit target, OpenTK.Half* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMultiTexCoord2hvNV((OpenTK.Graphics.OpenGL.TextureUnit)target, (OpenTK.Half*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glMultiTexCoord3hNV")]
             public static 
             void MultiTexCoord3h(OpenTK.Graphics.OpenGL.TextureUnit target, OpenTK.Half s, OpenTK.Half t, OpenTK.Half r)
@@ -128811,21 +128811,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glMultiTexCoord3hvNV")]
-            public static 
-            unsafe void MultiTexCoord3h(OpenTK.Graphics.OpenGL.TextureUnit target, OpenTK.Half* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMultiTexCoord3hvNV((OpenTK.Graphics.OpenGL.TextureUnit)target, (OpenTK.Half*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glMultiTexCoord3hvNV")]
             public static 
             void MultiTexCoord3h(OpenTK.Graphics.OpenGL.TextureUnit target, OpenTK.Half[] v)
@@ -128866,6 +128851,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glMultiTexCoord3hvNV")]
+            public static 
+            unsafe void MultiTexCoord3h(OpenTK.Graphics.OpenGL.TextureUnit target, OpenTK.Half* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMultiTexCoord3hvNV((OpenTK.Graphics.OpenGL.TextureUnit)target, (OpenTK.Half*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glMultiTexCoord4hNV")]
             public static 
             void MultiTexCoord4h(OpenTK.Graphics.OpenGL.TextureUnit target, OpenTK.Half s, OpenTK.Half t, OpenTK.Half r, OpenTK.Half q)
@@ -128880,21 +128880,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glMultiTexCoord4hvNV")]
-            public static 
-            unsafe void MultiTexCoord4h(OpenTK.Graphics.OpenGL.TextureUnit target, OpenTK.Half* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glMultiTexCoord4hvNV((OpenTK.Graphics.OpenGL.TextureUnit)target, (OpenTK.Half*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glMultiTexCoord4hvNV")]
             public static 
             void MultiTexCoord4h(OpenTK.Graphics.OpenGL.TextureUnit target, OpenTK.Half[] v)
@@ -128935,6 +128920,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glMultiTexCoord4hvNV")]
+            public static 
+            unsafe void MultiTexCoord4h(OpenTK.Graphics.OpenGL.TextureUnit target, OpenTK.Half* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glMultiTexCoord4hvNV((OpenTK.Graphics.OpenGL.TextureUnit)target, (OpenTK.Half*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glNormal3hNV")]
             public static 
             void Normal3h(OpenTK.Half nx, OpenTK.Half ny, OpenTK.Half nz)
@@ -128949,21 +128949,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glNormal3hvNV")]
-            public static 
-            unsafe void Normal3h(OpenTK.Half* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glNormal3hvNV((OpenTK.Half*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glNormal3hvNV")]
             public static 
             void Normal3h(OpenTK.Half[] v)
@@ -129004,6 +128989,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glNormal3hvNV")]
+            public static 
+            unsafe void Normal3h(OpenTK.Half* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glNormal3hvNV((OpenTK.Half*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvTransformFeedback2", Version = "", EntryPoint = "glPauseTransformFeedbackNV")]
             public static 
             void PauseTransformFeedback()
@@ -129020,23 +129020,13 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "NvPixelDataRange", Version = "1.2", EntryPoint = "glPixelDataRangeNV")]
             public static 
-            void PixelDataRange<T2>(OpenTK.Graphics.OpenGL.NvPixelDataRange target, Int32 length, [InAttribute, OutAttribute] ref T2 pointer)
-                where T2 : struct
+            void PixelDataRange(OpenTK.Graphics.OpenGL.NvPixelDataRange target, Int32 length, [OutAttribute] IntPtr pointer)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glPixelDataRangeNV((OpenTK.Graphics.OpenGL.NvPixelDataRange)target, (Int32)length, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                    pointer = (T2)pointer_ptr.Target;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
+                Delegates.glPixelDataRangeNV((OpenTK.Graphics.OpenGL.NvPixelDataRange)target, (Int32)length, (IntPtr)pointer);
                 #if DEBUG
                 }
                 #endif
@@ -129044,7 +129034,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "NvPixelDataRange", Version = "1.2", EntryPoint = "glPixelDataRangeNV")]
             public static 
-            void PixelDataRange<T2>(OpenTK.Graphics.OpenGL.NvPixelDataRange target, Int32 length, [InAttribute, OutAttribute] T2[,,] pointer)
+            void PixelDataRange<T2>(OpenTK.Graphics.OpenGL.NvPixelDataRange target, Int32 length, [InAttribute, OutAttribute] T2[] pointer)
                 where T2 : struct
             {
                 #if DEBUG
@@ -129090,7 +129080,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "NvPixelDataRange", Version = "1.2", EntryPoint = "glPixelDataRangeNV")]
             public static 
-            void PixelDataRange<T2>(OpenTK.Graphics.OpenGL.NvPixelDataRange target, Int32 length, [InAttribute, OutAttribute] T2[] pointer)
+            void PixelDataRange<T2>(OpenTK.Graphics.OpenGL.NvPixelDataRange target, Int32 length, [InAttribute, OutAttribute] T2[,,] pointer)
                 where T2 : struct
             {
                 #if DEBUG
@@ -129113,13 +129103,23 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "NvPixelDataRange", Version = "1.2", EntryPoint = "glPixelDataRangeNV")]
             public static 
-            void PixelDataRange(OpenTK.Graphics.OpenGL.NvPixelDataRange target, Int32 length, [OutAttribute] IntPtr pointer)
+            void PixelDataRange<T2>(OpenTK.Graphics.OpenGL.NvPixelDataRange target, Int32 length, [InAttribute, OutAttribute] ref T2 pointer)
+                where T2 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glPixelDataRangeNV((OpenTK.Graphics.OpenGL.NvPixelDataRange)target, (Int32)length, (IntPtr)pointer);
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glPixelDataRangeNV((OpenTK.Graphics.OpenGL.NvPixelDataRange)target, (Int32)length, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    pointer = (T2)pointer_ptr.Target;
+                }
+                finally
+                {
+                    pointer_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -129167,16 +129167,21 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the value that pname will be set to.
         /// </para>
         /// </param>
-            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvPointSprite", Version = "1.2", EntryPoint = "glPointParameterivNV")]
             public static 
-            unsafe void PointParameter(OpenTK.Graphics.OpenGL.NvPointSprite pname, Int32* @params)
+            void PointParameter(OpenTK.Graphics.OpenGL.NvPointSprite pname, Int32[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glPointParameterivNV((OpenTK.Graphics.OpenGL.NvPointSprite)pname, (Int32*)@params);
+                unsafe
+                {
+                    fixed (Int32* @params_ptr = @params)
+                    {
+                        Delegates.glPointParameterivNV((OpenTK.Graphics.OpenGL.NvPointSprite)pname, (Int32*)@params_ptr);
+                    }
+                }
                 #if DEBUG
                 }
                 #endif
@@ -129196,21 +129201,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the value that pname will be set to.
         /// </para>
         /// </param>
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvPointSprite", Version = "1.2", EntryPoint = "glPointParameterivNV")]
             public static 
-            void PointParameter(OpenTK.Graphics.OpenGL.NvPointSprite pname, Int32[] @params)
+            unsafe void PointParameter(OpenTK.Graphics.OpenGL.NvPointSprite pname, Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                unsafe
-                {
-                    fixed (Int32* @params_ptr = @params)
-                    {
-                        Delegates.glPointParameterivNV((OpenTK.Graphics.OpenGL.NvPointSprite)pname, (Int32*)@params_ptr);
-                    }
-                }
+                Delegates.glPointParameterivNV((OpenTK.Graphics.OpenGL.NvPointSprite)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -129317,6 +129317,26 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "NvParameterBufferObject", Version = "1.2", EntryPoint = "glProgramBufferParametersfvNV")]
+            public static 
+            void ProgramBufferParameters(OpenTK.Graphics.OpenGL.NvParameterBufferObject target, Int32 buffer, Int32 index, Int32 count, Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glProgramBufferParametersfvNV((OpenTK.Graphics.OpenGL.NvParameterBufferObject)target, (UInt32)buffer, (UInt32)index, (Int32)count, (Single*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvParameterBufferObject", Version = "1.2", EntryPoint = "glProgramBufferParametersfvNV")]
             public static 
             void ProgramBufferParameters(OpenTK.Graphics.OpenGL.NvParameterBufferObject target, Int32 buffer, Int32 index, Int32 count, ref Single @params)
@@ -129352,9 +129372,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvParameterBufferObject", Version = "1.2", EntryPoint = "glProgramBufferParametersfvNV")]
             public static 
-            void ProgramBufferParameters(OpenTK.Graphics.OpenGL.NvParameterBufferObject target, Int32 buffer, Int32 index, Int32 count, Single[] @params)
+            void ProgramBufferParameters(OpenTK.Graphics.OpenGL.NvParameterBufferObject target, UInt32 buffer, UInt32 index, Int32 count, Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -129408,42 +129429,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvParameterBufferObject", Version = "1.2", EntryPoint = "glProgramBufferParametersfvNV")]
-            public static 
-            void ProgramBufferParameters(OpenTK.Graphics.OpenGL.NvParameterBufferObject target, UInt32 buffer, UInt32 index, Int32 count, Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glProgramBufferParametersfvNV((OpenTK.Graphics.OpenGL.NvParameterBufferObject)target, (UInt32)buffer, (UInt32)index, (Int32)count, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvParameterBufferObject", Version = "1.2", EntryPoint = "glProgramBufferParametersIivNV")]
-            public static 
-            unsafe void ProgramBufferParametersI(OpenTK.Graphics.OpenGL.NvParameterBufferObject target, Int32 buffer, Int32 index, Int32 count, Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glProgramBufferParametersIivNV((OpenTK.Graphics.OpenGL.NvParameterBufferObject)target, (UInt32)buffer, (UInt32)index, (Int32)count, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvParameterBufferObject", Version = "1.2", EntryPoint = "glProgramBufferParametersIivNV")]
             public static 
             void ProgramBufferParametersI(OpenTK.Graphics.OpenGL.NvParameterBufferObject target, Int32 buffer, Int32 index, Int32 count, Int32[] @params)
@@ -129487,7 +129472,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvParameterBufferObject", Version = "1.2", EntryPoint = "glProgramBufferParametersIivNV")]
             public static 
-            unsafe void ProgramBufferParametersI(OpenTK.Graphics.OpenGL.NvParameterBufferObject target, UInt32 buffer, UInt32 index, Int32 count, Int32* @params)
+            unsafe void ProgramBufferParametersI(OpenTK.Graphics.OpenGL.NvParameterBufferObject target, Int32 buffer, Int32 index, Int32 count, Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -129541,6 +129526,42 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvParameterBufferObject", Version = "1.2", EntryPoint = "glProgramBufferParametersIivNV")]
+            public static 
+            unsafe void ProgramBufferParametersI(OpenTK.Graphics.OpenGL.NvParameterBufferObject target, UInt32 buffer, UInt32 index, Int32 count, Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glProgramBufferParametersIivNV((OpenTK.Graphics.OpenGL.NvParameterBufferObject)target, (UInt32)buffer, (UInt32)index, (Int32)count, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvParameterBufferObject", Version = "1.2", EntryPoint = "glProgramBufferParametersIuivNV")]
+            public static 
+            void ProgramBufferParametersI(OpenTK.Graphics.OpenGL.NvParameterBufferObject target, UInt32 buffer, UInt32 index, Int32 count, UInt32[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* @params_ptr = @params)
+                    {
+                        Delegates.glProgramBufferParametersIuivNV((OpenTK.Graphics.OpenGL.NvParameterBufferObject)target, (UInt32)buffer, (UInt32)index, (Int32)count, (UInt32*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvParameterBufferObject", Version = "1.2", EntryPoint = "glProgramBufferParametersIuivNV")]
             public static 
@@ -129577,27 +129598,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvParameterBufferObject", Version = "1.2", EntryPoint = "glProgramBufferParametersIuivNV")]
-            public static 
-            void ProgramBufferParametersI(OpenTK.Graphics.OpenGL.NvParameterBufferObject target, UInt32 buffer, UInt32 index, Int32 count, UInt32[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* @params_ptr = @params)
-                    {
-                        Delegates.glProgramBufferParametersIuivNV((OpenTK.Graphics.OpenGL.NvParameterBufferObject)target, (UInt32)buffer, (UInt32)index, (Int32)count, (UInt32*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramEnvParameterI4iNV")]
             public static 
             void ProgramEnvParameterI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, Int32 index, Int32 x, Int32 y, Int32 z, Int32 w)
@@ -129627,21 +129627,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramEnvParameterI4ivNV")]
-            public static 
-            unsafe void ProgramEnvParameterI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, Int32 index, Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glProgramEnvParameterI4ivNV((OpenTK.Graphics.OpenGL.NvGpuProgram4)target, (UInt32)index, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramEnvParameterI4ivNV")]
             public static 
             void ProgramEnvParameterI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, Int32 index, Int32[] @params)
@@ -129685,7 +129670,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramEnvParameterI4ivNV")]
             public static 
-            unsafe void ProgramEnvParameterI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, UInt32 index, Int32* @params)
+            unsafe void ProgramEnvParameterI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, Int32 index, Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -129739,6 +129724,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramEnvParameterI4ivNV")]
+            public static 
+            unsafe void ProgramEnvParameterI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, UInt32 index, Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glProgramEnvParameterI4ivNV((OpenTK.Graphics.OpenGL.NvGpuProgram4)target, (UInt32)index, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramEnvParameterI4uiNV")]
             public static 
@@ -129754,6 +129754,27 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramEnvParameterI4uivNV")]
+            public static 
+            void ProgramEnvParameterI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, UInt32 index, UInt32[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* @params_ptr = @params)
+                    {
+                        Delegates.glProgramEnvParameterI4uivNV((OpenTK.Graphics.OpenGL.NvGpuProgram4)target, (UInt32)index, (UInt32*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramEnvParameterI4uivNV")]
             public static 
@@ -129790,42 +129811,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramEnvParameterI4uivNV")]
-            public static 
-            void ProgramEnvParameterI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, UInt32 index, UInt32[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* @params_ptr = @params)
-                    {
-                        Delegates.glProgramEnvParameterI4uivNV((OpenTK.Graphics.OpenGL.NvGpuProgram4)target, (UInt32)index, (UInt32*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramEnvParametersI4ivNV")]
-            public static 
-            unsafe void ProgramEnvParametersI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, Int32 index, Int32 count, Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glProgramEnvParametersI4ivNV((OpenTK.Graphics.OpenGL.NvGpuProgram4)target, (UInt32)index, (Int32)count, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramEnvParametersI4ivNV")]
             public static 
             void ProgramEnvParametersI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, Int32 index, Int32 count, Int32[] @params)
@@ -129869,7 +129854,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramEnvParametersI4ivNV")]
             public static 
-            unsafe void ProgramEnvParametersI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, UInt32 index, Int32 count, Int32* @params)
+            unsafe void ProgramEnvParametersI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, Int32 index, Int32 count, Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -129923,6 +129908,42 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramEnvParametersI4ivNV")]
+            public static 
+            unsafe void ProgramEnvParametersI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, UInt32 index, Int32 count, Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glProgramEnvParametersI4ivNV((OpenTK.Graphics.OpenGL.NvGpuProgram4)target, (UInt32)index, (Int32)count, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramEnvParametersI4uivNV")]
+            public static 
+            void ProgramEnvParametersI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, UInt32 index, Int32 count, UInt32[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* @params_ptr = @params)
+                    {
+                        Delegates.glProgramEnvParametersI4uivNV((OpenTK.Graphics.OpenGL.NvGpuProgram4)target, (UInt32)index, (Int32)count, (UInt32*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramEnvParametersI4uivNV")]
             public static 
@@ -129959,27 +129980,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramEnvParametersI4uivNV")]
-            public static 
-            void ProgramEnvParametersI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, UInt32 index, Int32 count, UInt32[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* @params_ptr = @params)
-                    {
-                        Delegates.glProgramEnvParametersI4uivNV((OpenTK.Graphics.OpenGL.NvGpuProgram4)target, (UInt32)index, (Int32)count, (UInt32*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramLocalParameterI4iNV")]
             public static 
             void ProgramLocalParameterI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, Int32 index, Int32 x, Int32 y, Int32 z, Int32 w)
@@ -130009,21 +130009,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramLocalParameterI4ivNV")]
-            public static 
-            unsafe void ProgramLocalParameterI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, Int32 index, Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glProgramLocalParameterI4ivNV((OpenTK.Graphics.OpenGL.NvGpuProgram4)target, (UInt32)index, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramLocalParameterI4ivNV")]
             public static 
             void ProgramLocalParameterI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, Int32 index, Int32[] @params)
@@ -130067,7 +130052,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramLocalParameterI4ivNV")]
             public static 
-            unsafe void ProgramLocalParameterI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, UInt32 index, Int32* @params)
+            unsafe void ProgramLocalParameterI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, Int32 index, Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -130121,6 +130106,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramLocalParameterI4ivNV")]
+            public static 
+            unsafe void ProgramLocalParameterI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, UInt32 index, Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glProgramLocalParameterI4ivNV((OpenTK.Graphics.OpenGL.NvGpuProgram4)target, (UInt32)index, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramLocalParameterI4uiNV")]
             public static 
@@ -130136,6 +130136,27 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramLocalParameterI4uivNV")]
+            public static 
+            void ProgramLocalParameterI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, UInt32 index, UInt32[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* @params_ptr = @params)
+                    {
+                        Delegates.glProgramLocalParameterI4uivNV((OpenTK.Graphics.OpenGL.NvGpuProgram4)target, (UInt32)index, (UInt32*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramLocalParameterI4uivNV")]
             public static 
@@ -130172,42 +130193,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramLocalParameterI4uivNV")]
-            public static 
-            void ProgramLocalParameterI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, UInt32 index, UInt32[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* @params_ptr = @params)
-                    {
-                        Delegates.glProgramLocalParameterI4uivNV((OpenTK.Graphics.OpenGL.NvGpuProgram4)target, (UInt32)index, (UInt32*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramLocalParametersI4ivNV")]
-            public static 
-            unsafe void ProgramLocalParametersI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, Int32 index, Int32 count, Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glProgramLocalParametersI4ivNV((OpenTK.Graphics.OpenGL.NvGpuProgram4)target, (UInt32)index, (Int32)count, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramLocalParametersI4ivNV")]
             public static 
             void ProgramLocalParametersI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, Int32 index, Int32 count, Int32[] @params)
@@ -130251,7 +130236,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramLocalParametersI4ivNV")]
             public static 
-            unsafe void ProgramLocalParametersI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, UInt32 index, Int32 count, Int32* @params)
+            unsafe void ProgramLocalParametersI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, Int32 index, Int32 count, Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -130305,6 +130290,42 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramLocalParametersI4ivNV")]
+            public static 
+            unsafe void ProgramLocalParametersI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, UInt32 index, Int32 count, Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glProgramLocalParametersI4ivNV((OpenTK.Graphics.OpenGL.NvGpuProgram4)target, (UInt32)index, (Int32)count, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramLocalParametersI4uivNV")]
+            public static 
+            void ProgramLocalParametersI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, UInt32 index, Int32 count, UInt32[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* @params_ptr = @params)
+                    {
+                        Delegates.glProgramLocalParametersI4uivNV((OpenTK.Graphics.OpenGL.NvGpuProgram4)target, (UInt32)index, (Int32)count, (UInt32*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramLocalParametersI4uivNV")]
             public static 
@@ -130341,42 +130362,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvGpuProgram4", Version = "1.3", EntryPoint = "glProgramLocalParametersI4uivNV")]
-            public static 
-            void ProgramLocalParametersI4(OpenTK.Graphics.OpenGL.NvGpuProgram4 target, UInt32 index, Int32 count, UInt32[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* @params_ptr = @params)
-                    {
-                        Delegates.glProgramLocalParametersI4uivNV((OpenTK.Graphics.OpenGL.NvGpuProgram4)target, (UInt32)index, (Int32)count, (UInt32*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glProgramNamedParameter4dNV")]
-            public static 
-            unsafe void ProgramNamedParameter4(Int32 id, Int32 len, Byte* name, Double x, Double y, Double z, Double w)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glProgramNamedParameter4dNV((UInt32)id, (Int32)len, (Byte*)name, (Double)x, (Double)y, (Double)z, (Double)w);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glProgramNamedParameter4dNV")]
             public static 
             void ProgramNamedParameter4(Int32 id, Int32 len, ref Byte name, Double x, Double y, Double z, Double w)
@@ -130400,7 +130385,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glProgramNamedParameter4dNV")]
             public static 
-            unsafe void ProgramNamedParameter4(UInt32 id, Int32 len, Byte* name, Double x, Double y, Double z, Double w)
+            unsafe void ProgramNamedParameter4(Int32 id, Int32 len, Byte* name, Double x, Double y, Double z, Double w)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -130434,33 +130419,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glProgramNamedParameter4dvNV")]
+            [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glProgramNamedParameter4dNV")]
             public static 
-            unsafe void ProgramNamedParameter4(Int32 id, Int32 len, Byte* name, Double* v)
+            unsafe void ProgramNamedParameter4(UInt32 id, Int32 len, Byte* name, Double x, Double y, Double z, Double w)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glProgramNamedParameter4dvNV((UInt32)id, (Int32)len, (Byte*)name, (Double*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glProgramNamedParameter4dvNV")]
-            public static 
-            unsafe void ProgramNamedParameter4(Int32 id, Int32 len, Byte* name, Double[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                fixed (Double* v_ptr = v)
-                {
-                    Delegates.glProgramNamedParameter4dvNV((UInt32)id, (Int32)len, (Byte*)name, (Double*)v_ptr);
-                }
+                Delegates.glProgramNamedParameter4dNV((UInt32)id, (Int32)len, (Byte*)name, (Double)x, (Double)y, (Double)z, (Double)w);
                 #if DEBUG
                 }
                 #endif
@@ -130490,22 +130457,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glProgramNamedParameter4dvNV")]
             public static 
-            unsafe void ProgramNamedParameter4(UInt32 id, Int32 len, Byte* name, Double* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glProgramNamedParameter4dvNV((UInt32)id, (Int32)len, (Byte*)name, (Double*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glProgramNamedParameter4dvNV")]
-            public static 
-            unsafe void ProgramNamedParameter4(UInt32 id, Int32 len, Byte* name, Double[] v)
+            unsafe void ProgramNamedParameter4(Int32 id, Int32 len, Byte* name, Double[] v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -130520,6 +130472,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glProgramNamedParameter4dvNV")]
+            public static 
+            unsafe void ProgramNamedParameter4(Int32 id, Int32 len, Byte* name, Double* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glProgramNamedParameter4dvNV((UInt32)id, (Int32)len, (Byte*)name, (Double*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glProgramNamedParameter4dvNV")]
             public static 
@@ -130543,15 +130510,33 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glProgramNamedParameter4fNV")]
+            [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glProgramNamedParameter4dvNV")]
             public static 
-            unsafe void ProgramNamedParameter4(Int32 id, Int32 len, Byte* name, Single x, Single y, Single z, Single w)
+            unsafe void ProgramNamedParameter4(UInt32 id, Int32 len, Byte* name, Double[] v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glProgramNamedParameter4fNV((UInt32)id, (Int32)len, (Byte*)name, (Single)x, (Single)y, (Single)z, (Single)w);
+                fixed (Double* v_ptr = v)
+                {
+                    Delegates.glProgramNamedParameter4dvNV((UInt32)id, (Int32)len, (Byte*)name, (Double*)v_ptr);
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glProgramNamedParameter4dvNV")]
+            public static 
+            unsafe void ProgramNamedParameter4(UInt32 id, Int32 len, Byte* name, Double* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glProgramNamedParameter4dvNV((UInt32)id, (Int32)len, (Byte*)name, (Double*)v);
                 #if DEBUG
                 }
                 #endif
@@ -130580,7 +130565,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glProgramNamedParameter4fNV")]
             public static 
-            unsafe void ProgramNamedParameter4(UInt32 id, Int32 len, Byte* name, Single x, Single y, Single z, Single w)
+            unsafe void ProgramNamedParameter4(Int32 id, Int32 len, Byte* name, Single x, Single y, Single z, Single w)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -130614,33 +130599,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glProgramNamedParameter4fvNV")]
+            [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glProgramNamedParameter4fNV")]
             public static 
-            unsafe void ProgramNamedParameter4(Int32 id, Int32 len, Byte* name, Single* v)
+            unsafe void ProgramNamedParameter4(UInt32 id, Int32 len, Byte* name, Single x, Single y, Single z, Single w)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glProgramNamedParameter4fvNV((UInt32)id, (Int32)len, (Byte*)name, (Single*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glProgramNamedParameter4fvNV")]
-            public static 
-            unsafe void ProgramNamedParameter4(Int32 id, Int32 len, Byte* name, Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                fixed (Single* v_ptr = v)
-                {
-                    Delegates.glProgramNamedParameter4fvNV((UInt32)id, (Int32)len, (Byte*)name, (Single*)v_ptr);
-                }
+                Delegates.glProgramNamedParameter4fNV((UInt32)id, (Int32)len, (Byte*)name, (Single)x, (Single)y, (Single)z, (Single)w);
                 #if DEBUG
                 }
                 #endif
@@ -130670,7 +130637,25 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glProgramNamedParameter4fvNV")]
             public static 
-            unsafe void ProgramNamedParameter4(UInt32 id, Int32 len, Byte* name, Single* v)
+            unsafe void ProgramNamedParameter4(Int32 id, Int32 len, Byte* name, Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                fixed (Single* v_ptr = v)
+                {
+                    Delegates.glProgramNamedParameter4fvNV((UInt32)id, (Int32)len, (Byte*)name, (Single*)v_ptr);
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glProgramNamedParameter4fvNV")]
+            public static 
+            unsafe void ProgramNamedParameter4(Int32 id, Int32 len, Byte* name, Single* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -130682,6 +130667,28 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glProgramNamedParameter4fvNV")]
+            public static 
+            void ProgramNamedParameter4(UInt32 id, Int32 len, ref Byte name, ref Single v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Byte* name_ptr = &name)
+                    fixed (Single* v_ptr = &v)
+                    {
+                        Delegates.glProgramNamedParameter4fvNV((UInt32)id, (Int32)len, (Byte*)name_ptr, (Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glProgramNamedParameter4fvNV")]
             public static 
@@ -130703,20 +130710,13 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvFragmentProgram", Version = "1.2", EntryPoint = "glProgramNamedParameter4fvNV")]
             public static 
-            void ProgramNamedParameter4(UInt32 id, Int32 len, ref Byte name, ref Single v)
+            unsafe void ProgramNamedParameter4(UInt32 id, Int32 len, Byte* name, Single* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                unsafe
-                {
-                    fixed (Byte* name_ptr = &name)
-                    fixed (Single* v_ptr = &v)
-                    {
-                        Delegates.glProgramNamedParameter4fvNV((UInt32)id, (Int32)len, (Byte*)name_ptr, (Single*)v_ptr);
-                    }
-                }
+                Delegates.glProgramNamedParameter4fvNV((UInt32)id, (Int32)len, (Byte*)name, (Single*)v);
                 #if DEBUG
                 }
                 #endif
@@ -130751,21 +130751,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glProgramParameter4dvNV")]
-            public static 
-            unsafe void ProgramParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, Double* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glProgramParameter4dvNV((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (UInt32)index, (Double*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glProgramParameter4dvNV")]
             public static 
             void ProgramParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, Double[] v)
@@ -130809,7 +130794,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glProgramParameter4dvNV")]
             public static 
-            unsafe void ProgramParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 index, Double* v)
+            unsafe void ProgramParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, Double* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -130863,6 +130848,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glProgramParameter4dvNV")]
+            public static 
+            unsafe void ProgramParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 index, Double* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glProgramParameter4dvNV((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (UInt32)index, (Double*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glProgramParameter4fNV")]
             public static 
             void ProgramParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, Single x, Single y, Single z, Single w)
@@ -130892,6 +130892,26 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glProgramParameter4fvNV")]
+            public static 
+            void ProgramParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glProgramParameter4fvNV((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (UInt32)index, (Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glProgramParameter4fvNV")]
             public static 
             void ProgramParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, ref Single v)
@@ -130927,9 +130947,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glProgramParameter4fvNV")]
             public static 
-            void ProgramParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, Single[] v)
+            void ProgramParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 index, Single[] v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -130983,42 +131004,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glProgramParameter4fvNV")]
-            public static 
-            void ProgramParameter4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 index, Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glProgramParameter4fvNV((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (UInt32)index, (Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glProgramParameters4dvNV")]
-            public static 
-            unsafe void ProgramParameters4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, Int32 count, Double* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glProgramParameters4dvNV((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (UInt32)index, (UInt32)count, (Double*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glProgramParameters4dvNV")]
             public static 
             void ProgramParameters4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, Int32 count, Double[] v)
@@ -131062,7 +131047,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glProgramParameters4dvNV")]
             public static 
-            unsafe void ProgramParameters4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 index, UInt32 count, Double* v)
+            unsafe void ProgramParameters4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, Int32 count, Double* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -131116,6 +131101,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glProgramParameters4dvNV")]
+            public static 
+            unsafe void ProgramParameters4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 index, UInt32 count, Double* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glProgramParameters4dvNV((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (UInt32)index, (UInt32)count, (Double*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glProgramParameters4fvNV")]
+            public static 
+            void ProgramParameters4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, Int32 count, Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glProgramParameters4fvNV((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (UInt32)index, (UInt32)count, (Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glProgramParameters4fvNV")]
             public static 
             void ProgramParameters4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, Int32 count, ref Single v)
@@ -131151,9 +131171,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glProgramParameters4fvNV")]
             public static 
-            void ProgramParameters4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, Int32 index, Int32 count, Single[] v)
+            void ProgramParameters4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 index, UInt32 count, Single[] v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -131207,27 +131228,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glProgramParameters4fvNV")]
-            public static 
-            void ProgramParameters4(OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb target, UInt32 index, UInt32 count, Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glProgramParameters4fvNV((OpenTK.Graphics.OpenGL.AssemblyProgramTargetArb)target, (UInt32)index, (UInt32)count, (Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvGeometryProgram4", Version = "2.0", EntryPoint = "glProgramVertexLimitNV")]
             public static 
             void ProgramVertexLimit(OpenTK.Graphics.OpenGL.NvGeometryProgram4 target, Int32 limit)
@@ -131256,21 +131256,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glRequestResidentProgramsNV")]
-            public static 
-            unsafe void RequestResidentProgram(Int32 n, Int32* programs)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glRequestResidentProgramsNV((Int32)n, (UInt32*)programs);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glRequestResidentProgramsNV")]
             public static 
             void RequestResidentProgram(Int32 n, Int32[] programs)
@@ -131311,6 +131296,42 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glRequestResidentProgramsNV")]
+            public static 
+            unsafe void RequestResidentProgram(Int32 n, Int32* programs)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glRequestResidentProgramsNV((Int32)n, (UInt32*)programs);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glRequestResidentProgramsNV")]
+            public static 
+            void RequestResidentProgram(Int32 n, UInt32[] programs)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (UInt32* programs_ptr = programs)
+                    {
+                        Delegates.glRequestResidentProgramsNV((Int32)n, (UInt32*)programs_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glRequestResidentProgramsNV")]
             public static 
@@ -131347,27 +131368,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glRequestResidentProgramsNV")]
-            public static 
-            void RequestResidentProgram(Int32 n, UInt32[] programs)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (UInt32* programs_ptr = programs)
-                    {
-                        Delegates.glRequestResidentProgramsNV((Int32)n, (UInt32*)programs_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvTransformFeedback2", Version = "", EntryPoint = "glResumeTransformFeedbackNV")]
             public static 
             void ResumeTransformFeedback()
@@ -131425,21 +131425,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glSecondaryColor3hvNV")]
-            public static 
-            unsafe void SecondaryColor3h(OpenTK.Half* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glSecondaryColor3hvNV((OpenTK.Half*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glSecondaryColor3hvNV")]
             public static 
             void SecondaryColor3h(OpenTK.Half[] v)
@@ -131480,6 +131465,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glSecondaryColor3hvNV")]
+            public static 
+            unsafe void SecondaryColor3h(OpenTK.Half* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glSecondaryColor3hvNV((OpenTK.Half*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvFence", Version = "1.2", EntryPoint = "glSetFenceNV")]
             public static 
             void SetFence(Int32 fence, OpenTK.Graphics.OpenGL.NvFence condition)
@@ -131581,21 +131581,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glTexCoord2hvNV")]
-            public static 
-            unsafe void TexCoord2h(OpenTK.Half* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glTexCoord2hvNV((OpenTK.Half*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glTexCoord2hvNV")]
             public static 
             void TexCoord2h(OpenTK.Half[] v)
@@ -131636,6 +131621,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glTexCoord2hvNV")]
+            public static 
+            unsafe void TexCoord2h(OpenTK.Half* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTexCoord2hvNV((OpenTK.Half*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glTexCoord3hNV")]
             public static 
             void TexCoord3h(OpenTK.Half s, OpenTK.Half t, OpenTK.Half r)
@@ -131650,21 +131650,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glTexCoord3hvNV")]
-            public static 
-            unsafe void TexCoord3h(OpenTK.Half* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glTexCoord3hvNV((OpenTK.Half*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glTexCoord3hvNV")]
             public static 
             void TexCoord3h(OpenTK.Half[] v)
@@ -131705,6 +131690,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glTexCoord3hvNV")]
+            public static 
+            unsafe void TexCoord3h(OpenTK.Half* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTexCoord3hvNV((OpenTK.Half*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glTexCoord4hNV")]
             public static 
             void TexCoord4h(OpenTK.Half s, OpenTK.Half t, OpenTK.Half r, OpenTK.Half q)
@@ -131719,21 +131719,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glTexCoord4hvNV")]
-            public static 
-            unsafe void TexCoord4h(OpenTK.Half* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glTexCoord4hvNV((OpenTK.Half*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glTexCoord4hvNV")]
             public static 
             void TexCoord4h(OpenTK.Half[] v)
@@ -131774,6 +131759,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glTexCoord4hvNV")]
+            public static 
+            unsafe void TexCoord4h(OpenTK.Half* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTexCoord4hvNV((OpenTK.Half*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvExplicitMultisample", Version = "", EntryPoint = "glTexRenderbufferNV")]
             public static 
             void TexRenderbuffer(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 renderbuffer)
@@ -131832,21 +131832,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvTransformFeedback", Version = "1.5", EntryPoint = "glTransformFeedbackAttribsNV")]
-            public static 
-            unsafe void TransformFeedbackAttrib(Int32 count, Int32* attribs, OpenTK.Graphics.OpenGL.NvTransformFeedback bufferMode)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glTransformFeedbackAttribsNV((UInt32)count, (Int32*)attribs, (OpenTK.Graphics.OpenGL.NvTransformFeedback)bufferMode);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvTransformFeedback", Version = "1.5", EntryPoint = "glTransformFeedbackAttribsNV")]
             public static 
             void TransformFeedbackAttrib(Int32 count, Int32[] attribs, OpenTK.Graphics.OpenGL.NvTransformFeedback bufferMode)
@@ -131890,7 +131875,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvTransformFeedback", Version = "1.5", EntryPoint = "glTransformFeedbackAttribsNV")]
             public static 
-            unsafe void TransformFeedbackAttrib(UInt32 count, Int32* attribs, OpenTK.Graphics.OpenGL.NvTransformFeedback bufferMode)
+            unsafe void TransformFeedbackAttrib(Int32 count, Int32* attribs, OpenTK.Graphics.OpenGL.NvTransformFeedback bufferMode)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -131944,6 +131929,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvTransformFeedback", Version = "1.5", EntryPoint = "glTransformFeedbackAttribsNV")]
+            public static 
+            unsafe void TransformFeedbackAttrib(UInt32 count, Int32* attribs, OpenTK.Graphics.OpenGL.NvTransformFeedback bufferMode)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTransformFeedbackAttribsNV((UInt32)count, (Int32*)attribs, (OpenTK.Graphics.OpenGL.NvTransformFeedback)bufferMode);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvTransformFeedback", Version = "1.5", EntryPoint = "glTransformFeedbackVaryingsNV")]
             public static 
             void TransformFeedbackVaryings(Int32 program, Int32 count, String[] varyings, OpenTK.Graphics.OpenGL.NvTransformFeedback bufferMode)
@@ -131987,21 +131987,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertex2hvNV")]
-            public static 
-            unsafe void Vertex2h(OpenTK.Half* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertex2hvNV((OpenTK.Half*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertex2hvNV")]
             public static 
             void Vertex2h(OpenTK.Half[] v)
@@ -132042,6 +132027,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertex2hvNV")]
+            public static 
+            unsafe void Vertex2h(OpenTK.Half* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertex2hvNV((OpenTK.Half*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertex3hNV")]
             public static 
             void Vertex3h(OpenTK.Half x, OpenTK.Half y, OpenTK.Half z)
@@ -132056,21 +132056,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertex3hvNV")]
-            public static 
-            unsafe void Vertex3h(OpenTK.Half* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertex3hvNV((OpenTK.Half*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertex3hvNV")]
             public static 
             void Vertex3h(OpenTK.Half[] v)
@@ -132111,6 +132096,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertex3hvNV")]
+            public static 
+            unsafe void Vertex3h(OpenTK.Half* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertex3hvNV((OpenTK.Half*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertex4hNV")]
             public static 
             void Vertex4h(OpenTK.Half x, OpenTK.Half y, OpenTK.Half z, OpenTK.Half w)
@@ -132125,21 +132125,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertex4hvNV")]
-            public static 
-            unsafe void Vertex4h(OpenTK.Half* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertex4hvNV((OpenTK.Half*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertex4hvNV")]
             public static 
             void Vertex4h(OpenTK.Half[] v)
@@ -132180,25 +132165,16 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "NvVertexArrayRange", Version = "1.1", EntryPoint = "glVertexArrayRangeNV")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertex4hvNV")]
             public static 
-            void VertexArrayRange<T1>(Int32 length, [InAttribute, OutAttribute] ref T1 pointer)
-                where T1 : struct
+            unsafe void Vertex4h(OpenTK.Half* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glVertexArrayRangeNV((Int32)length, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                    pointer = (T1)pointer_ptr.Target;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
+                Delegates.glVertex4hvNV((OpenTK.Half*)v);
                 #if DEBUG
                 }
                 #endif
@@ -132206,7 +132182,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "NvVertexArrayRange", Version = "1.1", EntryPoint = "glVertexArrayRangeNV")]
             public static 
-            void VertexArrayRange<T1>(Int32 length, [InAttribute, OutAttribute] T1[,,] pointer)
+            void VertexArrayRange(Int32 length, IntPtr pointer)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexArrayRangeNV((Int32)length, (IntPtr)pointer);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "NvVertexArrayRange", Version = "1.1", EntryPoint = "glVertexArrayRangeNV")]
+            public static 
+            void VertexArrayRange<T1>(Int32 length, [InAttribute, OutAttribute] T1[] pointer)
                 where T1 : struct
             {
                 #if DEBUG
@@ -132252,7 +132242,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "NvVertexArrayRange", Version = "1.1", EntryPoint = "glVertexArrayRangeNV")]
             public static 
-            void VertexArrayRange<T1>(Int32 length, [InAttribute, OutAttribute] T1[] pointer)
+            void VertexArrayRange<T1>(Int32 length, [InAttribute, OutAttribute] T1[,,] pointer)
                 where T1 : struct
             {
                 #if DEBUG
@@ -132275,13 +132265,23 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "NvVertexArrayRange", Version = "1.1", EntryPoint = "glVertexArrayRangeNV")]
             public static 
-            void VertexArrayRange(Int32 length, IntPtr pointer)
+            void VertexArrayRange<T1>(Int32 length, [InAttribute, OutAttribute] ref T1 pointer)
+                where T1 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glVertexArrayRangeNV((Int32)length, (IntPtr)pointer);
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glVertexArrayRangeNV((Int32)length, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    pointer = (T1)pointer_ptr.Target;
+                }
+                finally
+                {
+                    pointer_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -132749,35 +132749,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib2dvNV")]
-            public static 
-            unsafe void VertexAttrib2(Int32 index, Double* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttrib2dvNV((UInt32)index, (Double*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -132862,7 +132833,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib2dvNV")]
             public static 
-            unsafe void VertexAttrib2(UInt32 index, Double* v)
+            unsafe void VertexAttrib2(Int32 index, Double* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -132945,6 +132916,35 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib2dvNV")]
+            public static 
+            unsafe void VertexAttrib2(UInt32 index, Double* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttrib2dvNV((UInt32)index, (Double*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -133002,6 +133002,40 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib2fvNV")]
+            public static 
+            void VertexAttrib2(Int32 index, Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glVertexAttrib2fvNV((UInt32)index, (Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -133078,9 +133112,10 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the new values to be used for the specified vertex attribute.
         /// </para>
         /// </param>
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib2fvNV")]
             public static 
-            void VertexAttrib2(Int32 index, Single[] v)
+            void VertexAttrib2(UInt32 index, Single[] v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -133162,41 +133197,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib2fvNV")]
-            public static 
-            void VertexAttrib2(UInt32 index, Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glVertexAttrib2fvNV((UInt32)index, (Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttrib2hNV")]
             public static 
             void VertexAttrib2h(Int32 index, OpenTK.Half x, OpenTK.Half y)
@@ -133226,21 +133226,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttrib2hvNV")]
-            public static 
-            unsafe void VertexAttrib2h(Int32 index, OpenTK.Half* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttrib2hvNV((UInt32)index, (OpenTK.Half*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttrib2hvNV")]
             public static 
             void VertexAttrib2h(Int32 index, OpenTK.Half[] v)
@@ -133284,7 +133269,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttrib2hvNV")]
             public static 
-            unsafe void VertexAttrib2h(UInt32 index, OpenTK.Half* v)
+            unsafe void VertexAttrib2h(Int32 index, OpenTK.Half* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -133338,6 +133323,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttrib2hvNV")]
+            public static 
+            unsafe void VertexAttrib2h(UInt32 index, OpenTK.Half* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttrib2hvNV((UInt32)index, (OpenTK.Half*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             
         /// <summary>
         /// Specifies the value of a generic vertex attribute
@@ -133396,35 +133396,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib2svNV")]
-            public static 
-            unsafe void VertexAttrib2(Int32 index, Int16* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttrib2svNV((UInt32)index, (Int16*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -133509,7 +133480,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib2svNV")]
             public static 
-            unsafe void VertexAttrib2(UInt32 index, Int16* v)
+            unsafe void VertexAttrib2(Int32 index, Int16* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -133592,6 +133563,35 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib2svNV")]
+            public static 
+            unsafe void VertexAttrib2(UInt32 index, Int16* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttrib2svNV((UInt32)index, (Int16*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -133649,35 +133649,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib3dvNV")]
-            public static 
-            unsafe void VertexAttrib3(Int32 index, Double* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttrib3dvNV((UInt32)index, (Double*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -133762,7 +133733,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib3dvNV")]
             public static 
-            unsafe void VertexAttrib3(UInt32 index, Double* v)
+            unsafe void VertexAttrib3(Int32 index, Double* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -133845,6 +133816,35 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib3dvNV")]
+            public static 
+            unsafe void VertexAttrib3(UInt32 index, Double* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttrib3dvNV((UInt32)index, (Double*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -133902,6 +133902,40 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib3fvNV")]
+            public static 
+            void VertexAttrib3(Int32 index, Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glVertexAttrib3fvNV((UInt32)index, (Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -133978,9 +134012,10 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the new values to be used for the specified vertex attribute.
         /// </para>
         /// </param>
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib3fvNV")]
             public static 
-            void VertexAttrib3(Int32 index, Single[] v)
+            void VertexAttrib3(UInt32 index, Single[] v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -134062,41 +134097,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib3fvNV")]
-            public static 
-            void VertexAttrib3(UInt32 index, Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glVertexAttrib3fvNV((UInt32)index, (Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttrib3hNV")]
             public static 
             void VertexAttrib3h(Int32 index, OpenTK.Half x, OpenTK.Half y, OpenTK.Half z)
@@ -134126,21 +134126,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttrib3hvNV")]
-            public static 
-            unsafe void VertexAttrib3h(Int32 index, OpenTK.Half* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttrib3hvNV((UInt32)index, (OpenTK.Half*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttrib3hvNV")]
             public static 
             void VertexAttrib3h(Int32 index, OpenTK.Half[] v)
@@ -134184,7 +134169,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttrib3hvNV")]
             public static 
-            unsafe void VertexAttrib3h(UInt32 index, OpenTK.Half* v)
+            unsafe void VertexAttrib3h(Int32 index, OpenTK.Half* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -134238,6 +134223,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttrib3hvNV")]
+            public static 
+            unsafe void VertexAttrib3h(UInt32 index, OpenTK.Half* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttrib3hvNV((UInt32)index, (OpenTK.Half*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             
         /// <summary>
         /// Specifies the value of a generic vertex attribute
@@ -134296,35 +134296,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib3svNV")]
-            public static 
-            unsafe void VertexAttrib3(Int32 index, Int16* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttrib3svNV((UInt32)index, (Int16*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -134409,7 +134380,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib3svNV")]
             public static 
-            unsafe void VertexAttrib3(UInt32 index, Int16* v)
+            unsafe void VertexAttrib3(Int32 index, Int16* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -134492,6 +134463,35 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib3svNV")]
+            public static 
+            unsafe void VertexAttrib3(UInt32 index, Int16* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttrib3svNV((UInt32)index, (Int16*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -134549,35 +134549,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib4dvNV")]
-            public static 
-            unsafe void VertexAttrib4(Int32 index, Double* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttrib4dvNV((UInt32)index, (Double*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -134662,7 +134633,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib4dvNV")]
             public static 
-            unsafe void VertexAttrib4(UInt32 index, Double* v)
+            unsafe void VertexAttrib4(Int32 index, Double* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -134745,6 +134716,35 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib4dvNV")]
+            public static 
+            unsafe void VertexAttrib4(UInt32 index, Double* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttrib4dvNV((UInt32)index, (Double*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -134802,6 +134802,40 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib4fvNV")]
+            public static 
+            void VertexAttrib4(Int32 index, Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glVertexAttrib4fvNV((UInt32)index, (Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -134878,9 +134912,10 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the new values to be used for the specified vertex attribute.
         /// </para>
         /// </param>
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib4fvNV")]
             public static 
-            void VertexAttrib4(Int32 index, Single[] v)
+            void VertexAttrib4(UInt32 index, Single[] v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -134962,41 +134997,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib4fvNV")]
-            public static 
-            void VertexAttrib4(UInt32 index, Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glVertexAttrib4fvNV((UInt32)index, (Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttrib4hNV")]
             public static 
             void VertexAttrib4h(Int32 index, OpenTK.Half x, OpenTK.Half y, OpenTK.Half z, OpenTK.Half w)
@@ -135026,21 +135026,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttrib4hvNV")]
-            public static 
-            unsafe void VertexAttrib4h(Int32 index, OpenTK.Half* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttrib4hvNV((UInt32)index, (OpenTK.Half*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttrib4hvNV")]
             public static 
             void VertexAttrib4h(Int32 index, OpenTK.Half[] v)
@@ -135084,7 +135069,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttrib4hvNV")]
             public static 
-            unsafe void VertexAttrib4h(UInt32 index, OpenTK.Half* v)
+            unsafe void VertexAttrib4h(Int32 index, OpenTK.Half* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -135138,6 +135123,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttrib4hvNV")]
+            public static 
+            unsafe void VertexAttrib4h(UInt32 index, OpenTK.Half* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttrib4hvNV((UInt32)index, (OpenTK.Half*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             
         /// <summary>
         /// Specifies the value of a generic vertex attribute
@@ -135196,35 +135196,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib4svNV")]
-            public static 
-            unsafe void VertexAttrib4(Int32 index, Int16* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttrib4svNV((UInt32)index, (Int16*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -135309,7 +135280,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib4svNV")]
             public static 
-            unsafe void VertexAttrib4(UInt32 index, Int16* v)
+            unsafe void VertexAttrib4(Int32 index, Int16* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -135392,6 +135363,35 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Specifies the value of a generic vertex attribute
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="v0">
+        /// <para>
+        /// Specifies the new values to be used for the specified vertex attribute.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib4svNV")]
+            public static 
+            unsafe void VertexAttrib4(UInt32 index, Int16* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttrib4svNV((UInt32)index, (Int16*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -135449,35 +135449,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Specifies the value of a generic vertex attribute
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="v0">
-        /// <para>
-        /// Specifies the new values to be used for the specified vertex attribute.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib4ubvNV")]
-            public static 
-            unsafe void VertexAttrib4(Int32 index, Byte* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttrib4ubvNV((UInt32)index, (Byte*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Specifies the value of a generic vertex attribute
         /// </summary>
@@ -135562,7 +135533,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib4ubvNV")]
             public static 
-            unsafe void VertexAttrib4(UInt32 index, Byte* v)
+            unsafe void VertexAttrib4(Int32 index, Byte* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -135646,57 +135617,28 @@ namespace OpenTK.Graphics.OpenGL
 
             
         /// <summary>
-        /// Define an array of generic vertex attribute data
+        /// Specifies the value of a generic vertex attribute
         /// </summary>
         /// <param name="index">
         /// <para>
         /// Specifies the index of the generic vertex attribute to be modified.
         /// </para>
         /// </param>
-        /// <param name="size">
+        /// <param name="v0">
         /// <para>
-        /// Specifies the number of components per generic vertex attribute. Must be 1, 2, 3, or 4. The initial value is 4.
+        /// Specifies the new values to be used for the specified vertex attribute.
         /// </para>
         /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the data type of each component in the array. Symbolic constants GL_BYTE, GL_UNSIGNED_BYTE, GL_SHORT, GL_UNSIGNED_SHORT, GL_INT, GL_UNSIGNED_INT, GL_FLOAT, or GL_DOUBLE are accepted. The initial value is GL_FLOAT.
-        /// </para>
-        /// </param>
-        /// <param name="normalized">
-        /// <para>
-        /// Specifies whether fixed-point data values should be normalized (GL_TRUE) or converted directly as fixed-point values (GL_FALSE) when they are accessed.
-        /// </para>
-        /// </param>
-        /// <param name="stride">
-        /// <para>
-        /// Specifies the byte offset between consecutive generic vertex attributes. If stride is 0, the generic vertex attributes are understood to be tightly packed in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-        /// <param name="pointer">
-        /// <para>
-        /// Specifies a pointer to the first component of the first generic vertex attribute in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribPointerNV")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttrib4ubvNV")]
             public static 
-            void VertexAttribPointer<T4>(Int32 index, Int32 fsize, OpenTK.Graphics.OpenGL.VertexAttribParameterArb type, Int32 stride, [InAttribute, OutAttribute] ref T4 pointer)
-                where T4 : struct
+            unsafe void VertexAttrib4(UInt32 index, Byte* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glVertexAttribPointerNV((UInt32)index, (Int32)fsize, (OpenTK.Graphics.OpenGL.VertexAttribParameterArb)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                    pointer = (T4)pointer_ptr.Target;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
+                Delegates.glVertexAttrib4ubvNV((UInt32)index, (Byte*)v);
                 #if DEBUG
                 }
                 #endif
@@ -135738,7 +135680,55 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribPointerNV")]
             public static 
-            void VertexAttribPointer<T4>(Int32 index, Int32 fsize, OpenTK.Graphics.OpenGL.VertexAttribParameterArb type, Int32 stride, [InAttribute, OutAttribute] T4[,,] pointer)
+            void VertexAttribPointer(Int32 index, Int32 fsize, OpenTK.Graphics.OpenGL.VertexAttribParameterArb type, Int32 stride, IntPtr pointer)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttribPointerNV((UInt32)index, (Int32)fsize, (OpenTK.Graphics.OpenGL.VertexAttribParameterArb)type, (Int32)stride, (IntPtr)pointer);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Define an array of generic vertex attribute data
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="size">
+        /// <para>
+        /// Specifies the number of components per generic vertex attribute. Must be 1, 2, 3, or 4. The initial value is 4.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the data type of each component in the array. Symbolic constants GL_BYTE, GL_UNSIGNED_BYTE, GL_SHORT, GL_UNSIGNED_SHORT, GL_INT, GL_UNSIGNED_INT, GL_FLOAT, or GL_DOUBLE are accepted. The initial value is GL_FLOAT.
+        /// </para>
+        /// </param>
+        /// <param name="normalized">
+        /// <para>
+        /// Specifies whether fixed-point data values should be normalized (GL_TRUE) or converted directly as fixed-point values (GL_FALSE) when they are accessed.
+        /// </para>
+        /// </param>
+        /// <param name="stride">
+        /// <para>
+        /// Specifies the byte offset between consecutive generic vertex attributes. If stride is 0, the generic vertex attributes are understood to be tightly packed in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+        /// <param name="pointer">
+        /// <para>
+        /// Specifies a pointer to the first component of the first generic vertex attribute in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribPointerNV")]
+            public static 
+            void VertexAttribPointer<T4>(Int32 index, Int32 fsize, OpenTK.Graphics.OpenGL.VertexAttribParameterArb type, Int32 stride, [InAttribute, OutAttribute] T4[] pointer)
                 where T4 : struct
             {
                 #if DEBUG
@@ -135852,7 +135842,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribPointerNV")]
             public static 
-            void VertexAttribPointer<T4>(Int32 index, Int32 fsize, OpenTK.Graphics.OpenGL.VertexAttribParameterArb type, Int32 stride, [InAttribute, OutAttribute] T4[] pointer)
+            void VertexAttribPointer<T4>(Int32 index, Int32 fsize, OpenTK.Graphics.OpenGL.VertexAttribParameterArb type, Int32 stride, [InAttribute, OutAttribute] T4[,,] pointer)
                 where T4 : struct
             {
                 #if DEBUG
@@ -135909,56 +135899,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribPointerNV")]
             public static 
-            void VertexAttribPointer(Int32 index, Int32 fsize, OpenTK.Graphics.OpenGL.VertexAttribParameterArb type, Int32 stride, IntPtr pointer)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttribPointerNV((UInt32)index, (Int32)fsize, (OpenTK.Graphics.OpenGL.VertexAttribParameterArb)type, (Int32)stride, (IntPtr)pointer);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Define an array of generic vertex attribute data
-        /// </summary>
-        /// <param name="index">
-        /// <para>
-        /// Specifies the index of the generic vertex attribute to be modified.
-        /// </para>
-        /// </param>
-        /// <param name="size">
-        /// <para>
-        /// Specifies the number of components per generic vertex attribute. Must be 1, 2, 3, or 4. The initial value is 4.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// Specifies the data type of each component in the array. Symbolic constants GL_BYTE, GL_UNSIGNED_BYTE, GL_SHORT, GL_UNSIGNED_SHORT, GL_INT, GL_UNSIGNED_INT, GL_FLOAT, or GL_DOUBLE are accepted. The initial value is GL_FLOAT.
-        /// </para>
-        /// </param>
-        /// <param name="normalized">
-        /// <para>
-        /// Specifies whether fixed-point data values should be normalized (GL_TRUE) or converted directly as fixed-point values (GL_FALSE) when they are accessed.
-        /// </para>
-        /// </param>
-        /// <param name="stride">
-        /// <para>
-        /// Specifies the byte offset between consecutive generic vertex attributes. If stride is 0, the generic vertex attributes are understood to be tightly packed in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-        /// <param name="pointer">
-        /// <para>
-        /// Specifies a pointer to the first component of the first generic vertex attribute in the array. The initial value is 0.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribPointerNV")]
-            public static 
-            void VertexAttribPointer<T4>(UInt32 index, Int32 fsize, OpenTK.Graphics.OpenGL.VertexAttribParameterArb type, Int32 stride, [InAttribute, OutAttribute] ref T4 pointer)
+            void VertexAttribPointer<T4>(Int32 index, Int32 fsize, OpenTK.Graphics.OpenGL.VertexAttribParameterArb type, Int32 stride, [InAttribute, OutAttribute] ref T4 pointer)
                 where T4 : struct
             {
                 #if DEBUG
@@ -136017,7 +135958,56 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribPointerNV")]
             public static 
-            void VertexAttribPointer<T4>(UInt32 index, Int32 fsize, OpenTK.Graphics.OpenGL.VertexAttribParameterArb type, Int32 stride, [InAttribute, OutAttribute] T4[,,] pointer)
+            void VertexAttribPointer(UInt32 index, Int32 fsize, OpenTK.Graphics.OpenGL.VertexAttribParameterArb type, Int32 stride, IntPtr pointer)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttribPointerNV((UInt32)index, (Int32)fsize, (OpenTK.Graphics.OpenGL.VertexAttribParameterArb)type, (Int32)stride, (IntPtr)pointer);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Define an array of generic vertex attribute data
+        /// </summary>
+        /// <param name="index">
+        /// <para>
+        /// Specifies the index of the generic vertex attribute to be modified.
+        /// </para>
+        /// </param>
+        /// <param name="size">
+        /// <para>
+        /// Specifies the number of components per generic vertex attribute. Must be 1, 2, 3, or 4. The initial value is 4.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// Specifies the data type of each component in the array. Symbolic constants GL_BYTE, GL_UNSIGNED_BYTE, GL_SHORT, GL_UNSIGNED_SHORT, GL_INT, GL_UNSIGNED_INT, GL_FLOAT, or GL_DOUBLE are accepted. The initial value is GL_FLOAT.
+        /// </para>
+        /// </param>
+        /// <param name="normalized">
+        /// <para>
+        /// Specifies whether fixed-point data values should be normalized (GL_TRUE) or converted directly as fixed-point values (GL_FALSE) when they are accessed.
+        /// </para>
+        /// </param>
+        /// <param name="stride">
+        /// <para>
+        /// Specifies the byte offset between consecutive generic vertex attributes. If stride is 0, the generic vertex attributes are understood to be tightly packed in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+        /// <param name="pointer">
+        /// <para>
+        /// Specifies a pointer to the first component of the first generic vertex attribute in the array. The initial value is 0.
+        /// </para>
+        /// </param>
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribPointerNV")]
+            public static 
+            void VertexAttribPointer<T4>(UInt32 index, Int32 fsize, OpenTK.Graphics.OpenGL.VertexAttribParameterArb type, Int32 stride, [InAttribute, OutAttribute] T4[] pointer)
                 where T4 : struct
             {
                 #if DEBUG
@@ -136133,7 +136123,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribPointerNV")]
             public static 
-            void VertexAttribPointer<T4>(UInt32 index, Int32 fsize, OpenTK.Graphics.OpenGL.VertexAttribParameterArb type, Int32 stride, [InAttribute, OutAttribute] T4[] pointer)
+            void VertexAttribPointer<T4>(UInt32 index, Int32 fsize, OpenTK.Graphics.OpenGL.VertexAttribParameterArb type, Int32 stride, [InAttribute, OutAttribute] T4[,,] pointer)
                 where T4 : struct
             {
                 #if DEBUG
@@ -136191,28 +136181,23 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribPointerNV")]
             public static 
-            void VertexAttribPointer(UInt32 index, Int32 fsize, OpenTK.Graphics.OpenGL.VertexAttribParameterArb type, Int32 stride, IntPtr pointer)
+            void VertexAttribPointer<T4>(UInt32 index, Int32 fsize, OpenTK.Graphics.OpenGL.VertexAttribParameterArb type, Int32 stride, [InAttribute, OutAttribute] ref T4 pointer)
+                where T4 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glVertexAttribPointerNV((UInt32)index, (Int32)fsize, (OpenTK.Graphics.OpenGL.VertexAttribParameterArb)type, (Int32)stride, (IntPtr)pointer);
-                #if DEBUG
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glVertexAttribPointerNV((UInt32)index, (Int32)fsize, (OpenTK.Graphics.OpenGL.VertexAttribParameterArb)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    pointer = (T4)pointer_ptr.Target;
                 }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs1dvNV")]
-            public static 
-            unsafe void VertexAttribs1(Int32 index, Int32 count, Double* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                finally
                 {
-                #endif
-                Delegates.glVertexAttribs1dvNV((UInt32)index, (Int32)count, (Double*)v);
+                    pointer_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -136261,7 +136246,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs1dvNV")]
             public static 
-            unsafe void VertexAttribs1(UInt32 index, Int32 count, Double* v)
+            unsafe void VertexAttribs1(Int32 index, Int32 count, Double* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -136315,6 +136300,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs1dvNV")]
+            public static 
+            unsafe void VertexAttribs1(UInt32 index, Int32 count, Double* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttribs1dvNV((UInt32)index, (Int32)count, (Double*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs1fvNV")]
+            public static 
+            void VertexAttribs1(Int32 index, Int32 count, Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glVertexAttribs1fvNV((UInt32)index, (Int32)count, (Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs1fvNV")]
             public static 
             void VertexAttribs1(Int32 index, Int32 count, ref Single v)
@@ -136350,9 +136370,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs1fvNV")]
             public static 
-            void VertexAttribs1(Int32 index, Int32 count, Single[] v)
+            void VertexAttribs1(UInt32 index, Int32 count, Single[] v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -136406,42 +136427,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs1fvNV")]
-            public static 
-            void VertexAttribs1(UInt32 index, Int32 count, Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glVertexAttribs1fvNV((UInt32)index, (Int32)count, (Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttribs1hvNV")]
-            public static 
-            unsafe void VertexAttribs1h(Int32 index, Int32 n, OpenTK.Half* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttribs1hvNV((UInt32)index, (Int32)n, (OpenTK.Half*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttribs1hvNV")]
             public static 
             void VertexAttribs1h(Int32 index, Int32 n, OpenTK.Half[] v)
@@ -136485,7 +136470,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttribs1hvNV")]
             public static 
-            unsafe void VertexAttribs1h(UInt32 index, Int32 n, OpenTK.Half* v)
+            unsafe void VertexAttribs1h(Int32 index, Int32 n, OpenTK.Half* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -136540,15 +136525,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs1svNV")]
+            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttribs1hvNV")]
             public static 
-            unsafe void VertexAttribs1(Int32 index, Int32 count, Int16* v)
+            unsafe void VertexAttribs1h(UInt32 index, Int32 n, OpenTK.Half* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glVertexAttribs1svNV((UInt32)index, (Int32)count, (Int16*)v);
+                Delegates.glVertexAttribs1hvNV((UInt32)index, (Int32)n, (OpenTK.Half*)v);
                 #if DEBUG
                 }
                 #endif
@@ -136597,7 +136582,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs1svNV")]
             public static 
-            unsafe void VertexAttribs1(UInt32 index, Int32 count, Int16* v)
+            unsafe void VertexAttribs1(Int32 index, Int32 count, Int16* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -136652,15 +136637,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs2dvNV")]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs1svNV")]
             public static 
-            unsafe void VertexAttribs2(Int32 index, Int32 count, Double* v)
+            unsafe void VertexAttribs1(UInt32 index, Int32 count, Int16* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glVertexAttribs2dvNV((UInt32)index, (Int32)count, (Double*)v);
+                Delegates.glVertexAttribs1svNV((UInt32)index, (Int32)count, (Int16*)v);
                 #if DEBUG
                 }
                 #endif
@@ -136709,7 +136694,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs2dvNV")]
             public static 
-            unsafe void VertexAttribs2(UInt32 index, Int32 count, Double* v)
+            unsafe void VertexAttribs2(Int32 index, Int32 count, Double* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -136763,6 +136748,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs2dvNV")]
+            public static 
+            unsafe void VertexAttribs2(UInt32 index, Int32 count, Double* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttribs2dvNV((UInt32)index, (Int32)count, (Double*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs2fvNV")]
+            public static 
+            void VertexAttribs2(Int32 index, Int32 count, Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glVertexAttribs2fvNV((UInt32)index, (Int32)count, (Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs2fvNV")]
             public static 
             void VertexAttribs2(Int32 index, Int32 count, ref Single v)
@@ -136798,9 +136818,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs2fvNV")]
             public static 
-            void VertexAttribs2(Int32 index, Int32 count, Single[] v)
+            void VertexAttribs2(UInt32 index, Int32 count, Single[] v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -136854,42 +136875,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs2fvNV")]
-            public static 
-            void VertexAttribs2(UInt32 index, Int32 count, Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glVertexAttribs2fvNV((UInt32)index, (Int32)count, (Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttribs2hvNV")]
-            public static 
-            unsafe void VertexAttribs2h(Int32 index, Int32 n, OpenTK.Half* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttribs2hvNV((UInt32)index, (Int32)n, (OpenTK.Half*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttribs2hvNV")]
             public static 
             void VertexAttribs2h(Int32 index, Int32 n, OpenTK.Half[] v)
@@ -136933,7 +136918,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttribs2hvNV")]
             public static 
-            unsafe void VertexAttribs2h(UInt32 index, Int32 n, OpenTK.Half* v)
+            unsafe void VertexAttribs2h(Int32 index, Int32 n, OpenTK.Half* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -136988,15 +136973,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs2svNV")]
+            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttribs2hvNV")]
             public static 
-            unsafe void VertexAttribs2(Int32 index, Int32 count, Int16* v)
+            unsafe void VertexAttribs2h(UInt32 index, Int32 n, OpenTK.Half* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glVertexAttribs2svNV((UInt32)index, (Int32)count, (Int16*)v);
+                Delegates.glVertexAttribs2hvNV((UInt32)index, (Int32)n, (OpenTK.Half*)v);
                 #if DEBUG
                 }
                 #endif
@@ -137045,7 +137030,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs2svNV")]
             public static 
-            unsafe void VertexAttribs2(UInt32 index, Int32 count, Int16* v)
+            unsafe void VertexAttribs2(Int32 index, Int32 count, Int16* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -137100,15 +137085,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs3dvNV")]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs2svNV")]
             public static 
-            unsafe void VertexAttribs3(Int32 index, Int32 count, Double* v)
+            unsafe void VertexAttribs2(UInt32 index, Int32 count, Int16* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glVertexAttribs3dvNV((UInt32)index, (Int32)count, (Double*)v);
+                Delegates.glVertexAttribs2svNV((UInt32)index, (Int32)count, (Int16*)v);
                 #if DEBUG
                 }
                 #endif
@@ -137157,7 +137142,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs3dvNV")]
             public static 
-            unsafe void VertexAttribs3(UInt32 index, Int32 count, Double* v)
+            unsafe void VertexAttribs3(Int32 index, Int32 count, Double* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -137211,6 +137196,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs3dvNV")]
+            public static 
+            unsafe void VertexAttribs3(UInt32 index, Int32 count, Double* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttribs3dvNV((UInt32)index, (Int32)count, (Double*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs3fvNV")]
+            public static 
+            void VertexAttribs3(Int32 index, Int32 count, Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glVertexAttribs3fvNV((UInt32)index, (Int32)count, (Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs3fvNV")]
             public static 
             void VertexAttribs3(Int32 index, Int32 count, ref Single v)
@@ -137246,9 +137266,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs3fvNV")]
             public static 
-            void VertexAttribs3(Int32 index, Int32 count, Single[] v)
+            void VertexAttribs3(UInt32 index, Int32 count, Single[] v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -137302,42 +137323,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs3fvNV")]
-            public static 
-            void VertexAttribs3(UInt32 index, Int32 count, Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glVertexAttribs3fvNV((UInt32)index, (Int32)count, (Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttribs3hvNV")]
-            public static 
-            unsafe void VertexAttribs3h(Int32 index, Int32 n, OpenTK.Half* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttribs3hvNV((UInt32)index, (Int32)n, (OpenTK.Half*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttribs3hvNV")]
             public static 
             void VertexAttribs3h(Int32 index, Int32 n, OpenTK.Half[] v)
@@ -137381,7 +137366,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttribs3hvNV")]
             public static 
-            unsafe void VertexAttribs3h(UInt32 index, Int32 n, OpenTK.Half* v)
+            unsafe void VertexAttribs3h(Int32 index, Int32 n, OpenTK.Half* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -137436,15 +137421,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs3svNV")]
+            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttribs3hvNV")]
             public static 
-            unsafe void VertexAttribs3(Int32 index, Int32 count, Int16* v)
+            unsafe void VertexAttribs3h(UInt32 index, Int32 n, OpenTK.Half* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glVertexAttribs3svNV((UInt32)index, (Int32)count, (Int16*)v);
+                Delegates.glVertexAttribs3hvNV((UInt32)index, (Int32)n, (OpenTK.Half*)v);
                 #if DEBUG
                 }
                 #endif
@@ -137493,7 +137478,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs3svNV")]
             public static 
-            unsafe void VertexAttribs3(UInt32 index, Int32 count, Int16* v)
+            unsafe void VertexAttribs3(Int32 index, Int32 count, Int16* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -137548,15 +137533,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs4dvNV")]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs3svNV")]
             public static 
-            unsafe void VertexAttribs4(Int32 index, Int32 count, Double* v)
+            unsafe void VertexAttribs3(UInt32 index, Int32 count, Int16* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glVertexAttribs4dvNV((UInt32)index, (Int32)count, (Double*)v);
+                Delegates.glVertexAttribs3svNV((UInt32)index, (Int32)count, (Int16*)v);
                 #if DEBUG
                 }
                 #endif
@@ -137605,7 +137590,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs4dvNV")]
             public static 
-            unsafe void VertexAttribs4(UInt32 index, Int32 count, Double* v)
+            unsafe void VertexAttribs4(Int32 index, Int32 count, Double* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -137659,6 +137644,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs4dvNV")]
+            public static 
+            unsafe void VertexAttribs4(UInt32 index, Int32 count, Double* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttribs4dvNV((UInt32)index, (Int32)count, (Double*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs4fvNV")]
+            public static 
+            void VertexAttribs4(Int32 index, Int32 count, Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glVertexAttribs4fvNV((UInt32)index, (Int32)count, (Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs4fvNV")]
             public static 
             void VertexAttribs4(Int32 index, Int32 count, ref Single v)
@@ -137694,9 +137714,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs4fvNV")]
             public static 
-            void VertexAttribs4(Int32 index, Int32 count, Single[] v)
+            void VertexAttribs4(UInt32 index, Int32 count, Single[] v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -137750,42 +137771,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs4fvNV")]
-            public static 
-            void VertexAttribs4(UInt32 index, Int32 count, Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glVertexAttribs4fvNV((UInt32)index, (Int32)count, (Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttribs4hvNV")]
-            public static 
-            unsafe void VertexAttribs4h(Int32 index, Int32 n, OpenTK.Half* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glVertexAttribs4hvNV((UInt32)index, (Int32)n, (OpenTK.Half*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttribs4hvNV")]
             public static 
             void VertexAttribs4h(Int32 index, Int32 n, OpenTK.Half[] v)
@@ -137829,7 +137814,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttribs4hvNV")]
             public static 
-            unsafe void VertexAttribs4h(UInt32 index, Int32 n, OpenTK.Half* v)
+            unsafe void VertexAttribs4h(Int32 index, Int32 n, OpenTK.Half* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -137884,15 +137869,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs4svNV")]
+            [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexAttribs4hvNV")]
             public static 
-            unsafe void VertexAttribs4(Int32 index, Int32 count, Int16* v)
+            unsafe void VertexAttribs4h(UInt32 index, Int32 n, OpenTK.Half* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glVertexAttribs4svNV((UInt32)index, (Int32)count, (Int16*)v);
+                Delegates.glVertexAttribs4hvNV((UInt32)index, (Int32)n, (OpenTK.Half*)v);
                 #if DEBUG
                 }
                 #endif
@@ -137941,7 +137926,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs4svNV")]
             public static 
-            unsafe void VertexAttribs4(UInt32 index, Int32 count, Int16* v)
+            unsafe void VertexAttribs4(Int32 index, Int32 count, Int16* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -137996,15 +137981,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs4ubvNV")]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs4svNV")]
             public static 
-            unsafe void VertexAttribs4(Int32 index, Int32 count, Byte* v)
+            unsafe void VertexAttribs4(UInt32 index, Int32 count, Int16* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glVertexAttribs4ubvNV((UInt32)index, (Int32)count, (Byte*)v);
+                Delegates.glVertexAttribs4svNV((UInt32)index, (Int32)count, (Int16*)v);
                 #if DEBUG
                 }
                 #endif
@@ -138053,7 +138038,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs4ubvNV")]
             public static 
-            unsafe void VertexAttribs4(UInt32 index, Int32 count, Byte* v)
+            unsafe void VertexAttribs4(Int32 index, Int32 count, Byte* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -138107,6 +138092,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "NvVertexProgram", Version = "1.2", EntryPoint = "glVertexAttribs4ubvNV")]
+            public static 
+            unsafe void VertexAttribs4(UInt32 index, Int32 count, Byte* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glVertexAttribs4ubvNV((UInt32)index, (Int32)count, (Byte*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "NvHalfFloat", Version = "1.2", EntryPoint = "glVertexWeighthNV")]
             public static 
             void VertexWeighth(OpenTK.Half weight)
@@ -138173,6 +138173,45 @@ namespace OpenTK.Graphics.OpenGL
         public static partial class Sgi
         {
             
+        /// <summary>
+        /// Set color lookup table parameters
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The target color table. Must be GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, or GL_POST_COLOR_MATRIX_COLOR_TABLE.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// The symbolic name of a texture color lookup table parameter. Must be one of GL_COLOR_TABLE_SCALE or GL_COLOR_TABLE_BIAS.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// A pointer to an array where the values of the parameters are stored.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "SgiColorTable", Version = "1.0", EntryPoint = "glColorTableParameterfvSGI")]
+            public static 
+            void ColorTableParameter(OpenTK.Graphics.OpenGL.SgiColorTable target, OpenTK.Graphics.OpenGL.SgiColorTable pname, Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glColorTableParameterfvSGI((OpenTK.Graphics.OpenGL.SgiColorTable)target, (OpenTK.Graphics.OpenGL.SgiColorTable)pname, (Single*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Set color lookup table parameters
         /// </summary>
@@ -138246,79 +138285,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Set color lookup table parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The target color table. Must be GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, or GL_POST_COLOR_MATRIX_COLOR_TABLE.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// The symbolic name of a texture color lookup table parameter. Must be one of GL_COLOR_TABLE_SCALE or GL_COLOR_TABLE_BIAS.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// A pointer to an array where the values of the parameters are stored.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "SgiColorTable", Version = "1.0", EntryPoint = "glColorTableParameterfvSGI")]
-            public static 
-            void ColorTableParameter(OpenTK.Graphics.OpenGL.SgiColorTable target, OpenTK.Graphics.OpenGL.SgiColorTable pname, Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glColorTableParameterfvSGI((OpenTK.Graphics.OpenGL.SgiColorTable)target, (OpenTK.Graphics.OpenGL.SgiColorTable)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Set color lookup table parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The target color table. Must be GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, or GL_POST_COLOR_MATRIX_COLOR_TABLE.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// The symbolic name of a texture color lookup table parameter. Must be one of GL_COLOR_TABLE_SCALE or GL_COLOR_TABLE_BIAS.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// A pointer to an array where the values of the parameters are stored.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SgiColorTable", Version = "1.0", EntryPoint = "glColorTableParameterivSGI")]
-            public static 
-            unsafe void ColorTableParameter(OpenTK.Graphics.OpenGL.SgiColorTable target, OpenTK.Graphics.OpenGL.SgiColorTable pname, Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glColorTableParameterivSGI((OpenTK.Graphics.OpenGL.SgiColorTable)target, (OpenTK.Graphics.OpenGL.SgiColorTable)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Set color lookup table parameters
         /// </summary>
@@ -138398,57 +138364,33 @@ namespace OpenTK.Graphics.OpenGL
 
             
         /// <summary>
-        /// Define a color lookup table
+        /// Set color lookup table parameters
         /// </summary>
         /// <param name="target">
         /// <para>
-        /// Must be one of GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, GL_POST_COLOR_MATRIX_COLOR_TABLE, GL_PROXY_COLOR_TABLE, GL_PROXY_POST_CONVOLUTION_COLOR_TABLE, or GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE.
+        /// The target color table. Must be GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, or GL_POST_COLOR_MATRIX_COLOR_TABLE.
         /// </para>
         /// </param>
-        /// <param name="internalformat">
+        /// <param name="pname">
         /// <para>
-        /// The internal format of the color table. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, and GL_RGBA16.
+        /// The symbolic name of a texture color lookup table parameter. Must be one of GL_COLOR_TABLE_SCALE or GL_COLOR_TABLE_BIAS.
         /// </para>
         /// </param>
-        /// <param name="width">
+        /// <param name="params">
         /// <para>
-        /// The number of entries in the color lookup table specified by data.
+        /// A pointer to an array where the values of the parameters are stored.
         /// </para>
         /// </param>
-        /// <param name="format">
-        /// <para>
-        /// The format of the pixel data in data. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_RGB, GL_BGR, GL_RGBA, and GL_BGRA.
-        /// </para>
-        /// </param>
-        /// <param name="type">
-        /// <para>
-        /// The type of the pixel data in data. The allowable values are GL_UNSIGNED_BYTE, GL_BYTE, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
-        /// </para>
-        /// </param>
-        /// <param name="data">
-        /// <para>
-        /// Pointer to a one-dimensional array of pixel data that is processed to build the color table.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "SgiColorTable", Version = "1.0", EntryPoint = "glColorTableSGI")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SgiColorTable", Version = "1.0", EntryPoint = "glColorTableParameterivSGI")]
             public static 
-            void ColorTable<T5>(OpenTK.Graphics.OpenGL.SgiColorTable target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T5 table)
-                where T5 : struct
+            unsafe void ColorTableParameter(OpenTK.Graphics.OpenGL.SgiColorTable target, OpenTK.Graphics.OpenGL.SgiColorTable pname, Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle table_ptr = GCHandle.Alloc(table, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glColorTableSGI((OpenTK.Graphics.OpenGL.SgiColorTable)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)table_ptr.AddrOfPinnedObject());
-                    table = (T5)table_ptr.Target;
-                }
-                finally
-                {
-                    table_ptr.Free();
-                }
+                Delegates.glColorTableParameterivSGI((OpenTK.Graphics.OpenGL.SgiColorTable)target, (OpenTK.Graphics.OpenGL.SgiColorTable)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -138490,7 +138432,55 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "SgiColorTable", Version = "1.0", EntryPoint = "glColorTableSGI")]
             public static 
-            void ColorTable<T5>(OpenTK.Graphics.OpenGL.SgiColorTable target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[,,] table)
+            void ColorTable(OpenTK.Graphics.OpenGL.SgiColorTable target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr table)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glColorTableSGI((OpenTK.Graphics.OpenGL.SgiColorTable)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)table);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Define a color lookup table
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be one of GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, GL_POST_COLOR_MATRIX_COLOR_TABLE, GL_PROXY_COLOR_TABLE, GL_PROXY_POST_CONVOLUTION_COLOR_TABLE, or GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE.
+        /// </para>
+        /// </param>
+        /// <param name="internalformat">
+        /// <para>
+        /// The internal format of the color table. The allowable values are GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_ALPHA12, GL_ALPHA16, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, GL_LUMINANCE12, GL_LUMINANCE16, GL_LUMINANCE_ALPHA, GL_LUMINANCE4_ALPHA4, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12, GL_LUMINANCE16_ALPHA16, GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8, GL_INTENSITY12, GL_INTENSITY16, GL_R3_G3_B2, GL_RGB, GL_RGB4, GL_RGB5, GL_RGB8, GL_RGB10, GL_RGB12, GL_RGB16, GL_RGBA, GL_RGBA2, GL_RGBA4, GL_RGB5_A1, GL_RGBA8, GL_RGB10_A2, GL_RGBA12, and GL_RGBA16.
+        /// </para>
+        /// </param>
+        /// <param name="width">
+        /// <para>
+        /// The number of entries in the color lookup table specified by data.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// The format of the pixel data in data. The allowable values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_RGB, GL_BGR, GL_RGBA, and GL_BGRA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// The type of the pixel data in data. The allowable values are GL_UNSIGNED_BYTE, GL_BYTE, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV.
+        /// </para>
+        /// </param>
+        /// <param name="data">
+        /// <para>
+        /// Pointer to a one-dimensional array of pixel data that is processed to build the color table.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "SgiColorTable", Version = "1.0", EntryPoint = "glColorTableSGI")]
+            public static 
+            void ColorTable<T5>(OpenTK.Graphics.OpenGL.SgiColorTable target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[] table)
                 where T5 : struct
             {
                 #if DEBUG
@@ -138604,7 +138594,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "SgiColorTable", Version = "1.0", EntryPoint = "glColorTableSGI")]
             public static 
-            void ColorTable<T5>(OpenTK.Graphics.OpenGL.SgiColorTable target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[] table)
+            void ColorTable<T5>(OpenTK.Graphics.OpenGL.SgiColorTable target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T5[,,] table)
                 where T5 : struct
             {
                 #if DEBUG
@@ -138661,13 +138651,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "SgiColorTable", Version = "1.0", EntryPoint = "glColorTableSGI")]
             public static 
-            void ColorTable(OpenTK.Graphics.OpenGL.SgiColorTable target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr table)
+            void ColorTable<T5>(OpenTK.Graphics.OpenGL.SgiColorTable target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T5 table)
+                where T5 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glColorTableSGI((OpenTK.Graphics.OpenGL.SgiColorTable)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)table);
+                GCHandle table_ptr = GCHandle.Alloc(table, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glColorTableSGI((OpenTK.Graphics.OpenGL.SgiColorTable)target, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)table_ptr.AddrOfPinnedObject());
+                    table = (T5)table_ptr.Target;
+                }
+                finally
+                {
+                    table_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -138717,6 +138717,45 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
+        /// <summary>
+        /// Get color lookup table parameters
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// The target color table. Must be GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, GL_POST_COLOR_MATRIX_COLOR_TABLE, GL_PROXY_COLOR_TABLE, GL_PROXY_POST_CONVOLUTION_COLOR_TABLE, or GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE.
+        /// </para>
+        /// </param>
+        /// <param name="pname">
+        /// <para>
+        /// The symbolic name of a color lookup table parameter. Must be one of GL_COLOR_TABLE_BIAS, GL_COLOR_TABLE_SCALE, GL_COLOR_TABLE_FORMAT, GL_COLOR_TABLE_WIDTH, GL_COLOR_TABLE_RED_SIZE, GL_COLOR_TABLE_GREEN_SIZE, GL_COLOR_TABLE_BLUE_SIZE, GL_COLOR_TABLE_ALPHA_SIZE, GL_COLOR_TABLE_LUMINANCE_SIZE, or GL_COLOR_TABLE_INTENSITY_SIZE.
+        /// </para>
+        /// </param>
+        /// <param name="params">
+        /// <para>
+        /// A pointer to an array where the values of the parameter will be stored.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "SgiColorTable", Version = "1.0", EntryPoint = "glGetColorTableParameterfvSGI")]
+            public static 
+            void GetColorTableParameter(OpenTK.Graphics.OpenGL.SgiColorTable target, OpenTK.Graphics.OpenGL.SgiColorTable pname, [OutAttribute] Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glGetColorTableParameterfvSGI((OpenTK.Graphics.OpenGL.SgiColorTable)target, (OpenTK.Graphics.OpenGL.SgiColorTable)pname, (Single*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
         /// <summary>
         /// Get color lookup table parameters
         /// </summary>
@@ -138791,79 +138830,6 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             
-        /// <summary>
-        /// Get color lookup table parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The target color table. Must be GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, GL_POST_COLOR_MATRIX_COLOR_TABLE, GL_PROXY_COLOR_TABLE, GL_PROXY_POST_CONVOLUTION_COLOR_TABLE, or GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// The symbolic name of a color lookup table parameter. Must be one of GL_COLOR_TABLE_BIAS, GL_COLOR_TABLE_SCALE, GL_COLOR_TABLE_FORMAT, GL_COLOR_TABLE_WIDTH, GL_COLOR_TABLE_RED_SIZE, GL_COLOR_TABLE_GREEN_SIZE, GL_COLOR_TABLE_BLUE_SIZE, GL_COLOR_TABLE_ALPHA_SIZE, GL_COLOR_TABLE_LUMINANCE_SIZE, or GL_COLOR_TABLE_INTENSITY_SIZE.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// A pointer to an array where the values of the parameter will be stored.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "SgiColorTable", Version = "1.0", EntryPoint = "glGetColorTableParameterfvSGI")]
-            public static 
-            void GetColorTableParameter(OpenTK.Graphics.OpenGL.SgiColorTable target, OpenTK.Graphics.OpenGL.SgiColorTable pname, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetColorTableParameterfvSGI((OpenTK.Graphics.OpenGL.SgiColorTable)target, (OpenTK.Graphics.OpenGL.SgiColorTable)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
-        /// <summary>
-        /// Get color lookup table parameters
-        /// </summary>
-        /// <param name="target">
-        /// <para>
-        /// The target color table. Must be GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, GL_POST_COLOR_MATRIX_COLOR_TABLE, GL_PROXY_COLOR_TABLE, GL_PROXY_POST_CONVOLUTION_COLOR_TABLE, or GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE.
-        /// </para>
-        /// </param>
-        /// <param name="pname">
-        /// <para>
-        /// The symbolic name of a color lookup table parameter. Must be one of GL_COLOR_TABLE_BIAS, GL_COLOR_TABLE_SCALE, GL_COLOR_TABLE_FORMAT, GL_COLOR_TABLE_WIDTH, GL_COLOR_TABLE_RED_SIZE, GL_COLOR_TABLE_GREEN_SIZE, GL_COLOR_TABLE_BLUE_SIZE, GL_COLOR_TABLE_ALPHA_SIZE, GL_COLOR_TABLE_LUMINANCE_SIZE, or GL_COLOR_TABLE_INTENSITY_SIZE.
-        /// </para>
-        /// </param>
-        /// <param name="params">
-        /// <para>
-        /// A pointer to an array where the values of the parameter will be stored.
-        /// </para>
-        /// </param>
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SgiColorTable", Version = "1.0", EntryPoint = "glGetColorTableParameterivSGI")]
-            public static 
-            unsafe void GetColorTableParameter(OpenTK.Graphics.OpenGL.SgiColorTable target, OpenTK.Graphics.OpenGL.SgiColorTable pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetColorTableParameterivSGI((OpenTK.Graphics.OpenGL.SgiColorTable)target, (OpenTK.Graphics.OpenGL.SgiColorTable)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            
         /// <summary>
         /// Get color lookup table parameters
         /// </summary>
@@ -138944,47 +138910,33 @@ namespace OpenTK.Graphics.OpenGL
 
             
         /// <summary>
-        /// Retrieve contents of a color lookup table
+        /// Get color lookup table parameters
         /// </summary>
         /// <param name="target">
         /// <para>
-        /// Must be GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, or GL_POST_COLOR_MATRIX_COLOR_TABLE.
+        /// The target color table. Must be GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, GL_POST_COLOR_MATRIX_COLOR_TABLE, GL_PROXY_COLOR_TABLE, GL_PROXY_POST_CONVOLUTION_COLOR_TABLE, or GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE.
         /// </para>
         /// </param>
-        /// <param name="format">
+        /// <param name="pname">
         /// <para>
-        /// The format of the pixel data in table. The possible values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_RGB, GL_BGR, GL_RGBA, and GL_BGRA.
+        /// The symbolic name of a color lookup table parameter. Must be one of GL_COLOR_TABLE_BIAS, GL_COLOR_TABLE_SCALE, GL_COLOR_TABLE_FORMAT, GL_COLOR_TABLE_WIDTH, GL_COLOR_TABLE_RED_SIZE, GL_COLOR_TABLE_GREEN_SIZE, GL_COLOR_TABLE_BLUE_SIZE, GL_COLOR_TABLE_ALPHA_SIZE, GL_COLOR_TABLE_LUMINANCE_SIZE, or GL_COLOR_TABLE_INTENSITY_SIZE.
         /// </para>
         /// </param>
-        /// <param name="type">
+        /// <param name="params">
         /// <para>
-        /// The type of the pixel data in table. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// A pointer to an array where the values of the parameter will be stored.
         /// </para>
         /// </param>
-        /// <param name="table">
-        /// <para>
-        /// Pointer to a one-dimensional array of pixel data containing the contents of the color table.
-        /// </para>
-        /// </param>
-            [AutoGenerated(Category = "SgiColorTable", Version = "1.0", EntryPoint = "glGetColorTableSGI")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SgiColorTable", Version = "1.0", EntryPoint = "glGetColorTableParameterivSGI")]
             public static 
-            void GetColorTable<T3>(OpenTK.Graphics.OpenGL.SgiColorTable target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T3 table)
-                where T3 : struct
+            unsafe void GetColorTableParameter(OpenTK.Graphics.OpenGL.SgiColorTable target, OpenTK.Graphics.OpenGL.SgiColorTable pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle table_ptr = GCHandle.Alloc(table, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glGetColorTableSGI((OpenTK.Graphics.OpenGL.SgiColorTable)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)table_ptr.AddrOfPinnedObject());
-                    table = (T3)table_ptr.Target;
-                }
-                finally
-                {
-                    table_ptr.Free();
-                }
+                Delegates.glGetColorTableParameterivSGI((OpenTK.Graphics.OpenGL.SgiColorTable)target, (OpenTK.Graphics.OpenGL.SgiColorTable)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -139016,7 +138968,45 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "SgiColorTable", Version = "1.0", EntryPoint = "glGetColorTableSGI")]
             public static 
-            void GetColorTable<T3>(OpenTK.Graphics.OpenGL.SgiColorTable target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[,,] table)
+            void GetColorTable(OpenTK.Graphics.OpenGL.SgiColorTable target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr table)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetColorTableSGI((OpenTK.Graphics.OpenGL.SgiColorTable)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)table);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            
+        /// <summary>
+        /// Retrieve contents of a color lookup table
+        /// </summary>
+        /// <param name="target">
+        /// <para>
+        /// Must be GL_COLOR_TABLE, GL_POST_CONVOLUTION_COLOR_TABLE, or GL_POST_COLOR_MATRIX_COLOR_TABLE.
+        /// </para>
+        /// </param>
+        /// <param name="format">
+        /// <para>
+        /// The format of the pixel data in table. The possible values are GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_RGB, GL_BGR, GL_RGBA, and GL_BGRA.
+        /// </para>
+        /// </param>
+        /// <param name="type">
+        /// <para>
+        /// The type of the pixel data in table. Symbolic constants GL_UNSIGNED_BYTE, GL_BYTE, GL_BITMAP, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_BYTE_3_3_2, GL_UNSIGNED_BYTE_2_3_3_REV, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_5_6_5_REV, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_SHORT_4_4_4_4_REV, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV, GL_UNSIGNED_INT_8_8_8_8, GL_UNSIGNED_INT_8_8_8_8_REV, GL_UNSIGNED_INT_10_10_10_2, and GL_UNSIGNED_INT_2_10_10_10_REV are accepted.
+        /// </para>
+        /// </param>
+        /// <param name="table">
+        /// <para>
+        /// Pointer to a one-dimensional array of pixel data containing the contents of the color table.
+        /// </para>
+        /// </param>
+            [AutoGenerated(Category = "SgiColorTable", Version = "1.0", EntryPoint = "glGetColorTableSGI")]
+            public static 
+            void GetColorTable<T3>(OpenTK.Graphics.OpenGL.SgiColorTable target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[] table)
                 where T3 : struct
             {
                 #if DEBUG
@@ -139110,7 +139100,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "SgiColorTable", Version = "1.0", EntryPoint = "glGetColorTableSGI")]
             public static 
-            void GetColorTable<T3>(OpenTK.Graphics.OpenGL.SgiColorTable target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[] table)
+            void GetColorTable<T3>(OpenTK.Graphics.OpenGL.SgiColorTable target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[,,] table)
                 where T3 : struct
             {
                 #if DEBUG
@@ -139157,13 +139147,23 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
             [AutoGenerated(Category = "SgiColorTable", Version = "1.0", EntryPoint = "glGetColorTableSGI")]
             public static 
-            void GetColorTable(OpenTK.Graphics.OpenGL.SgiColorTable target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr table)
+            void GetColorTable<T3>(OpenTK.Graphics.OpenGL.SgiColorTable target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T3 table)
+                where T3 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glGetColorTableSGI((OpenTK.Graphics.OpenGL.SgiColorTable)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)table);
+                GCHandle table_ptr = GCHandle.Alloc(table, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glGetColorTableSGI((OpenTK.Graphics.OpenGL.SgiColorTable)target, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)table_ptr.AddrOfPinnedObject());
+                    table = (T3)table_ptr.Target;
+                }
+                finally
+                {
+                    table_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -139173,6 +139173,26 @@ namespace OpenTK.Graphics.OpenGL
 
         public static partial class Sgis
         {
+            [AutoGenerated(Category = "SgisDetailTexture", Version = "1.0", EntryPoint = "glDetailTexFuncSGIS")]
+            public static 
+            void DetailTexFunc(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 n, Single[] points)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* points_ptr = points)
+                    {
+                        Delegates.glDetailTexFuncSGIS((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)n, (Single*)points_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SgisDetailTexture", Version = "1.0", EntryPoint = "glDetailTexFuncSGIS")]
             public static 
             void DetailTexFunc(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 n, ref Single points)
@@ -139208,9 +139228,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "SgisDetailTexture", Version = "1.0", EntryPoint = "glDetailTexFuncSGIS")]
+            [AutoGenerated(Category = "SgisFogFunction", Version = "1.1", EntryPoint = "glFogFuncSGIS")]
             public static 
-            void DetailTexFunc(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 n, Single[] points)
+            void FogFunc(Int32 n, Single[] points)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -139220,7 +139240,7 @@ namespace OpenTK.Graphics.OpenGL
                 {
                     fixed (Single* points_ptr = points)
                     {
-                        Delegates.glDetailTexFuncSGIS((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)n, (Single*)points_ptr);
+                        Delegates.glFogFuncSGIS((Int32)n, (Single*)points_ptr);
                     }
                 }
                 #if DEBUG
@@ -139263,9 +139283,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "SgisFogFunction", Version = "1.1", EntryPoint = "glFogFuncSGIS")]
+            [AutoGenerated(Category = "SgisDetailTexture", Version = "1.0", EntryPoint = "glGetDetailTexFuncSGIS")]
             public static 
-            void FogFunc(Int32 n, Single[] points)
+            void GetDetailTexFunc(OpenTK.Graphics.OpenGL.TextureTarget target, [OutAttribute] Single[] points)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -139275,7 +139295,7 @@ namespace OpenTK.Graphics.OpenGL
                 {
                     fixed (Single* points_ptr = points)
                     {
-                        Delegates.glFogFuncSGIS((Int32)n, (Single*)points_ptr);
+                        Delegates.glGetDetailTexFuncSGIS((OpenTK.Graphics.OpenGL.TextureTarget)target, (Single*)points_ptr);
                     }
                 }
                 #if DEBUG
@@ -139319,9 +139339,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "SgisDetailTexture", Version = "1.0", EntryPoint = "glGetDetailTexFuncSGIS")]
+            [AutoGenerated(Category = "SgisFogFunction", Version = "1.1", EntryPoint = "glGetFogFuncSGIS")]
             public static 
-            void GetDetailTexFunc(OpenTK.Graphics.OpenGL.TextureTarget target, [OutAttribute] Single[] points)
+            void GetFogFunc([OutAttribute] Single[] points)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -139331,7 +139351,7 @@ namespace OpenTK.Graphics.OpenGL
                 {
                     fixed (Single* points_ptr = points)
                     {
-                        Delegates.glGetDetailTexFuncSGIS((OpenTK.Graphics.OpenGL.TextureTarget)target, (Single*)points_ptr);
+                        Delegates.glGetFogFuncSGIS((Single*)points_ptr);
                     }
                 }
                 #if DEBUG
@@ -139375,9 +139395,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "SgisFogFunction", Version = "1.1", EntryPoint = "glGetFogFuncSGIS")]
+            [AutoGenerated(Category = "SgisPixelTexture", Version = "1.0", EntryPoint = "glGetPixelTexGenParameterfvSGIS")]
             public static 
-            void GetFogFunc([OutAttribute] Single[] points)
+            void GetPixelTexGenParameter(OpenTK.Graphics.OpenGL.SgisPixelTexture pname, [OutAttribute] Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -139385,9 +139405,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
                 unsafe
                 {
-                    fixed (Single* points_ptr = points)
+                    fixed (Single* @params_ptr = @params)
                     {
-                        Delegates.glGetFogFuncSGIS((Single*)points_ptr);
+                        Delegates.glGetPixelTexGenParameterfvSGIS((OpenTK.Graphics.OpenGL.SgisPixelTexture)pname, (Single*)@params_ptr);
                     }
                 }
                 #if DEBUG
@@ -139431,41 +139451,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "SgisPixelTexture", Version = "1.0", EntryPoint = "glGetPixelTexGenParameterfvSGIS")]
-            public static 
-            void GetPixelTexGenParameter(OpenTK.Graphics.OpenGL.SgisPixelTexture pname, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetPixelTexGenParameterfvSGIS((OpenTK.Graphics.OpenGL.SgisPixelTexture)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SgisPixelTexture", Version = "1.0", EntryPoint = "glGetPixelTexGenParameterivSGIS")]
-            public static 
-            unsafe void GetPixelTexGenParameter(OpenTK.Graphics.OpenGL.SgisPixelTexture pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetPixelTexGenParameterivSGIS((OpenTK.Graphics.OpenGL.SgisPixelTexture)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SgisPixelTexture", Version = "1.0", EntryPoint = "glGetPixelTexGenParameterivSGIS")]
             public static 
             void GetPixelTexGenParameter(OpenTK.Graphics.OpenGL.SgisPixelTexture pname, [OutAttribute] Int32[] @params)
@@ -139507,6 +139492,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SgisPixelTexture", Version = "1.0", EntryPoint = "glGetPixelTexGenParameterivSGIS")]
+            public static 
+            unsafe void GetPixelTexGenParameter(OpenTK.Graphics.OpenGL.SgisPixelTexture pname, [OutAttribute] Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetPixelTexGenParameterivSGIS((OpenTK.Graphics.OpenGL.SgisPixelTexture)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "SgisSharpenTexture", Version = "1.0", EntryPoint = "glGetSharpenTexFuncSGIS")]
+            public static 
+            void GetSharpenTexFunc(OpenTK.Graphics.OpenGL.TextureTarget target, [OutAttribute] Single[] points)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* points_ptr = points)
+                    {
+                        Delegates.glGetSharpenTexFuncSGIS((OpenTK.Graphics.OpenGL.TextureTarget)target, (Single*)points_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SgisSharpenTexture", Version = "1.0", EntryPoint = "glGetSharpenTexFuncSGIS")]
             public static 
             void GetSharpenTexFunc(OpenTK.Graphics.OpenGL.TextureTarget target, [OutAttribute] out Single points)
@@ -139543,9 +139563,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "SgisSharpenTexture", Version = "1.0", EntryPoint = "glGetSharpenTexFuncSGIS")]
+            [AutoGenerated(Category = "SgisTextureFilter4", Version = "1.0", EntryPoint = "glGetTexFilterFuncSGIS")]
             public static 
-            void GetSharpenTexFunc(OpenTK.Graphics.OpenGL.TextureTarget target, [OutAttribute] Single[] points)
+            void GetTexFilterFunc(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.SgisTextureFilter4 filter, [OutAttribute] Single[] weights)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -139553,9 +139573,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
                 unsafe
                 {
-                    fixed (Single* points_ptr = points)
+                    fixed (Single* weights_ptr = weights)
                     {
-                        Delegates.glGetSharpenTexFuncSGIS((OpenTK.Graphics.OpenGL.TextureTarget)target, (Single*)points_ptr);
+                        Delegates.glGetTexFilterFuncSGIS((OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.SgisTextureFilter4)filter, (Single*)weights_ptr);
                     }
                 }
                 #if DEBUG
@@ -139599,26 +139619,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "SgisTextureFilter4", Version = "1.0", EntryPoint = "glGetTexFilterFuncSGIS")]
-            public static 
-            void GetTexFilterFunc(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.SgisTextureFilter4 filter, [OutAttribute] Single[] weights)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* weights_ptr = weights)
-                    {
-                        Delegates.glGetTexFilterFuncSGIS((OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.SgisTextureFilter4)filter, (Single*)weights_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SgisPixelTexture", Version = "1.0", EntryPoint = "glPixelTexGenParameterfSGIS")]
             public static 
             void PixelTexGenParameter(OpenTK.Graphics.OpenGL.SgisPixelTexture pname, Single param)
@@ -139633,21 +139633,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SgisPixelTexture", Version = "1.0", EntryPoint = "glPixelTexGenParameterfvSGIS")]
-            public static 
-            unsafe void PixelTexGenParameter(OpenTK.Graphics.OpenGL.SgisPixelTexture pname, Single* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glPixelTexGenParameterfvSGIS((OpenTK.Graphics.OpenGL.SgisPixelTexture)pname, (Single*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SgisPixelTexture", Version = "1.0", EntryPoint = "glPixelTexGenParameterfvSGIS")]
             public static 
             void PixelTexGenParameter(OpenTK.Graphics.OpenGL.SgisPixelTexture pname, Single[] @params)
@@ -139668,6 +139653,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SgisPixelTexture", Version = "1.0", EntryPoint = "glPixelTexGenParameterfvSGIS")]
+            public static 
+            unsafe void PixelTexGenParameter(OpenTK.Graphics.OpenGL.SgisPixelTexture pname, Single* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glPixelTexGenParameterfvSGIS((OpenTK.Graphics.OpenGL.SgisPixelTexture)pname, (Single*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SgisPixelTexture", Version = "1.0", EntryPoint = "glPixelTexGenParameteriSGIS")]
             public static 
             void PixelTexGenParameter(OpenTK.Graphics.OpenGL.SgisPixelTexture pname, Int32 param)
@@ -139682,21 +139682,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SgisPixelTexture", Version = "1.0", EntryPoint = "glPixelTexGenParameterivSGIS")]
-            public static 
-            unsafe void PixelTexGenParameter(OpenTK.Graphics.OpenGL.SgisPixelTexture pname, Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glPixelTexGenParameterivSGIS((OpenTK.Graphics.OpenGL.SgisPixelTexture)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SgisPixelTexture", Version = "1.0", EntryPoint = "glPixelTexGenParameterivSGIS")]
             public static 
             void PixelTexGenParameter(OpenTK.Graphics.OpenGL.SgisPixelTexture pname, Int32[] @params)
@@ -139717,6 +139702,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SgisPixelTexture", Version = "1.0", EntryPoint = "glPixelTexGenParameterivSGIS")]
+            public static 
+            unsafe void PixelTexGenParameter(OpenTK.Graphics.OpenGL.SgisPixelTexture pname, Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glPixelTexGenParameterivSGIS((OpenTK.Graphics.OpenGL.SgisPixelTexture)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             
         /// <summary>
         /// Specify point parameters
@@ -139759,16 +139759,21 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the value that pname will be set to.
         /// </para>
         /// </param>
-            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SgisPointParameters", Version = "1.0", EntryPoint = "glPointParameterfvSGIS")]
             public static 
-            unsafe void PointParameter(OpenTK.Graphics.OpenGL.SgisPointParameters pname, Single* @params)
+            void PointParameter(OpenTK.Graphics.OpenGL.SgisPointParameters pname, Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glPointParameterfvSGIS((OpenTK.Graphics.OpenGL.SgisPointParameters)pname, (Single*)@params);
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glPointParameterfvSGIS((OpenTK.Graphics.OpenGL.SgisPointParameters)pname, (Single*)@params_ptr);
+                    }
+                }
                 #if DEBUG
                 }
                 #endif
@@ -139788,21 +139793,16 @@ namespace OpenTK.Graphics.OpenGL
         /// Specifies the value that pname will be set to.
         /// </para>
         /// </param>
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SgisPointParameters", Version = "1.0", EntryPoint = "glPointParameterfvSGIS")]
             public static 
-            void PointParameter(OpenTK.Graphics.OpenGL.SgisPointParameters pname, Single[] @params)
+            unsafe void PointParameter(OpenTK.Graphics.OpenGL.SgisPointParameters pname, Single* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glPointParameterfvSGIS((OpenTK.Graphics.OpenGL.SgisPointParameters)pname, (Single*)@params_ptr);
-                    }
-                }
+                Delegates.glPointParameterfvSGIS((OpenTK.Graphics.OpenGL.SgisPointParameters)pname, (Single*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -139836,6 +139836,26 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "SgisSharpenTexture", Version = "1.0", EntryPoint = "glSharpenTexFuncSGIS")]
+            public static 
+            void SharpenTexFunc(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 n, Single[] points)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* points_ptr = points)
+                    {
+                        Delegates.glSharpenTexFuncSGIS((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)n, (Single*)points_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SgisSharpenTexture", Version = "1.0", EntryPoint = "glSharpenTexFuncSGIS")]
             public static 
             void SharpenTexFunc(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 n, ref Single points)
@@ -139871,9 +139891,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "SgisSharpenTexture", Version = "1.0", EntryPoint = "glSharpenTexFuncSGIS")]
+            [AutoGenerated(Category = "SgisTextureFilter4", Version = "1.0", EntryPoint = "glTexFilterFuncSGIS")]
             public static 
-            void SharpenTexFunc(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 n, Single[] points)
+            void TexFilterFunc(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.SgisTextureFilter4 filter, Int32 n, Single[] weights)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -139881,9 +139901,9 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
                 unsafe
                 {
-                    fixed (Single* points_ptr = points)
+                    fixed (Single* weights_ptr = weights)
                     {
-                        Delegates.glSharpenTexFuncSGIS((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)n, (Single*)points_ptr);
+                        Delegates.glTexFilterFuncSGIS((OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.SgisTextureFilter4)filter, (Int32)n, (Single*)weights_ptr);
                     }
                 }
                 #if DEBUG
@@ -139926,21 +139946,15 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "SgisTextureFilter4", Version = "1.0", EntryPoint = "glTexFilterFuncSGIS")]
+            [AutoGenerated(Category = "SgisTexture4D", Version = "1.0", EntryPoint = "glTexImage4DSGIS")]
             public static 
-            void TexFilterFunc(OpenTK.Graphics.OpenGL.TextureTarget target, OpenTK.Graphics.OpenGL.SgisTextureFilter4 filter, Int32 n, Single[] weights)
+            void TexImage4D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 size4d, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                unsafe
-                {
-                    fixed (Single* weights_ptr = weights)
-                    {
-                        Delegates.glTexFilterFuncSGIS((OpenTK.Graphics.OpenGL.TextureTarget)target, (OpenTK.Graphics.OpenGL.SgisTextureFilter4)filter, (Int32)n, (Single*)weights_ptr);
-                    }
-                }
+                Delegates.glTexImage4DSGIS((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)size4d, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
                 #if DEBUG
                 }
                 #endif
@@ -139948,31 +139962,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "SgisTexture4D", Version = "1.0", EntryPoint = "glTexImage4DSGIS")]
             public static 
-            void TexImage4D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 size4d, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T10 pixels)
-                where T10 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glTexImage4DSGIS((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)size4d, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                    pixels = (T10)pixels_ptr.Target;
-                }
-                finally
-                {
-                    pixels_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "SgisTexture4D", Version = "1.0", EntryPoint = "glTexImage4DSGIS")]
-            public static 
-            void TexImage4D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 size4d, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T10[,,] pixels)
+            void TexImage4D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 size4d, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T10[] pixels)
                 where T10 : struct
             {
                 #if DEBUG
@@ -140018,7 +140008,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "SgisTexture4D", Version = "1.0", EntryPoint = "glTexImage4DSGIS")]
             public static 
-            void TexImage4D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 size4d, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T10[] pixels)
+            void TexImage4D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 size4d, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T10[,,] pixels)
                 where T10 : struct
             {
                 #if DEBUG
@@ -140041,22 +140031,8 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "SgisTexture4D", Version = "1.0", EntryPoint = "glTexImage4DSGIS")]
             public static 
-            void TexImage4D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 size4d, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glTexImage4DSGIS((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)size4d, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "SgisTexture4D", Version = "1.0", EntryPoint = "glTexSubImage4DSGIS")]
-            public static 
-            void TexSubImage4D<T12>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 woffset, Int32 width, Int32 height, Int32 depth, Int32 size4d, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T12 pixels)
-                where T12 : struct
+            void TexImage4D<T10>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, Int32 depth, Int32 size4d, Int32 border, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T10 pixels)
+                where T10 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -140065,8 +140041,8 @@ namespace OpenTK.Graphics.OpenGL
                 GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
                 try
                 {
-                    Delegates.glTexSubImage4DSGIS((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)woffset, (Int32)width, (Int32)height, (Int32)depth, (Int32)size4d, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
-                    pixels = (T12)pixels_ptr.Target;
+                    Delegates.glTexImage4DSGIS((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (OpenTK.Graphics.OpenGL.PixelInternalFormat)internalformat, (Int32)width, (Int32)height, (Int32)depth, (Int32)size4d, (Int32)border, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    pixels = (T10)pixels_ptr.Target;
                 }
                 finally
                 {
@@ -140079,7 +140055,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "SgisTexture4D", Version = "1.0", EntryPoint = "glTexSubImage4DSGIS")]
             public static 
-            void TexSubImage4D<T12>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 woffset, Int32 width, Int32 height, Int32 depth, Int32 size4d, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T12[,,] pixels)
+            void TexSubImage4D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 woffset, Int32 width, Int32 height, Int32 depth, Int32 size4d, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glTexSubImage4DSGIS((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)woffset, (Int32)width, (Int32)height, (Int32)depth, (Int32)size4d, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "SgisTexture4D", Version = "1.0", EntryPoint = "glTexSubImage4DSGIS")]
+            public static 
+            void TexSubImage4D<T12>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 woffset, Int32 width, Int32 height, Int32 depth, Int32 size4d, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T12[] pixels)
                 where T12 : struct
             {
                 #if DEBUG
@@ -140125,7 +140115,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "SgisTexture4D", Version = "1.0", EntryPoint = "glTexSubImage4DSGIS")]
             public static 
-            void TexSubImage4D<T12>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 woffset, Int32 width, Int32 height, Int32 depth, Int32 size4d, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T12[] pixels)
+            void TexSubImage4D<T12>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 woffset, Int32 width, Int32 height, Int32 depth, Int32 size4d, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T12[,,] pixels)
                 where T12 : struct
             {
                 #if DEBUG
@@ -140148,13 +140138,23 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "SgisTexture4D", Version = "1.0", EntryPoint = "glTexSubImage4DSGIS")]
             public static 
-            void TexSubImage4D(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 woffset, Int32 width, Int32 height, Int32 depth, Int32 size4d, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr pixels)
+            void TexSubImage4D<T12>(OpenTK.Graphics.OpenGL.TextureTarget target, Int32 level, Int32 xoffset, Int32 yoffset, Int32 zoffset, Int32 woffset, Int32 width, Int32 height, Int32 depth, Int32 size4d, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T12 pixels)
+                where T12 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glTexSubImage4DSGIS((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)woffset, (Int32)width, (Int32)height, (Int32)depth, (Int32)size4d, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels);
+                GCHandle pixels_ptr = GCHandle.Alloc(pixels, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glTexSubImage4DSGIS((OpenTK.Graphics.OpenGL.TextureTarget)target, (Int32)level, (Int32)xoffset, (Int32)yoffset, (Int32)zoffset, (Int32)woffset, (Int32)width, (Int32)height, (Int32)depth, (Int32)size4d, (OpenTK.Graphics.OpenGL.PixelFormat)format, (OpenTK.Graphics.OpenGL.PixelType)type, (IntPtr)pixels_ptr.AddrOfPinnedObject());
+                    pixels = (T12)pixels_ptr.Target;
+                }
+                finally
+                {
+                    pixels_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -140207,21 +140207,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SgixPolynomialFfd", Version = "1.0", EntryPoint = "glDeformationMap3dSGIX")]
-            public static 
-            unsafe void DeformationMap3(OpenTK.Graphics.OpenGL.SgixPolynomialFfd target, Double u1, Double u2, Int32 ustride, Int32 uorder, Double v1, Double v2, Int32 vstride, Int32 vorder, Double w1, Double w2, Int32 wstride, Int32 worder, Double* points)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glDeformationMap3dSGIX((OpenTK.Graphics.OpenGL.SgixPolynomialFfd)target, (Double)u1, (Double)u2, (Int32)ustride, (Int32)uorder, (Double)v1, (Double)v2, (Int32)vstride, (Int32)vorder, (Double)w1, (Double)w2, (Int32)wstride, (Int32)worder, (Double*)points);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SgixPolynomialFfd", Version = "1.0", EntryPoint = "glDeformationMap3dSGIX")]
             public static 
             void DeformationMap3(OpenTK.Graphics.OpenGL.SgixPolynomialFfd target, Double u1, Double u2, Int32 ustride, Int32 uorder, Double v1, Double v2, Int32 vstride, Int32 vorder, Double w1, Double w2, Int32 wstride, Int32 worder, Double[] points)
@@ -140262,6 +140247,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SgixPolynomialFfd", Version = "1.0", EntryPoint = "glDeformationMap3dSGIX")]
+            public static 
+            unsafe void DeformationMap3(OpenTK.Graphics.OpenGL.SgixPolynomialFfd target, Double u1, Double u2, Int32 ustride, Int32 uorder, Double v1, Double v2, Int32 vstride, Int32 vorder, Double w1, Double w2, Int32 wstride, Int32 worder, Double* points)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glDeformationMap3dSGIX((OpenTK.Graphics.OpenGL.SgixPolynomialFfd)target, (Double)u1, (Double)u2, (Int32)ustride, (Int32)uorder, (Double)v1, (Double)v2, (Int32)vstride, (Int32)vorder, (Double)w1, (Double)w2, (Int32)wstride, (Int32)worder, (Double*)points);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "SgixPolynomialFfd", Version = "1.0", EntryPoint = "glDeformationMap3fSGIX")]
+            public static 
+            void DeformationMap3(OpenTK.Graphics.OpenGL.SgixPolynomialFfd target, Single u1, Single u2, Int32 ustride, Int32 uorder, Single v1, Single v2, Int32 vstride, Int32 vorder, Single w1, Single w2, Int32 wstride, Int32 worder, Single[] points)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* points_ptr = points)
+                    {
+                        Delegates.glDeformationMap3fSGIX((OpenTK.Graphics.OpenGL.SgixPolynomialFfd)target, (Single)u1, (Single)u2, (Int32)ustride, (Int32)uorder, (Single)v1, (Single)v2, (Int32)vstride, (Int32)vorder, (Single)w1, (Single)w2, (Int32)wstride, (Int32)worder, (Single*)points_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SgixPolynomialFfd", Version = "1.0", EntryPoint = "glDeformationMap3fSGIX")]
             public static 
             void DeformationMap3(OpenTK.Graphics.OpenGL.SgixPolynomialFfd target, Single u1, Single u2, Int32 ustride, Int32 uorder, Single v1, Single v2, Int32 vstride, Int32 vorder, Single w1, Single w2, Int32 wstride, Int32 worder, ref Single points)
@@ -140297,26 +140317,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "SgixPolynomialFfd", Version = "1.0", EntryPoint = "glDeformationMap3fSGIX")]
-            public static 
-            void DeformationMap3(OpenTK.Graphics.OpenGL.SgixPolynomialFfd target, Single u1, Single u2, Int32 ustride, Int32 uorder, Single v1, Single v2, Int32 vstride, Int32 vorder, Single w1, Single w2, Int32 wstride, Int32 worder, Single[] points)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* points_ptr = points)
-                    {
-                        Delegates.glDeformationMap3fSGIX((OpenTK.Graphics.OpenGL.SgixPolynomialFfd)target, (Single)u1, (Single)u2, (Int32)ustride, (Int32)uorder, (Single)v1, (Single)v2, (Int32)vstride, (Int32)vorder, (Single)w1, (Single)w2, (Int32)wstride, (Int32)worder, (Single*)points_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SgixPolynomialFfd", Version = "1.0", EntryPoint = "glDeformSGIX")]
             public static 
             void Deform(Int32 mask)
@@ -140375,21 +140375,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SgixAsync", Version = "1.0", EntryPoint = "glFinishAsyncSGIX")]
-            public static 
-            unsafe Int32 FinishAsync([OutAttribute] Int32* markerp)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                return Delegates.glFinishAsyncSGIX((UInt32*)markerp);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SgixAsync", Version = "1.0", EntryPoint = "glFinishAsyncSGIX")]
             public static 
             Int32 FinishAsync([OutAttribute] out Int32 markerp)
@@ -140412,6 +140397,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SgixAsync", Version = "1.0", EntryPoint = "glFinishAsyncSGIX")]
+            public static 
+            unsafe Int32 FinishAsync([OutAttribute] Int32* markerp)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                return Delegates.glFinishAsyncSGIX((UInt32*)markerp);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SgixAsync", Version = "1.0", EntryPoint = "glFinishAsyncSGIX")]
             public static 
@@ -140492,21 +140492,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glFragmentLightfvSGIX")]
-            public static 
-            unsafe void FragmentLight(OpenTK.Graphics.OpenGL.SgixFragmentLighting light, OpenTK.Graphics.OpenGL.SgixFragmentLighting pname, Single* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glFragmentLightfvSGIX((OpenTK.Graphics.OpenGL.SgixFragmentLighting)light, (OpenTK.Graphics.OpenGL.SgixFragmentLighting)pname, (Single*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glFragmentLightfvSGIX")]
             public static 
             void FragmentLight(OpenTK.Graphics.OpenGL.SgixFragmentLighting light, OpenTK.Graphics.OpenGL.SgixFragmentLighting pname, Single[] @params)
@@ -140527,6 +140512,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glFragmentLightfvSGIX")]
+            public static 
+            unsafe void FragmentLight(OpenTK.Graphics.OpenGL.SgixFragmentLighting light, OpenTK.Graphics.OpenGL.SgixFragmentLighting pname, Single* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glFragmentLightfvSGIX((OpenTK.Graphics.OpenGL.SgixFragmentLighting)light, (OpenTK.Graphics.OpenGL.SgixFragmentLighting)pname, (Single*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glFragmentLightiSGIX")]
             public static 
             void FragmentLight(OpenTK.Graphics.OpenGL.SgixFragmentLighting light, OpenTK.Graphics.OpenGL.SgixFragmentLighting pname, Int32 param)
@@ -140541,21 +140541,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glFragmentLightivSGIX")]
-            public static 
-            unsafe void FragmentLight(OpenTK.Graphics.OpenGL.SgixFragmentLighting light, OpenTK.Graphics.OpenGL.SgixFragmentLighting pname, Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glFragmentLightivSGIX((OpenTK.Graphics.OpenGL.SgixFragmentLighting)light, (OpenTK.Graphics.OpenGL.SgixFragmentLighting)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glFragmentLightivSGIX")]
             public static 
             void FragmentLight(OpenTK.Graphics.OpenGL.SgixFragmentLighting light, OpenTK.Graphics.OpenGL.SgixFragmentLighting pname, Int32[] @params)
@@ -140576,6 +140561,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glFragmentLightivSGIX")]
+            public static 
+            unsafe void FragmentLight(OpenTK.Graphics.OpenGL.SgixFragmentLighting light, OpenTK.Graphics.OpenGL.SgixFragmentLighting pname, Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glFragmentLightivSGIX((OpenTK.Graphics.OpenGL.SgixFragmentLighting)light, (OpenTK.Graphics.OpenGL.SgixFragmentLighting)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glFragmentLightModelfSGIX")]
             public static 
             void FragmentLightModel(OpenTK.Graphics.OpenGL.SgixFragmentLighting pname, Single param)
@@ -140590,21 +140590,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glFragmentLightModelfvSGIX")]
-            public static 
-            unsafe void FragmentLightModel(OpenTK.Graphics.OpenGL.SgixFragmentLighting pname, Single* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glFragmentLightModelfvSGIX((OpenTK.Graphics.OpenGL.SgixFragmentLighting)pname, (Single*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glFragmentLightModelfvSGIX")]
             public static 
             void FragmentLightModel(OpenTK.Graphics.OpenGL.SgixFragmentLighting pname, Single[] @params)
@@ -140625,6 +140610,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glFragmentLightModelfvSGIX")]
+            public static 
+            unsafe void FragmentLightModel(OpenTK.Graphics.OpenGL.SgixFragmentLighting pname, Single* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glFragmentLightModelfvSGIX((OpenTK.Graphics.OpenGL.SgixFragmentLighting)pname, (Single*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glFragmentLightModeliSGIX")]
             public static 
             void FragmentLightModel(OpenTK.Graphics.OpenGL.SgixFragmentLighting pname, Int32 param)
@@ -140639,21 +140639,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glFragmentLightModelivSGIX")]
-            public static 
-            unsafe void FragmentLightModel(OpenTK.Graphics.OpenGL.SgixFragmentLighting pname, Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glFragmentLightModelivSGIX((OpenTK.Graphics.OpenGL.SgixFragmentLighting)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glFragmentLightModelivSGIX")]
             public static 
             void FragmentLightModel(OpenTK.Graphics.OpenGL.SgixFragmentLighting pname, Int32[] @params)
@@ -140674,6 +140659,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glFragmentLightModelivSGIX")]
+            public static 
+            unsafe void FragmentLightModel(OpenTK.Graphics.OpenGL.SgixFragmentLighting pname, Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glFragmentLightModelivSGIX((OpenTK.Graphics.OpenGL.SgixFragmentLighting)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glFragmentMaterialfSGIX")]
             public static 
             void FragmentMaterial(OpenTK.Graphics.OpenGL.MaterialFace face, OpenTK.Graphics.OpenGL.MaterialParameter pname, Single param)
@@ -140688,21 +140688,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glFragmentMaterialfvSGIX")]
-            public static 
-            unsafe void FragmentMaterial(OpenTK.Graphics.OpenGL.MaterialFace face, OpenTK.Graphics.OpenGL.MaterialParameter pname, Single* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glFragmentMaterialfvSGIX((OpenTK.Graphics.OpenGL.MaterialFace)face, (OpenTK.Graphics.OpenGL.MaterialParameter)pname, (Single*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glFragmentMaterialfvSGIX")]
             public static 
             void FragmentMaterial(OpenTK.Graphics.OpenGL.MaterialFace face, OpenTK.Graphics.OpenGL.MaterialParameter pname, Single[] @params)
@@ -140723,6 +140708,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glFragmentMaterialfvSGIX")]
+            public static 
+            unsafe void FragmentMaterial(OpenTK.Graphics.OpenGL.MaterialFace face, OpenTK.Graphics.OpenGL.MaterialParameter pname, Single* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glFragmentMaterialfvSGIX((OpenTK.Graphics.OpenGL.MaterialFace)face, (OpenTK.Graphics.OpenGL.MaterialParameter)pname, (Single*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glFragmentMaterialiSGIX")]
             public static 
             void FragmentMaterial(OpenTK.Graphics.OpenGL.MaterialFace face, OpenTK.Graphics.OpenGL.MaterialParameter pname, Int32 param)
@@ -140737,21 +140737,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glFragmentMaterialivSGIX")]
-            public static 
-            unsafe void FragmentMaterial(OpenTK.Graphics.OpenGL.MaterialFace face, OpenTK.Graphics.OpenGL.MaterialParameter pname, Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glFragmentMaterialivSGIX((OpenTK.Graphics.OpenGL.MaterialFace)face, (OpenTK.Graphics.OpenGL.MaterialParameter)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glFragmentMaterialivSGIX")]
             public static 
             void FragmentMaterial(OpenTK.Graphics.OpenGL.MaterialFace face, OpenTK.Graphics.OpenGL.MaterialParameter pname, Int32[] @params)
@@ -140772,6 +140757,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glFragmentMaterialivSGIX")]
+            public static 
+            unsafe void FragmentMaterial(OpenTK.Graphics.OpenGL.MaterialFace face, OpenTK.Graphics.OpenGL.MaterialParameter pname, Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glFragmentMaterialivSGIX((OpenTK.Graphics.OpenGL.MaterialFace)face, (OpenTK.Graphics.OpenGL.MaterialParameter)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SgixFramezoom", Version = "1.0", EntryPoint = "glFrameZoomSGIX")]
             public static 
             void FrameZoom(Int32 factor)
@@ -140800,6 +140800,26 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glGetFragmentLightfvSGIX")]
+            public static 
+            void GetFragmentLight(OpenTK.Graphics.OpenGL.SgixFragmentLighting light, OpenTK.Graphics.OpenGL.SgixFragmentLighting pname, [OutAttribute] Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glGetFragmentLightfvSGIX((OpenTK.Graphics.OpenGL.SgixFragmentLighting)light, (OpenTK.Graphics.OpenGL.SgixFragmentLighting)pname, (Single*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glGetFragmentLightfvSGIX")]
             public static 
             void GetFragmentLight(OpenTK.Graphics.OpenGL.SgixFragmentLighting light, OpenTK.Graphics.OpenGL.SgixFragmentLighting pname, [OutAttribute] out Single @params)
@@ -140836,41 +140856,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glGetFragmentLightfvSGIX")]
-            public static 
-            void GetFragmentLight(OpenTK.Graphics.OpenGL.SgixFragmentLighting light, OpenTK.Graphics.OpenGL.SgixFragmentLighting pname, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetFragmentLightfvSGIX((OpenTK.Graphics.OpenGL.SgixFragmentLighting)light, (OpenTK.Graphics.OpenGL.SgixFragmentLighting)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glGetFragmentLightivSGIX")]
-            public static 
-            unsafe void GetFragmentLight(OpenTK.Graphics.OpenGL.SgixFragmentLighting light, OpenTK.Graphics.OpenGL.SgixFragmentLighting pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetFragmentLightivSGIX((OpenTK.Graphics.OpenGL.SgixFragmentLighting)light, (OpenTK.Graphics.OpenGL.SgixFragmentLighting)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glGetFragmentLightivSGIX")]
             public static 
             void GetFragmentLight(OpenTK.Graphics.OpenGL.SgixFragmentLighting light, OpenTK.Graphics.OpenGL.SgixFragmentLighting pname, [OutAttribute] Int32[] @params)
@@ -140912,6 +140897,41 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glGetFragmentLightivSGIX")]
+            public static 
+            unsafe void GetFragmentLight(OpenTK.Graphics.OpenGL.SgixFragmentLighting light, OpenTK.Graphics.OpenGL.SgixFragmentLighting pname, [OutAttribute] Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetFragmentLightivSGIX((OpenTK.Graphics.OpenGL.SgixFragmentLighting)light, (OpenTK.Graphics.OpenGL.SgixFragmentLighting)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glGetFragmentMaterialfvSGIX")]
+            public static 
+            void GetFragmentMaterial(OpenTK.Graphics.OpenGL.MaterialFace face, OpenTK.Graphics.OpenGL.MaterialParameter pname, [OutAttribute] Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glGetFragmentMaterialfvSGIX((OpenTK.Graphics.OpenGL.MaterialFace)face, (OpenTK.Graphics.OpenGL.MaterialParameter)pname, (Single*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glGetFragmentMaterialfvSGIX")]
             public static 
             void GetFragmentMaterial(OpenTK.Graphics.OpenGL.MaterialFace face, OpenTK.Graphics.OpenGL.MaterialParameter pname, [OutAttribute] out Single @params)
@@ -140948,41 +140968,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glGetFragmentMaterialfvSGIX")]
-            public static 
-            void GetFragmentMaterial(OpenTK.Graphics.OpenGL.MaterialFace face, OpenTK.Graphics.OpenGL.MaterialParameter pname, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetFragmentMaterialfvSGIX((OpenTK.Graphics.OpenGL.MaterialFace)face, (OpenTK.Graphics.OpenGL.MaterialParameter)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glGetFragmentMaterialivSGIX")]
-            public static 
-            unsafe void GetFragmentMaterial(OpenTK.Graphics.OpenGL.MaterialFace face, OpenTK.Graphics.OpenGL.MaterialParameter pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetFragmentMaterialivSGIX((OpenTK.Graphics.OpenGL.MaterialFace)face, (OpenTK.Graphics.OpenGL.MaterialParameter)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glGetFragmentMaterialivSGIX")]
             public static 
             void GetFragmentMaterial(OpenTK.Graphics.OpenGL.MaterialFace face, OpenTK.Graphics.OpenGL.MaterialParameter pname, [OutAttribute] Int32[] @params)
@@ -141024,6 +141009,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SgixFragmentLighting", Version = "1.0", EntryPoint = "glGetFragmentMaterialivSGIX")]
+            public static 
+            unsafe void GetFragmentMaterial(OpenTK.Graphics.OpenGL.MaterialFace face, OpenTK.Graphics.OpenGL.MaterialParameter pname, [OutAttribute] Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glGetFragmentMaterialivSGIX((OpenTK.Graphics.OpenGL.MaterialFace)face, (OpenTK.Graphics.OpenGL.MaterialParameter)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SgixInstruments", Version = "1.0", EntryPoint = "glGetInstrumentsSGIX")]
             public static 
             Int32 GetInstruments()
@@ -141038,6 +141038,26 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "SgixListPriority", Version = "1.0", EntryPoint = "glGetListParameterfvSGIX")]
+            public static 
+            void GetListParameter(Int32 list, OpenTK.Graphics.OpenGL.ListParameterName pname, [OutAttribute] Single[] @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* @params_ptr = @params)
+                    {
+                        Delegates.glGetListParameterfvSGIX((UInt32)list, (OpenTK.Graphics.OpenGL.ListParameterName)pname, (Single*)@params_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SgixListPriority", Version = "1.0", EntryPoint = "glGetListParameterfvSGIX")]
             public static 
             void GetListParameter(Int32 list, OpenTK.Graphics.OpenGL.ListParameterName pname, [OutAttribute] out Single @params)
@@ -141074,9 +141094,10 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SgixListPriority", Version = "1.0", EntryPoint = "glGetListParameterfvSGIX")]
             public static 
-            void GetListParameter(Int32 list, OpenTK.Graphics.OpenGL.ListParameterName pname, [OutAttribute] Single[] @params)
+            void GetListParameter(UInt32 list, OpenTK.Graphics.OpenGL.ListParameterName pname, [OutAttribute] Single[] @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -141131,42 +141152,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SgixListPriority", Version = "1.0", EntryPoint = "glGetListParameterfvSGIX")]
-            public static 
-            void GetListParameter(UInt32 list, OpenTK.Graphics.OpenGL.ListParameterName pname, [OutAttribute] Single[] @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* @params_ptr = @params)
-                    {
-                        Delegates.glGetListParameterfvSGIX((UInt32)list, (OpenTK.Graphics.OpenGL.ListParameterName)pname, (Single*)@params_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SgixListPriority", Version = "1.0", EntryPoint = "glGetListParameterivSGIX")]
-            public static 
-            unsafe void GetListParameter(Int32 list, OpenTK.Graphics.OpenGL.ListParameterName pname, [OutAttribute] Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glGetListParameterivSGIX((UInt32)list, (OpenTK.Graphics.OpenGL.ListParameterName)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SgixListPriority", Version = "1.0", EntryPoint = "glGetListParameterivSGIX")]
             public static 
             void GetListParameter(Int32 list, OpenTK.Graphics.OpenGL.ListParameterName pname, [OutAttribute] Int32[] @params)
@@ -141211,7 +141196,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SgixListPriority", Version = "1.0", EntryPoint = "glGetListParameterivSGIX")]
             public static 
-            unsafe void GetListParameter(UInt32 list, OpenTK.Graphics.OpenGL.ListParameterName pname, [OutAttribute] Int32* @params)
+            unsafe void GetListParameter(Int32 list, OpenTK.Graphics.OpenGL.ListParameterName pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -141266,25 +141251,16 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "SgixIglooInterface", Version = "1.0", EntryPoint = "glIglooInterfaceSGIX")]
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SgixListPriority", Version = "1.0", EntryPoint = "glGetListParameterivSGIX")]
             public static 
-            void IglooInterface<T1>(OpenTK.Graphics.OpenGL.All pname, [InAttribute, OutAttribute] ref T1 @params)
-                where T1 : struct
+            unsafe void GetListParameter(UInt32 list, OpenTK.Graphics.OpenGL.ListParameterName pname, [OutAttribute] Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                GCHandle @params_ptr = GCHandle.Alloc(@params, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glIglooInterfaceSGIX((OpenTK.Graphics.OpenGL.All)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
-                    @params = (T1)@params_ptr.Target;
-                }
-                finally
-                {
-                    @params_ptr.Free();
-                }
+                Delegates.glGetListParameterivSGIX((UInt32)list, (OpenTK.Graphics.OpenGL.ListParameterName)pname, (Int32*)@params);
                 #if DEBUG
                 }
                 #endif
@@ -141292,7 +141268,21 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "SgixIglooInterface", Version = "1.0", EntryPoint = "glIglooInterfaceSGIX")]
             public static 
-            void IglooInterface<T1>(OpenTK.Graphics.OpenGL.All pname, [InAttribute, OutAttribute] T1[,,] @params)
+            void IglooInterface(OpenTK.Graphics.OpenGL.All pname, IntPtr @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glIglooInterfaceSGIX((OpenTK.Graphics.OpenGL.All)pname, (IntPtr)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
+            [AutoGenerated(Category = "SgixIglooInterface", Version = "1.0", EntryPoint = "glIglooInterfaceSGIX")]
+            public static 
+            void IglooInterface<T1>(OpenTK.Graphics.OpenGL.All pname, [InAttribute, OutAttribute] T1[] @params)
                 where T1 : struct
             {
                 #if DEBUG
@@ -141338,7 +141328,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "SgixIglooInterface", Version = "1.0", EntryPoint = "glIglooInterfaceSGIX")]
             public static 
-            void IglooInterface<T1>(OpenTK.Graphics.OpenGL.All pname, [InAttribute, OutAttribute] T1[] @params)
+            void IglooInterface<T1>(OpenTK.Graphics.OpenGL.All pname, [InAttribute, OutAttribute] T1[,,] @params)
                 where T1 : struct
             {
                 #if DEBUG
@@ -141361,28 +141351,23 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "SgixIglooInterface", Version = "1.0", EntryPoint = "glIglooInterfaceSGIX")]
             public static 
-            void IglooInterface(OpenTK.Graphics.OpenGL.All pname, IntPtr @params)
+            void IglooInterface<T1>(OpenTK.Graphics.OpenGL.All pname, [InAttribute, OutAttribute] ref T1 @params)
+                where T1 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glIglooInterfaceSGIX((OpenTK.Graphics.OpenGL.All)pname, (IntPtr)@params);
-                #if DEBUG
+                GCHandle @params_ptr = GCHandle.Alloc(@params, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glIglooInterfaceSGIX((OpenTK.Graphics.OpenGL.All)pname, (IntPtr)@params_ptr.AddrOfPinnedObject());
+                    @params = (T1)@params_ptr.Target;
                 }
-                #endif
-            }
-
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SgixInstruments", Version = "1.0", EntryPoint = "glInstrumentsBufferSGIX")]
-            public static 
-            unsafe void InstrumentsBuffer(Int32 size, [OutAttribute] Int32* buffer)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                finally
                 {
-                #endif
-                Delegates.glInstrumentsBufferSGIX((Int32)size, (Int32*)buffer);
+                    @params_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -141429,6 +141414,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SgixInstruments", Version = "1.0", EntryPoint = "glInstrumentsBufferSGIX")]
+            public static 
+            unsafe void InstrumentsBuffer(Int32 size, [OutAttribute] Int32* buffer)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glInstrumentsBufferSGIX((Int32)size, (Int32*)buffer);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SgixAsync", Version = "1.0", EntryPoint = "glIsAsyncMarkerSGIX")]
             public static 
             bool IsAsyncMarker(Int32 marker)
@@ -141501,21 +141501,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SgixListPriority", Version = "1.0", EntryPoint = "glListParameterfvSGIX")]
-            public static 
-            unsafe void ListParameter(Int32 list, OpenTK.Graphics.OpenGL.ListParameterName pname, Single* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glListParameterfvSGIX((UInt32)list, (OpenTK.Graphics.OpenGL.ListParameterName)pname, (Single*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SgixListPriority", Version = "1.0", EntryPoint = "glListParameterfvSGIX")]
             public static 
             void ListParameter(Int32 list, OpenTK.Graphics.OpenGL.ListParameterName pname, Single[] @params)
@@ -141539,7 +141524,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SgixListPriority", Version = "1.0", EntryPoint = "glListParameterfvSGIX")]
             public static 
-            unsafe void ListParameter(UInt32 list, OpenTK.Graphics.OpenGL.ListParameterName pname, Single* @params)
+            unsafe void ListParameter(Int32 list, OpenTK.Graphics.OpenGL.ListParameterName pname, Single* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -141572,6 +141557,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SgixListPriority", Version = "1.0", EntryPoint = "glListParameterfvSGIX")]
+            public static 
+            unsafe void ListParameter(UInt32 list, OpenTK.Graphics.OpenGL.ListParameterName pname, Single* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glListParameterfvSGIX((UInt32)list, (OpenTK.Graphics.OpenGL.ListParameterName)pname, (Single*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SgixListPriority", Version = "1.0", EntryPoint = "glListParameteriSGIX")]
             public static 
             void ListParameter(Int32 list, OpenTK.Graphics.OpenGL.ListParameterName pname, Int32 param)
@@ -141601,21 +141601,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SgixListPriority", Version = "1.0", EntryPoint = "glListParameterivSGIX")]
-            public static 
-            unsafe void ListParameter(Int32 list, OpenTK.Graphics.OpenGL.ListParameterName pname, Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glListParameterivSGIX((UInt32)list, (OpenTK.Graphics.OpenGL.ListParameterName)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SgixListPriority", Version = "1.0", EntryPoint = "glListParameterivSGIX")]
             public static 
             void ListParameter(Int32 list, OpenTK.Graphics.OpenGL.ListParameterName pname, Int32[] @params)
@@ -141639,7 +141624,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SgixListPriority", Version = "1.0", EntryPoint = "glListParameterivSGIX")]
             public static 
-            unsafe void ListParameter(UInt32 list, OpenTK.Graphics.OpenGL.ListParameterName pname, Int32* @params)
+            unsafe void ListParameter(Int32 list, OpenTK.Graphics.OpenGL.ListParameterName pname, Int32* @params)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -141672,6 +141657,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SgixListPriority", Version = "1.0", EntryPoint = "glListParameterivSGIX")]
+            public static 
+            unsafe void ListParameter(UInt32 list, OpenTK.Graphics.OpenGL.ListParameterName pname, Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glListParameterivSGIX((UInt32)list, (OpenTK.Graphics.OpenGL.ListParameterName)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SgixPolynomialFfd", Version = "1.0", EntryPoint = "glLoadIdentityDeformationMapSGIX")]
             public static 
             void LoadIdentityDeformationMap(Int32 mask)
@@ -141715,21 +141715,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SgixAsync", Version = "1.0", EntryPoint = "glPollAsyncSGIX")]
-            public static 
-            unsafe Int32 PollAsync([OutAttribute] Int32* markerp)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                return Delegates.glPollAsyncSGIX((UInt32*)markerp);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SgixAsync", Version = "1.0", EntryPoint = "glPollAsyncSGIX")]
             public static 
             Int32 PollAsync([OutAttribute] out Int32 markerp)
@@ -141752,6 +141737,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SgixAsync", Version = "1.0", EntryPoint = "glPollAsyncSGIX")]
+            public static 
+            unsafe Int32 PollAsync([OutAttribute] Int32* markerp)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                return Delegates.glPollAsyncSGIX((UInt32*)markerp);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SgixAsync", Version = "1.0", EntryPoint = "glPollAsyncSGIX")]
             public static 
@@ -141790,21 +141790,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SgixInstruments", Version = "1.0", EntryPoint = "glPollInstrumentsSGIX")]
-            public static 
-            unsafe Int32 PollInstruments([OutAttribute] Int32* marker_p)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                return Delegates.glPollInstrumentsSGIX((Int32*)marker_p);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SgixInstruments", Version = "1.0", EntryPoint = "glPollInstrumentsSGIX")]
             public static 
             Int32 PollInstruments([OutAttribute] out Int32 marker_p)
@@ -141827,6 +141812,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SgixInstruments", Version = "1.0", EntryPoint = "glPollInstrumentsSGIX")]
+            public static 
+            unsafe Int32 PollInstruments([OutAttribute] Int32* marker_p)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                return Delegates.glPollInstrumentsSGIX((Int32*)marker_p);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SgixInstruments", Version = "1.0", EntryPoint = "glReadInstrumentsSGIX")]
             public static 
             void ReadInstruments(Int32 marker)
@@ -141841,21 +141841,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SgixReferencePlane", Version = "1.0", EntryPoint = "glReferencePlaneSGIX")]
-            public static 
-            unsafe void ReferencePlane(Double* equation)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glReferencePlaneSGIX((Double*)equation);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SgixReferencePlane", Version = "1.0", EntryPoint = "glReferencePlaneSGIX")]
             public static 
             void ReferencePlane(Double[] equation)
@@ -141896,6 +141881,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SgixReferencePlane", Version = "1.0", EntryPoint = "glReferencePlaneSGIX")]
+            public static 
+            unsafe void ReferencePlane(Double* equation)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glReferencePlaneSGIX((Double*)equation);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SgixSprite", Version = "1.0", EntryPoint = "glSpriteParameterfSGIX")]
             public static 
             void SpriteParameter(OpenTK.Graphics.OpenGL.SgixSprite pname, Single param)
@@ -141910,21 +141910,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SgixSprite", Version = "1.0", EntryPoint = "glSpriteParameterfvSGIX")]
-            public static 
-            unsafe void SpriteParameter(OpenTK.Graphics.OpenGL.SgixSprite pname, Single* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glSpriteParameterfvSGIX((OpenTK.Graphics.OpenGL.SgixSprite)pname, (Single*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SgixSprite", Version = "1.0", EntryPoint = "glSpriteParameterfvSGIX")]
             public static 
             void SpriteParameter(OpenTK.Graphics.OpenGL.SgixSprite pname, Single[] @params)
@@ -141945,6 +141930,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SgixSprite", Version = "1.0", EntryPoint = "glSpriteParameterfvSGIX")]
+            public static 
+            unsafe void SpriteParameter(OpenTK.Graphics.OpenGL.SgixSprite pname, Single* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glSpriteParameterfvSGIX((OpenTK.Graphics.OpenGL.SgixSprite)pname, (Single*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SgixSprite", Version = "1.0", EntryPoint = "glSpriteParameteriSGIX")]
             public static 
             void SpriteParameter(OpenTK.Graphics.OpenGL.SgixSprite pname, Int32 param)
@@ -141959,21 +141959,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SgixSprite", Version = "1.0", EntryPoint = "glSpriteParameterivSGIX")]
-            public static 
-            unsafe void SpriteParameter(OpenTK.Graphics.OpenGL.SgixSprite pname, Int32* @params)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glSpriteParameterivSGIX((OpenTK.Graphics.OpenGL.SgixSprite)pname, (Int32*)@params);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SgixSprite", Version = "1.0", EntryPoint = "glSpriteParameterivSGIX")]
             public static 
             void SpriteParameter(OpenTK.Graphics.OpenGL.SgixSprite pname, Int32[] @params)
@@ -141994,6 +141979,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SgixSprite", Version = "1.0", EntryPoint = "glSpriteParameterivSGIX")]
+            public static 
+            unsafe void SpriteParameter(OpenTK.Graphics.OpenGL.SgixSprite pname, Int32* @params)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glSpriteParameterivSGIX((OpenTK.Graphics.OpenGL.SgixSprite)pname, (Int32*)@params);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SgixInstruments", Version = "1.0", EntryPoint = "glStartInstrumentsSGIX")]
             public static 
             void StartInstruments()
@@ -142054,6 +142054,27 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glColor3fVertex3fvSUN")]
+            public static 
+            void Color3fVertex3(Single[] c, Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* c_ptr = c)
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glColor3fVertex3fvSUN((Single*)c_ptr, (Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glColor3fVertex3fvSUN")]
             public static 
             void Color3fVertex3(ref Single c, ref Single v)
@@ -142090,27 +142111,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glColor3fVertex3fvSUN")]
-            public static 
-            void Color3fVertex3(Single[] c, Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* c_ptr = c)
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glColor3fVertex3fvSUN((Single*)c_ptr, (Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glColor4fNormal3fVertex3fSUN")]
             public static 
             void Color4fNormal3fVertex3(Single r, Single g, Single b, Single a, Single nx, Single ny, Single nz, Single x, Single y, Single z)
@@ -142125,6 +142125,28 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glColor4fNormal3fVertex3fvSUN")]
+            public static 
+            void Color4fNormal3fVertex3(Single[] c, Single[] n, Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* c_ptr = c)
+                    fixed (Single* n_ptr = n)
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glColor4fNormal3fVertex3fvSUN((Single*)c_ptr, (Single*)n_ptr, (Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glColor4fNormal3fVertex3fvSUN")]
             public static 
             void Color4fNormal3fVertex3(ref Single c, ref Single n, ref Single v)
@@ -142162,28 +142184,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glColor4fNormal3fVertex3fvSUN")]
-            public static 
-            void Color4fNormal3fVertex3(Single[] c, Single[] n, Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* c_ptr = c)
-                    fixed (Single* n_ptr = n)
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glColor4fNormal3fVertex3fvSUN((Single*)c_ptr, (Single*)n_ptr, (Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glColor4ubVertex2fSUN")]
             public static 
             void Color4ubVertex2(Byte r, Byte g, Byte b, Byte a, Single x, Single y)
@@ -142198,21 +142198,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glColor4ubVertex2fvSUN")]
-            public static 
-            unsafe void Color4ubVertex2(Byte* c, Single* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glColor4ubVertex2fvSUN((Byte*)c, (Single*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glColor4ubVertex2fvSUN")]
             public static 
             void Color4ubVertex2(Byte[] c, Single[] v)
@@ -142255,6 +142240,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glColor4ubVertex2fvSUN")]
+            public static 
+            unsafe void Color4ubVertex2(Byte* c, Single* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glColor4ubVertex2fvSUN((Byte*)c, (Single*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glColor4ubVertex3fSUN")]
             public static 
             void Color4ubVertex3(Byte r, Byte g, Byte b, Byte a, Single x, Single y, Single z)
@@ -142269,21 +142269,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glColor4ubVertex3fvSUN")]
-            public static 
-            unsafe void Color4ubVertex3(Byte* c, Single* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glColor4ubVertex3fvSUN((Byte*)c, (Single*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glColor4ubVertex3fvSUN")]
             public static 
             void Color4ubVertex3(Byte[] c, Single[] v)
@@ -142326,6 +142311,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glColor4ubVertex3fvSUN")]
+            public static 
+            unsafe void Color4ubVertex3(Byte* c, Single* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glColor4ubVertex3fvSUN((Byte*)c, (Single*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SunMeshArray", Version = "1.1", EntryPoint = "glDrawMeshArraysSUN")]
             public static 
             void DrawMeshArrays(OpenTK.Graphics.OpenGL.BeginMode mode, Int32 first, Int32 count, Int32 width)
@@ -142483,6 +142483,27 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glNormal3fVertex3fvSUN")]
+            public static 
+            void Normal3fVertex3(Single[] n, Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* n_ptr = n)
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glNormal3fVertex3fvSUN((Single*)n_ptr, (Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glNormal3fVertex3fvSUN")]
             public static 
             void Normal3fVertex3(ref Single n, ref Single v)
@@ -142519,22 +142540,15 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glNormal3fVertex3fvSUN")]
+            [AutoGenerated(Category = "SunTriangleList", Version = "1.1", EntryPoint = "glReplacementCodePointerSUN")]
             public static 
-            void Normal3fVertex3(Single[] n, Single[] v)
+            void ReplacementCodePointer(OpenTK.Graphics.OpenGL.SunTriangleList type, Int32 stride, IntPtr pointer)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                unsafe
-                {
-                    fixed (Single* n_ptr = n)
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glNormal3fVertex3fvSUN((Single*)n_ptr, (Single*)v_ptr);
-                    }
-                }
+                Delegates.glReplacementCodePointerSUN((OpenTK.Graphics.OpenGL.SunTriangleList)type, (Int32)stride, (IntPtr)pointer);
                 #if DEBUG
                 }
                 #endif
@@ -142542,31 +142556,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "SunTriangleList", Version = "1.1", EntryPoint = "glReplacementCodePointerSUN")]
             public static 
-            void ReplacementCodePointer<T2>(OpenTK.Graphics.OpenGL.SunTriangleList type, Int32 stride, [InAttribute, OutAttribute] ref T2 pointer)
-                where T2 : struct
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
-                try
-                {
-                    Delegates.glReplacementCodePointerSUN((OpenTK.Graphics.OpenGL.SunTriangleList)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
-                    pointer = (T2)pointer_ptr.Target;
-                }
-                finally
-                {
-                    pointer_ptr.Free();
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
-            [AutoGenerated(Category = "SunTriangleList", Version = "1.1", EntryPoint = "glReplacementCodePointerSUN")]
-            public static 
-            void ReplacementCodePointer<T2>(OpenTK.Graphics.OpenGL.SunTriangleList type, Int32 stride, [InAttribute, OutAttribute] T2[,,] pointer)
+            void ReplacementCodePointer<T2>(OpenTK.Graphics.OpenGL.SunTriangleList type, Int32 stride, [InAttribute, OutAttribute] T2[] pointer)
                 where T2 : struct
             {
                 #if DEBUG
@@ -142612,7 +142602,7 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "SunTriangleList", Version = "1.1", EntryPoint = "glReplacementCodePointerSUN")]
             public static 
-            void ReplacementCodePointer<T2>(OpenTK.Graphics.OpenGL.SunTriangleList type, Int32 stride, [InAttribute, OutAttribute] T2[] pointer)
+            void ReplacementCodePointer<T2>(OpenTK.Graphics.OpenGL.SunTriangleList type, Int32 stride, [InAttribute, OutAttribute] T2[,,] pointer)
                 where T2 : struct
             {
                 #if DEBUG
@@ -142635,13 +142625,23 @@ namespace OpenTK.Graphics.OpenGL
 
             [AutoGenerated(Category = "SunTriangleList", Version = "1.1", EntryPoint = "glReplacementCodePointerSUN")]
             public static 
-            void ReplacementCodePointer(OpenTK.Graphics.OpenGL.SunTriangleList type, Int32 stride, IntPtr pointer)
+            void ReplacementCodePointer<T2>(OpenTK.Graphics.OpenGL.SunTriangleList type, Int32 stride, [InAttribute, OutAttribute] ref T2 pointer)
+                where T2 : struct
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glReplacementCodePointerSUN((OpenTK.Graphics.OpenGL.SunTriangleList)type, (Int32)stride, (IntPtr)pointer);
+                GCHandle pointer_ptr = GCHandle.Alloc(pointer, GCHandleType.Pinned);
+                try
+                {
+                    Delegates.glReplacementCodePointerSUN((OpenTK.Graphics.OpenGL.SunTriangleList)type, (Int32)stride, (IntPtr)pointer_ptr.AddrOfPinnedObject());
+                    pointer = (T2)pointer_ptr.Target;
+                }
+                finally
+                {
+                    pointer_ptr.Free();
+                }
                 #if DEBUG
                 }
                 #endif
@@ -142661,21 +142661,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SunTriangleList", Version = "1.1", EntryPoint = "glReplacementCodeubvSUN")]
-            public static 
-            unsafe void ReplacementCode(Byte* code)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glReplacementCodeubvSUN((Byte*)code);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SunTriangleList", Version = "1.1", EntryPoint = "glReplacementCodeubvSUN")]
             public static 
             void ReplacementCode(Byte[] code)
@@ -142696,6 +142681,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SunTriangleList", Version = "1.1", EntryPoint = "glReplacementCodeubvSUN")]
+            public static 
+            unsafe void ReplacementCode(Byte* code)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glReplacementCodeubvSUN((Byte*)code);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiColor3fVertex3fSUN")]
             public static 
             void ReplacementCodeuiColor3fVertex3(Int32 rc, Single r, Single g, Single b, Single x, Single y, Single z)
@@ -142725,16 +142725,23 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiColor3fVertex3fvSUN")]
             public static 
-            unsafe void ReplacementCodeuiColor3fVertex3(Int32* rc, Single* c, Single* v)
+            void ReplacementCodeuiColor3fVertex3(ref Int32 rc, ref Single c, ref Single v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glReplacementCodeuiColor3fVertex3fvSUN((UInt32*)rc, (Single*)c, (Single*)v);
+                unsafe
+                {
+                    fixed (Int32* rc_ptr = &rc)
+                    fixed (Single* c_ptr = &c)
+                    fixed (Single* v_ptr = &v)
+                    {
+                        Delegates.glReplacementCodeuiColor3fVertex3fvSUN((UInt32*)rc_ptr, (Single*)c_ptr, (Single*)v_ptr);
+                    }
+                }
                 #if DEBUG
                 }
                 #endif
@@ -142759,23 +142766,16 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiColor3fVertex3fvSUN")]
             public static 
-            void ReplacementCodeuiColor3fVertex3(ref Int32 rc, ref Single c, ref Single v)
+            unsafe void ReplacementCodeuiColor3fVertex3(Int32* rc, Single* c, Single* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                unsafe
-                {
-                    fixed (Int32* rc_ptr = &rc)
-                    fixed (Single* c_ptr = &c)
-                    fixed (Single* v_ptr = &v)
-                    {
-                        Delegates.glReplacementCodeuiColor3fVertex3fvSUN((UInt32*)rc_ptr, (Single*)c_ptr, (Single*)v_ptr);
-                    }
-                }
+                Delegates.glReplacementCodeuiColor3fVertex3fvSUN((UInt32*)rc, (Single*)c, (Single*)v);
                 #if DEBUG
                 }
                 #endif
@@ -142804,21 +142804,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiColor3fVertex3fvSUN")]
-            public static 
-            unsafe void ReplacementCodeuiColor3fVertex3(UInt32* rc, Single* c, Single* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glReplacementCodeuiColor3fVertex3fvSUN((UInt32*)rc, (Single*)c, (Single*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiColor3fVertex3fvSUN")]
             public static 
@@ -142838,6 +142823,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiColor3fVertex3fvSUN")]
+            public static 
+            unsafe void ReplacementCodeuiColor3fVertex3(UInt32* rc, Single* c, Single* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glReplacementCodeuiColor3fVertex3fvSUN((UInt32*)rc, (Single*)c, (Single*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiColor4fNormal3fVertex3fSUN")]
             public static 
             void ReplacementCodeuiColor4fNormal3fVertex3(Int32 rc, Single r, Single g, Single b, Single a, Single nx, Single ny, Single nz, Single x, Single y, Single z)
@@ -142867,16 +142867,24 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiColor4fNormal3fVertex3fvSUN")]
             public static 
-            unsafe void ReplacementCodeuiColor4fNormal3fVertex3(Int32* rc, Single* c, Single* n, Single* v)
+            void ReplacementCodeuiColor4fNormal3fVertex3(ref Int32 rc, ref Single c, ref Single n, ref Single v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glReplacementCodeuiColor4fNormal3fVertex3fvSUN((UInt32*)rc, (Single*)c, (Single*)n, (Single*)v);
+                unsafe
+                {
+                    fixed (Int32* rc_ptr = &rc)
+                    fixed (Single* c_ptr = &c)
+                    fixed (Single* n_ptr = &n)
+                    fixed (Single* v_ptr = &v)
+                    {
+                        Delegates.glReplacementCodeuiColor4fNormal3fVertex3fvSUN((UInt32*)rc_ptr, (Single*)c_ptr, (Single*)n_ptr, (Single*)v_ptr);
+                    }
+                }
                 #if DEBUG
                 }
                 #endif
@@ -142902,24 +142910,16 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiColor4fNormal3fVertex3fvSUN")]
             public static 
-            void ReplacementCodeuiColor4fNormal3fVertex3(ref Int32 rc, ref Single c, ref Single n, ref Single v)
+            unsafe void ReplacementCodeuiColor4fNormal3fVertex3(Int32* rc, Single* c, Single* n, Single* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                unsafe
-                {
-                    fixed (Int32* rc_ptr = &rc)
-                    fixed (Single* c_ptr = &c)
-                    fixed (Single* n_ptr = &n)
-                    fixed (Single* v_ptr = &v)
-                    {
-                        Delegates.glReplacementCodeuiColor4fNormal3fVertex3fvSUN((UInt32*)rc_ptr, (Single*)c_ptr, (Single*)n_ptr, (Single*)v_ptr);
-                    }
-                }
+                Delegates.glReplacementCodeuiColor4fNormal3fVertex3fvSUN((UInt32*)rc, (Single*)c, (Single*)n, (Single*)v);
                 #if DEBUG
                 }
                 #endif
@@ -142949,21 +142949,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiColor4fNormal3fVertex3fvSUN")]
-            public static 
-            unsafe void ReplacementCodeuiColor4fNormal3fVertex3(UInt32* rc, Single* c, Single* n, Single* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glReplacementCodeuiColor4fNormal3fVertex3fvSUN((UInt32*)rc, (Single*)c, (Single*)n, (Single*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiColor4fNormal3fVertex3fvSUN")]
             public static 
@@ -142984,6 +142969,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiColor4fNormal3fVertex3fvSUN")]
+            public static 
+            unsafe void ReplacementCodeuiColor4fNormal3fVertex3(UInt32* rc, Single* c, Single* n, Single* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glReplacementCodeuiColor4fNormal3fVertex3fvSUN((UInt32*)rc, (Single*)c, (Single*)n, (Single*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiColor4ubVertex3fSUN")]
             public static 
             void ReplacementCodeuiColor4ubVertex3(Int32 rc, Byte r, Byte g, Byte b, Byte a, Single x, Single y, Single z)
@@ -143013,16 +143013,23 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiColor4ubVertex3fvSUN")]
             public static 
-            unsafe void ReplacementCodeuiColor4ubVertex3(Int32* rc, Byte* c, Single* v)
+            void ReplacementCodeuiColor4ubVertex3(ref Int32 rc, ref Byte c, ref Single v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glReplacementCodeuiColor4ubVertex3fvSUN((UInt32*)rc, (Byte*)c, (Single*)v);
+                unsafe
+                {
+                    fixed (Int32* rc_ptr = &rc)
+                    fixed (Byte* c_ptr = &c)
+                    fixed (Single* v_ptr = &v)
+                    {
+                        Delegates.glReplacementCodeuiColor4ubVertex3fvSUN((UInt32*)rc_ptr, (Byte*)c_ptr, (Single*)v_ptr);
+                    }
+                }
                 #if DEBUG
                 }
                 #endif
@@ -143047,23 +143054,16 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiColor4ubVertex3fvSUN")]
             public static 
-            void ReplacementCodeuiColor4ubVertex3(ref Int32 rc, ref Byte c, ref Single v)
+            unsafe void ReplacementCodeuiColor4ubVertex3(Int32* rc, Byte* c, Single* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                unsafe
-                {
-                    fixed (Int32* rc_ptr = &rc)
-                    fixed (Byte* c_ptr = &c)
-                    fixed (Single* v_ptr = &v)
-                    {
-                        Delegates.glReplacementCodeuiColor4ubVertex3fvSUN((UInt32*)rc_ptr, (Byte*)c_ptr, (Single*)v_ptr);
-                    }
-                }
+                Delegates.glReplacementCodeuiColor4ubVertex3fvSUN((UInt32*)rc, (Byte*)c, (Single*)v);
                 #if DEBUG
                 }
                 #endif
@@ -143092,21 +143092,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiColor4ubVertex3fvSUN")]
-            public static 
-            unsafe void ReplacementCodeuiColor4ubVertex3(UInt32* rc, Byte* c, Single* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glReplacementCodeuiColor4ubVertex3fvSUN((UInt32*)rc, (Byte*)c, (Single*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiColor4ubVertex3fvSUN")]
             public static 
@@ -143126,6 +143111,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiColor4ubVertex3fvSUN")]
+            public static 
+            unsafe void ReplacementCodeuiColor4ubVertex3(UInt32* rc, Byte* c, Single* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glReplacementCodeuiColor4ubVertex3fvSUN((UInt32*)rc, (Byte*)c, (Single*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiNormal3fVertex3fSUN")]
             public static 
             void ReplacementCodeuiNormal3fVertex3(Int32 rc, Single nx, Single ny, Single nz, Single x, Single y, Single z)
@@ -143155,16 +143155,23 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiNormal3fVertex3fvSUN")]
             public static 
-            unsafe void ReplacementCodeuiNormal3fVertex3(Int32* rc, Single* n, Single* v)
+            void ReplacementCodeuiNormal3fVertex3(ref Int32 rc, ref Single n, ref Single v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glReplacementCodeuiNormal3fVertex3fvSUN((UInt32*)rc, (Single*)n, (Single*)v);
+                unsafe
+                {
+                    fixed (Int32* rc_ptr = &rc)
+                    fixed (Single* n_ptr = &n)
+                    fixed (Single* v_ptr = &v)
+                    {
+                        Delegates.glReplacementCodeuiNormal3fVertex3fvSUN((UInt32*)rc_ptr, (Single*)n_ptr, (Single*)v_ptr);
+                    }
+                }
                 #if DEBUG
                 }
                 #endif
@@ -143189,23 +143196,16 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiNormal3fVertex3fvSUN")]
             public static 
-            void ReplacementCodeuiNormal3fVertex3(ref Int32 rc, ref Single n, ref Single v)
+            unsafe void ReplacementCodeuiNormal3fVertex3(Int32* rc, Single* n, Single* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                unsafe
-                {
-                    fixed (Int32* rc_ptr = &rc)
-                    fixed (Single* n_ptr = &n)
-                    fixed (Single* v_ptr = &v)
-                    {
-                        Delegates.glReplacementCodeuiNormal3fVertex3fvSUN((UInt32*)rc_ptr, (Single*)n_ptr, (Single*)v_ptr);
-                    }
-                }
+                Delegates.glReplacementCodeuiNormal3fVertex3fvSUN((UInt32*)rc, (Single*)n, (Single*)v);
                 #if DEBUG
                 }
                 #endif
@@ -143234,21 +143234,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiNormal3fVertex3fvSUN")]
-            public static 
-            unsafe void ReplacementCodeuiNormal3fVertex3(UInt32* rc, Single* n, Single* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glReplacementCodeuiNormal3fVertex3fvSUN((UInt32*)rc, (Single*)n, (Single*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiNormal3fVertex3fvSUN")]
             public static 
@@ -143268,6 +143253,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiNormal3fVertex3fvSUN")]
+            public static 
+            unsafe void ReplacementCodeuiNormal3fVertex3(UInt32* rc, Single* n, Single* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glReplacementCodeuiNormal3fVertex3fvSUN((UInt32*)rc, (Single*)n, (Single*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SunTriangleList", Version = "1.1", EntryPoint = "glReplacementCodeuiSUN")]
             public static 
             void ReplacementCode(Int32 code)
@@ -143326,16 +143326,25 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN")]
             public static 
-            unsafe void ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3(Int32* rc, Single* tc, Single* c, Single* n, Single* v)
+            void ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3(ref Int32 rc, ref Single tc, ref Single c, ref Single n, ref Single v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN((UInt32*)rc, (Single*)tc, (Single*)c, (Single*)n, (Single*)v);
+                unsafe
+                {
+                    fixed (Int32* rc_ptr = &rc)
+                    fixed (Single* tc_ptr = &tc)
+                    fixed (Single* c_ptr = &c)
+                    fixed (Single* n_ptr = &n)
+                    fixed (Single* v_ptr = &v)
+                    {
+                        Delegates.glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN((UInt32*)rc_ptr, (Single*)tc_ptr, (Single*)c_ptr, (Single*)n_ptr, (Single*)v_ptr);
+                    }
+                }
                 #if DEBUG
                 }
                 #endif
@@ -143362,25 +143371,16 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN")]
             public static 
-            void ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3(ref Int32 rc, ref Single tc, ref Single c, ref Single n, ref Single v)
+            unsafe void ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3(Int32* rc, Single* tc, Single* c, Single* n, Single* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                unsafe
-                {
-                    fixed (Int32* rc_ptr = &rc)
-                    fixed (Single* tc_ptr = &tc)
-                    fixed (Single* c_ptr = &c)
-                    fixed (Single* n_ptr = &n)
-                    fixed (Single* v_ptr = &v)
-                    {
-                        Delegates.glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN((UInt32*)rc_ptr, (Single*)tc_ptr, (Single*)c_ptr, (Single*)n_ptr, (Single*)v_ptr);
-                    }
-                }
+                Delegates.glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN((UInt32*)rc, (Single*)tc, (Single*)c, (Single*)n, (Single*)v);
                 #if DEBUG
                 }
                 #endif
@@ -143411,21 +143411,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN")]
-            public static 
-            unsafe void ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3(UInt32* rc, Single* tc, Single* c, Single* n, Single* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN((UInt32*)rc, (Single*)tc, (Single*)c, (Single*)n, (Single*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN")]
             public static 
@@ -143447,6 +143432,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN")]
+            public static 
+            unsafe void ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3(UInt32* rc, Single* tc, Single* c, Single* n, Single* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN((UInt32*)rc, (Single*)tc, (Single*)c, (Single*)n, (Single*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN")]
             public static 
             void ReplacementCodeuiTexCoord2fNormal3fVertex3(Int32 rc, Single s, Single t, Single nx, Single ny, Single nz, Single x, Single y, Single z)
@@ -143476,16 +143476,24 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN")]
             public static 
-            unsafe void ReplacementCodeuiTexCoord2fNormal3fVertex3(Int32* rc, Single* tc, Single* n, Single* v)
+            void ReplacementCodeuiTexCoord2fNormal3fVertex3(ref Int32 rc, ref Single tc, ref Single n, ref Single v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN((UInt32*)rc, (Single*)tc, (Single*)n, (Single*)v);
+                unsafe
+                {
+                    fixed (Int32* rc_ptr = &rc)
+                    fixed (Single* tc_ptr = &tc)
+                    fixed (Single* n_ptr = &n)
+                    fixed (Single* v_ptr = &v)
+                    {
+                        Delegates.glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN((UInt32*)rc_ptr, (Single*)tc_ptr, (Single*)n_ptr, (Single*)v_ptr);
+                    }
+                }
                 #if DEBUG
                 }
                 #endif
@@ -143511,24 +143519,16 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN")]
             public static 
-            void ReplacementCodeuiTexCoord2fNormal3fVertex3(ref Int32 rc, ref Single tc, ref Single n, ref Single v)
+            unsafe void ReplacementCodeuiTexCoord2fNormal3fVertex3(Int32* rc, Single* tc, Single* n, Single* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                unsafe
-                {
-                    fixed (Int32* rc_ptr = &rc)
-                    fixed (Single* tc_ptr = &tc)
-                    fixed (Single* n_ptr = &n)
-                    fixed (Single* v_ptr = &v)
-                    {
-                        Delegates.glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN((UInt32*)rc_ptr, (Single*)tc_ptr, (Single*)n_ptr, (Single*)v_ptr);
-                    }
-                }
+                Delegates.glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN((UInt32*)rc, (Single*)tc, (Single*)n, (Single*)v);
                 #if DEBUG
                 }
                 #endif
@@ -143558,21 +143558,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN")]
-            public static 
-            unsafe void ReplacementCodeuiTexCoord2fNormal3fVertex3(UInt32* rc, Single* tc, Single* n, Single* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN((UInt32*)rc, (Single*)tc, (Single*)n, (Single*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN")]
             public static 
@@ -143593,6 +143578,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN")]
+            public static 
+            unsafe void ReplacementCodeuiTexCoord2fNormal3fVertex3(UInt32* rc, Single* tc, Single* n, Single* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN((UInt32*)rc, (Single*)tc, (Single*)n, (Single*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiTexCoord2fVertex3fSUN")]
             public static 
             void ReplacementCodeuiTexCoord2fVertex3(Int32 rc, Single s, Single t, Single x, Single y, Single z)
@@ -143622,16 +143622,23 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiTexCoord2fVertex3fvSUN")]
             public static 
-            unsafe void ReplacementCodeuiTexCoord2fVertex3(Int32* rc, Single* tc, Single* v)
+            void ReplacementCodeuiTexCoord2fVertex3(ref Int32 rc, ref Single tc, ref Single v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glReplacementCodeuiTexCoord2fVertex3fvSUN((UInt32*)rc, (Single*)tc, (Single*)v);
+                unsafe
+                {
+                    fixed (Int32* rc_ptr = &rc)
+                    fixed (Single* tc_ptr = &tc)
+                    fixed (Single* v_ptr = &v)
+                    {
+                        Delegates.glReplacementCodeuiTexCoord2fVertex3fvSUN((UInt32*)rc_ptr, (Single*)tc_ptr, (Single*)v_ptr);
+                    }
+                }
                 #if DEBUG
                 }
                 #endif
@@ -143656,23 +143663,16 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiTexCoord2fVertex3fvSUN")]
             public static 
-            void ReplacementCodeuiTexCoord2fVertex3(ref Int32 rc, ref Single tc, ref Single v)
+            unsafe void ReplacementCodeuiTexCoord2fVertex3(Int32* rc, Single* tc, Single* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                unsafe
-                {
-                    fixed (Int32* rc_ptr = &rc)
-                    fixed (Single* tc_ptr = &tc)
-                    fixed (Single* v_ptr = &v)
-                    {
-                        Delegates.glReplacementCodeuiTexCoord2fVertex3fvSUN((UInt32*)rc_ptr, (Single*)tc_ptr, (Single*)v_ptr);
-                    }
-                }
+                Delegates.glReplacementCodeuiTexCoord2fVertex3fvSUN((UInt32*)rc, (Single*)tc, (Single*)v);
                 #if DEBUG
                 }
                 #endif
@@ -143701,21 +143701,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiTexCoord2fVertex3fvSUN")]
-            public static 
-            unsafe void ReplacementCodeuiTexCoord2fVertex3(UInt32* rc, Single* tc, Single* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glReplacementCodeuiTexCoord2fVertex3fvSUN((UInt32*)rc, (Single*)tc, (Single*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiTexCoord2fVertex3fvSUN")]
             public static 
@@ -143735,6 +143720,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiTexCoord2fVertex3fvSUN")]
+            public static 
+            unsafe void ReplacementCodeuiTexCoord2fVertex3(UInt32* rc, Single* tc, Single* v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glReplacementCodeuiTexCoord2fVertex3fvSUN((UInt32*)rc, (Single*)tc, (Single*)v);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiVertex3fSUN")]
             public static 
             void ReplacementCodeuiVertex3(Int32 rc, Single x, Single y, Single z)
@@ -143764,16 +143764,22 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiVertex3fvSUN")]
             public static 
-            unsafe void ReplacementCodeuiVertex3(Int32* rc, Single* v)
+            void ReplacementCodeuiVertex3(ref Int32 rc, ref Single v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glReplacementCodeuiVertex3fvSUN((UInt32*)rc, (Single*)v);
+                unsafe
+                {
+                    fixed (Int32* rc_ptr = &rc)
+                    fixed (Single* v_ptr = &v)
+                    {
+                        Delegates.glReplacementCodeuiVertex3fvSUN((UInt32*)rc_ptr, (Single*)v_ptr);
+                    }
+                }
                 #if DEBUG
                 }
                 #endif
@@ -143797,22 +143803,16 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiVertex3fvSUN")]
             public static 
-            void ReplacementCodeuiVertex3(ref Int32 rc, ref Single v)
+            unsafe void ReplacementCodeuiVertex3(Int32* rc, Single* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                unsafe
-                {
-                    fixed (Int32* rc_ptr = &rc)
-                    fixed (Single* v_ptr = &v)
-                    {
-                        Delegates.glReplacementCodeuiVertex3fvSUN((UInt32*)rc_ptr, (Single*)v_ptr);
-                    }
-                }
+                Delegates.glReplacementCodeuiVertex3fvSUN((UInt32*)rc, (Single*)v);
                 #if DEBUG
                 }
                 #endif
@@ -143840,21 +143840,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiVertex3fvSUN")]
-            public static 
-            unsafe void ReplacementCodeuiVertex3(UInt32* rc, Single* v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glReplacementCodeuiVertex3fvSUN((UInt32*)rc, (Single*)v);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiVertex3fvSUN")]
             public static 
@@ -143874,15 +143859,15 @@ namespace OpenTK.Graphics.OpenGL
             }
 
             [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SunTriangleList", Version = "1.1", EntryPoint = "glReplacementCodeuivSUN")]
+            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glReplacementCodeuiVertex3fvSUN")]
             public static 
-            unsafe void ReplacementCode(Int32* code)
+            unsafe void ReplacementCodeuiVertex3(UInt32* rc, Single* v)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
                 {
                 #endif
-                Delegates.glReplacementCodeuivSUN((UInt32*)code);
+                Delegates.glReplacementCodeuiVertex3fvSUN((UInt32*)rc, (Single*)v);
                 #if DEBUG
                 }
                 #endif
@@ -143911,7 +143896,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SunTriangleList", Version = "1.1", EntryPoint = "glReplacementCodeuivSUN")]
             public static 
-            unsafe void ReplacementCode(UInt32* code)
+            unsafe void ReplacementCode(Int32* code)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -143944,6 +143929,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SunTriangleList", Version = "1.1", EntryPoint = "glReplacementCodeuivSUN")]
+            public static 
+            unsafe void ReplacementCode(UInt32* code)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glReplacementCodeuivSUN((UInt32*)code);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SunTriangleList", Version = "1.1", EntryPoint = "glReplacementCodeusSUN")]
             public static 
             void ReplacementCode(Int16 code)
@@ -143973,21 +143973,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [System.CLSCompliant(false)]
-            [AutoGenerated(Category = "SunTriangleList", Version = "1.1", EntryPoint = "glReplacementCodeusvSUN")]
-            public static 
-            unsafe void ReplacementCode(Int16* code)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                Delegates.glReplacementCodeusvSUN((UInt16*)code);
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SunTriangleList", Version = "1.1", EntryPoint = "glReplacementCodeusvSUN")]
             public static 
             void ReplacementCode(Int16[] code)
@@ -144011,7 +143996,7 @@ namespace OpenTK.Graphics.OpenGL
             [System.CLSCompliant(false)]
             [AutoGenerated(Category = "SunTriangleList", Version = "1.1", EntryPoint = "glReplacementCodeusvSUN")]
             public static 
-            unsafe void ReplacementCode(UInt16* code)
+            unsafe void ReplacementCode(Int16* code)
             {
                 #if DEBUG
                 using (new ErrorHelper(GraphicsContext.CurrentContext))
@@ -144044,6 +144029,21 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [System.CLSCompliant(false)]
+            [AutoGenerated(Category = "SunTriangleList", Version = "1.1", EntryPoint = "glReplacementCodeusvSUN")]
+            public static 
+            unsafe void ReplacementCode(UInt16* code)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                Delegates.glReplacementCodeusvSUN((UInt16*)code);
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glTexCoord2fColor3fVertex3fSUN")]
             public static 
             void TexCoord2fColor3fVertex3(Single s, Single t, Single r, Single g, Single b, Single x, Single y, Single z)
@@ -144058,6 +144058,28 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glTexCoord2fColor3fVertex3fvSUN")]
+            public static 
+            void TexCoord2fColor3fVertex3(Single[] tc, Single[] c, Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* tc_ptr = tc)
+                    fixed (Single* c_ptr = c)
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glTexCoord2fColor3fVertex3fvSUN((Single*)tc_ptr, (Single*)c_ptr, (Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glTexCoord2fColor3fVertex3fvSUN")]
             public static 
             void TexCoord2fColor3fVertex3(ref Single tc, ref Single c, ref Single v)
@@ -144095,28 +144117,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glTexCoord2fColor3fVertex3fvSUN")]
-            public static 
-            void TexCoord2fColor3fVertex3(Single[] tc, Single[] c, Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* tc_ptr = tc)
-                    fixed (Single* c_ptr = c)
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glTexCoord2fColor3fVertex3fvSUN((Single*)tc_ptr, (Single*)c_ptr, (Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glTexCoord2fColor4fNormal3fVertex3fSUN")]
             public static 
             void TexCoord2fColor4fNormal3fVertex3(Single s, Single t, Single r, Single g, Single b, Single a, Single nx, Single ny, Single nz, Single x, Single y, Single z)
@@ -144131,6 +144131,29 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glTexCoord2fColor4fNormal3fVertex3fvSUN")]
+            public static 
+            void TexCoord2fColor4fNormal3fVertex3(Single[] tc, Single[] c, Single[] n, Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* tc_ptr = tc)
+                    fixed (Single* c_ptr = c)
+                    fixed (Single* n_ptr = n)
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glTexCoord2fColor4fNormal3fVertex3fvSUN((Single*)tc_ptr, (Single*)c_ptr, (Single*)n_ptr, (Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glTexCoord2fColor4fNormal3fVertex3fvSUN")]
             public static 
             void TexCoord2fColor4fNormal3fVertex3(ref Single tc, ref Single c, ref Single n, ref Single v)
@@ -144169,29 +144192,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glTexCoord2fColor4fNormal3fVertex3fvSUN")]
-            public static 
-            void TexCoord2fColor4fNormal3fVertex3(Single[] tc, Single[] c, Single[] n, Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* tc_ptr = tc)
-                    fixed (Single* c_ptr = c)
-                    fixed (Single* n_ptr = n)
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glTexCoord2fColor4fNormal3fVertex3fvSUN((Single*)tc_ptr, (Single*)c_ptr, (Single*)n_ptr, (Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glTexCoord2fColor4ubVertex3fSUN")]
             public static 
             void TexCoord2fColor4ubVertex3(Single s, Single t, Byte r, Byte g, Byte b, Byte a, Single x, Single y, Single z)
@@ -144206,6 +144206,28 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glTexCoord2fColor4ubVertex3fvSUN")]
+            public static 
+            void TexCoord2fColor4ubVertex3(Single[] tc, Byte[] c, Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* tc_ptr = tc)
+                    fixed (Byte* c_ptr = c)
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glTexCoord2fColor4ubVertex3fvSUN((Single*)tc_ptr, (Byte*)c_ptr, (Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glTexCoord2fColor4ubVertex3fvSUN")]
             public static 
             void TexCoord2fColor4ubVertex3(ref Single tc, ref Byte c, ref Single v)
@@ -144243,28 +144265,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glTexCoord2fColor4ubVertex3fvSUN")]
-            public static 
-            void TexCoord2fColor4ubVertex3(Single[] tc, Byte[] c, Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* tc_ptr = tc)
-                    fixed (Byte* c_ptr = c)
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glTexCoord2fColor4ubVertex3fvSUN((Single*)tc_ptr, (Byte*)c_ptr, (Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glTexCoord2fNormal3fVertex3fSUN")]
             public static 
             void TexCoord2fNormal3fVertex3(Single s, Single t, Single nx, Single ny, Single nz, Single x, Single y, Single z)
@@ -144279,6 +144279,28 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glTexCoord2fNormal3fVertex3fvSUN")]
+            public static 
+            void TexCoord2fNormal3fVertex3(Single[] tc, Single[] n, Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* tc_ptr = tc)
+                    fixed (Single* n_ptr = n)
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glTexCoord2fNormal3fVertex3fvSUN((Single*)tc_ptr, (Single*)n_ptr, (Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glTexCoord2fNormal3fVertex3fvSUN")]
             public static 
             void TexCoord2fNormal3fVertex3(ref Single tc, ref Single n, ref Single v)
@@ -144316,28 +144338,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glTexCoord2fNormal3fVertex3fvSUN")]
-            public static 
-            void TexCoord2fNormal3fVertex3(Single[] tc, Single[] n, Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* tc_ptr = tc)
-                    fixed (Single* n_ptr = n)
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glTexCoord2fNormal3fVertex3fvSUN((Single*)tc_ptr, (Single*)n_ptr, (Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glTexCoord2fVertex3fSUN")]
             public static 
             void TexCoord2fVertex3(Single s, Single t, Single x, Single y, Single z)
@@ -144352,6 +144352,27 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glTexCoord2fVertex3fvSUN")]
+            public static 
+            void TexCoord2fVertex3(Single[] tc, Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* tc_ptr = tc)
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glTexCoord2fVertex3fvSUN((Single*)tc_ptr, (Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glTexCoord2fVertex3fvSUN")]
             public static 
             void TexCoord2fVertex3(ref Single tc, ref Single v)
@@ -144388,27 +144409,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glTexCoord2fVertex3fvSUN")]
-            public static 
-            void TexCoord2fVertex3(Single[] tc, Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* tc_ptr = tc)
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glTexCoord2fVertex3fvSUN((Single*)tc_ptr, (Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glTexCoord4fColor4fNormal3fVertex4fSUN")]
             public static 
             void TexCoord4fColor4fNormal3fVertex4(Single s, Single t, Single p, Single q, Single r, Single g, Single b, Single a, Single nx, Single ny, Single nz, Single x, Single y, Single z, Single w)
@@ -144423,6 +144423,29 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glTexCoord4fColor4fNormal3fVertex4fvSUN")]
+            public static 
+            void TexCoord4fColor4fNormal3fVertex4(Single[] tc, Single[] c, Single[] n, Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* tc_ptr = tc)
+                    fixed (Single* c_ptr = c)
+                    fixed (Single* n_ptr = n)
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glTexCoord4fColor4fNormal3fVertex4fvSUN((Single*)tc_ptr, (Single*)c_ptr, (Single*)n_ptr, (Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glTexCoord4fColor4fNormal3fVertex4fvSUN")]
             public static 
             void TexCoord4fColor4fNormal3fVertex4(ref Single tc, ref Single c, ref Single n, ref Single v)
@@ -144461,29 +144484,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glTexCoord4fColor4fNormal3fVertex4fvSUN")]
-            public static 
-            void TexCoord4fColor4fNormal3fVertex4(Single[] tc, Single[] c, Single[] n, Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* tc_ptr = tc)
-                    fixed (Single* c_ptr = c)
-                    fixed (Single* n_ptr = n)
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glTexCoord4fColor4fNormal3fVertex4fvSUN((Single*)tc_ptr, (Single*)c_ptr, (Single*)n_ptr, (Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glTexCoord4fVertex4fSUN")]
             public static 
             void TexCoord4fVertex4(Single s, Single t, Single p, Single q, Single x, Single y, Single z, Single w)
@@ -144498,6 +144498,27 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
+            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glTexCoord4fVertex4fvSUN")]
+            public static 
+            void TexCoord4fVertex4(Single[] tc, Single[] v)
+            {
+                #if DEBUG
+                using (new ErrorHelper(GraphicsContext.CurrentContext))
+                {
+                #endif
+                unsafe
+                {
+                    fixed (Single* tc_ptr = tc)
+                    fixed (Single* v_ptr = v)
+                    {
+                        Delegates.glTexCoord4fVertex4fvSUN((Single*)tc_ptr, (Single*)v_ptr);
+                    }
+                }
+                #if DEBUG
+                }
+                #endif
+            }
+
             [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glTexCoord4fVertex4fvSUN")]
             public static 
             void TexCoord4fVertex4(ref Single tc, ref Single v)
@@ -144534,27 +144555,6 @@ namespace OpenTK.Graphics.OpenGL
                 #endif
             }
 
-            [AutoGenerated(Category = "SunVertex", Version = "1.1", EntryPoint = "glTexCoord4fVertex4fvSUN")]
-            public static 
-            void TexCoord4fVertex4(Single[] tc, Single[] v)
-            {
-                #if DEBUG
-                using (new ErrorHelper(GraphicsContext.CurrentContext))
-                {
-                #endif
-                unsafe
-                {
-                    fixed (Single* tc_ptr = tc)
-                    fixed (Single* v_ptr = v)
-                    {
-                        Delegates.glTexCoord4fVertex4fvSUN((Single*)tc_ptr, (Single*)v_ptr);
-                    }
-                }
-                #if DEBUG
-                }
-                #endif
-            }
-
         }
 
         public static partial class Sunx