diff --git a/.silktouch/sdl-clangsharp.stout b/.silktouch/sdl-clangsharp.stout
index 6be7b4120a..693076b364 100644
Binary files a/.silktouch/sdl-clangsharp.stout and b/.silktouch/sdl-clangsharp.stout differ
diff --git a/sources/OpenAL/OpenAL/al/AL.gen.cs b/sources/OpenAL/OpenAL/al/AL.gen.cs
index 4c3156ff29..fae97c609f 100644
--- a/sources/OpenAL/OpenAL/al/AL.gen.cs
+++ b/sources/OpenAL/OpenAL/al/AL.gen.cs
@@ -1208,6 +1208,17 @@ sbyte message
         public static void DeleteAuxiliaryEffectSlot(uint effectslots) =>
             DeleteAuxiliaryEffectSlots(1, (uint*)&effectslots);
 
+        [NativeName("alDeleteAuxiliaryEffectSlotsDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+        ]
+        [NativeFunction("openal", EntryPoint = "alDeleteAuxiliaryEffectSlotsDirect")]
+        public static void DeleteAuxiliaryEffectSlotDirect(
+            ContextHandle context,
+            uint effectslots
+        ) => DeleteAuxiliaryEffectSlotsDirect(context, 1, (uint*)&effectslots);
+
         [NativeName("alDeleteAuxiliaryEffectSlots")]
         [DllImport("openal", ExactSpelling = true, EntryPoint = "alDeleteAuxiliaryEffectSlots")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
@@ -1264,17 +1275,6 @@ Ref<uint> effectslots
             }
         }
 
-        [NativeName("alDeleteAuxiliaryEffectSlotsDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-        ]
-        [NativeFunction("openal", EntryPoint = "alDeleteAuxiliaryEffectSlotsDirect")]
-        public static void DeleteAuxiliaryEffectSlotsDirect(
-            ContextHandle context,
-            uint effectslots
-        ) => DeleteAuxiliaryEffectSlotsDirect(context, 1, (uint*)&effectslots);
-
         [NativeName("alDeleteBuffers")]
         [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
         [NativeFunction("openal", EntryPoint = "alDeleteBuffers")]
@@ -1329,6 +1329,15 @@ public static void DeleteBuffersDirect(ContextHandle context, int n, Ref<uint> b
         [NativeFunction("openal", EntryPoint = "alDeleteEffects")]
         public static void DeleteEffect(uint effects) => DeleteEffects(1, (uint*)&effects);
 
+        [NativeName("alDeleteEffectsDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+        ]
+        [NativeFunction("openal", EntryPoint = "alDeleteEffectsDirect")]
+        public static void DeleteEffectDirect(ContextHandle context, uint effects) =>
+            DeleteEffectsDirect(context, 1, (uint*)&effects);
+
         [NativeName("alDeleteEffects")]
         [DllImport("openal", ExactSpelling = true, EntryPoint = "alDeleteEffects")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
@@ -1373,20 +1382,20 @@ public static void DeleteEffectsDirect(ContextHandle context, int n, Ref<uint> e
             }
         }
 
-        [NativeName("alDeleteEffectsDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-        ]
-        [NativeFunction("openal", EntryPoint = "alDeleteEffectsDirect")]
-        public static void DeleteEffectsDirect(ContextHandle context, uint effects) =>
-            DeleteEffectsDirect(context, 1, (uint*)&effects);
-
         [NativeName("alDeleteFilters")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
         [NativeFunction("openal", EntryPoint = "alDeleteFilters")]
         public static void DeleteFilter(uint filters) => DeleteFilters(1, (uint*)&filters);
 
+        [NativeName("alDeleteFiltersDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+        ]
+        [NativeFunction("openal", EntryPoint = "alDeleteFiltersDirect")]
+        public static void DeleteFilterDirect(ContextHandle context, uint filters) =>
+            DeleteFiltersDirect(context, 1, (uint*)&filters);
+
         [NativeName("alDeleteFilters")]
         [DllImport("openal", ExactSpelling = true, EntryPoint = "alDeleteFilters")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
@@ -1431,20 +1440,20 @@ public static void DeleteFiltersDirect(ContextHandle context, int n, Ref<uint> f
             }
         }
 
-        [NativeName("alDeleteFiltersDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-        ]
-        [NativeFunction("openal", EntryPoint = "alDeleteFiltersDirect")]
-        public static void DeleteFiltersDirect(ContextHandle context, uint filters) =>
-            DeleteFiltersDirect(context, 1, (uint*)&filters);
-
         [NativeName("alDeleteSources")]
         [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
         [NativeFunction("openal", EntryPoint = "alDeleteSources")]
         public static void DeleteSource(uint sources) => DeleteSources(1, (uint*)&sources);
 
+        [NativeName("alDeleteSourcesDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context"]),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context"])
+        ]
+        [NativeFunction("openal", EntryPoint = "alDeleteSourcesDirect")]
+        public static void DeleteSourceDirect(ContextHandle context, uint sources) =>
+            DeleteSourcesDirect(context, 1, (uint*)&sources);
+
         [NativeName("alDeleteSources")]
         [DllImport("openal", ExactSpelling = true, EntryPoint = "alDeleteSources")]
         [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
@@ -1489,15 +1498,6 @@ public static void DeleteSourcesDirect(ContextHandle context, int n, Ref<uint> s
             }
         }
 
-        [NativeName("alDeleteSourcesDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context"]),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context"])
-        ]
-        [NativeFunction("openal", EntryPoint = "alDeleteSourcesDirect")]
-        public static void DeleteSourcesDirect(ContextHandle context, uint sources) =>
-            DeleteSourcesDirect(context, 1, (uint*)&sources);
-
         [NativeName("alDisable")]
         [DllImport("openal", ExactSpelling = true, EntryPoint = "alDisable")]
         [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
@@ -2172,6 +2172,19 @@ public static uint GenAuxiliaryEffectSlot()
             return effectslots;
         }
 
+        [NativeName("alGenAuxiliaryEffectSlotsDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+        ]
+        [NativeFunction("openal", EntryPoint = "alGenAuxiliaryEffectSlotsDirect")]
+        public static uint GenAuxiliaryEffectSlotDirect(ContextHandle context)
+        {
+            uint effectslots = default;
+            GenAuxiliaryEffectSlotsDirect(context, 1, (uint*)&effectslots);
+            return effectslots;
+        }
+
         [NativeName("alGenAuxiliaryEffectSlots")]
         [DllImport("openal", ExactSpelling = true, EntryPoint = "alGenAuxiliaryEffectSlots")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
@@ -2224,19 +2237,6 @@ Ref<uint> effectslots
             }
         }
 
-        [NativeName("alGenAuxiliaryEffectSlotsDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-        ]
-        [NativeFunction("openal", EntryPoint = "alGenAuxiliaryEffectSlotsDirect")]
-        public static uint GenAuxiliaryEffectSlotsDirect(ContextHandle context)
-        {
-            uint effectslots = default;
-            GenAuxiliaryEffectSlotsDirect(context, 1, (uint*)&effectslots);
-            return effectslots;
-        }
-
         [NativeName("alGenBuffers")]
         [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
         [NativeFunction("openal", EntryPoint = "alGenBuffers")]
@@ -2301,6 +2301,19 @@ public static uint GenEffect()
             return effects;
         }
 
+        [NativeName("alGenEffectsDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+        ]
+        [NativeFunction("openal", EntryPoint = "alGenEffectsDirect")]
+        public static uint GenEffectDirect(ContextHandle context)
+        {
+            uint effects = default;
+            GenEffectsDirect(context, 1, (uint*)&effects);
+            return effects;
+        }
+
         [NativeName("alGenEffects")]
         [DllImport("openal", ExactSpelling = true, EntryPoint = "alGenEffects")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
@@ -2345,19 +2358,6 @@ public static void GenEffectsDirect(ContextHandle context, int n, Ref<uint> effe
             }
         }
 
-        [NativeName("alGenEffectsDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-        ]
-        [NativeFunction("openal", EntryPoint = "alGenEffectsDirect")]
-        public static uint GenEffectsDirect(ContextHandle context)
-        {
-            uint effects = default;
-            GenEffectsDirect(context, 1, (uint*)&effects);
-            return effects;
-        }
-
         [NativeName("alGenFilters")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
         [NativeFunction("openal", EntryPoint = "alGenFilters")]
@@ -2368,6 +2368,19 @@ public static uint GenFilter()
             return filters;
         }
 
+        [NativeName("alGenFiltersDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+        ]
+        [NativeFunction("openal", EntryPoint = "alGenFiltersDirect")]
+        public static uint GenFilterDirect(ContextHandle context)
+        {
+            uint filters = default;
+            GenFiltersDirect(context, 1, (uint*)&filters);
+            return filters;
+        }
+
         [NativeName("alGenFilters")]
         [DllImport("openal", ExactSpelling = true, EntryPoint = "alGenFilters")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
@@ -2412,19 +2425,6 @@ public static void GenFiltersDirect(ContextHandle context, int n, Ref<uint> filt
             }
         }
 
-        [NativeName("alGenFiltersDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-        ]
-        [NativeFunction("openal", EntryPoint = "alGenFiltersDirect")]
-        public static uint GenFiltersDirect(ContextHandle context)
-        {
-            uint filters = default;
-            GenFiltersDirect(context, 1, (uint*)&filters);
-            return filters;
-        }
-
         [NativeName("alGenSources")]
         [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
         [NativeFunction("openal", EntryPoint = "alGenSources")]
@@ -2435,6 +2435,19 @@ public static uint GenSource()
             return sources;
         }
 
+        [NativeName("alGenSourcesDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context"]),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context"])
+        ]
+        [NativeFunction("openal", EntryPoint = "alGenSourcesDirect")]
+        public static uint GenSourceDirect(ContextHandle context)
+        {
+            uint sources = default;
+            GenSourcesDirect(context, 1, (uint*)&sources);
+            return sources;
+        }
+
         [NativeName("alGenSources")]
         [DllImport("openal", ExactSpelling = true, EntryPoint = "alGenSources")]
         [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
@@ -2479,19 +2492,6 @@ public static void GenSourcesDirect(ContextHandle context, int n, Ref<uint> sour
             }
         }
 
-        [NativeName("alGenSourcesDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context"]),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context"])
-        ]
-        [NativeFunction("openal", EntryPoint = "alGenSourcesDirect")]
-        public static uint GenSourcesDirect(ContextHandle context)
-        {
-            uint sources = default;
-            GenSourcesDirect(context, 1, (uint*)&sources);
-            return sources;
-        }
-
         [NativeName("alGetAuxiliaryEffectSlotf")]
         [DllImport("openal", ExactSpelling = true, EntryPoint = "alGetAuxiliaryEffectSlotf")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
@@ -9459,6 +9459,18 @@ public void DeferUpdatesDirectSOFT(ContextHandle context) =>
         public void DeleteAuxiliaryEffectSlot(uint effectslots) =>
             T.DeleteAuxiliaryEffectSlot(effectslots);
 
+        [NativeName("alDeleteAuxiliaryEffectSlotsDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+        ]
+        [NativeFunction("openal", EntryPoint = "alDeleteAuxiliaryEffectSlotsDirect")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void DeleteAuxiliaryEffectSlotDirect(ContextHandle context, uint effectslots) =>
+            T.DeleteAuxiliaryEffectSlotDirect(context, effectslots);
+
         [NativeName("alDeleteAuxiliaryEffectSlots")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
         [NativeFunction("openal", EntryPoint = "alDeleteAuxiliaryEffectSlots")]
@@ -9507,18 +9519,6 @@ public void DeleteAuxiliaryEffectSlotsDirect(
             Ref<uint> effectslots
         ) => T.DeleteAuxiliaryEffectSlotsDirect(context, n, effectslots);
 
-        [NativeName("alDeleteAuxiliaryEffectSlotsDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-        ]
-        [NativeFunction("openal", EntryPoint = "alDeleteAuxiliaryEffectSlotsDirect")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void DeleteAuxiliaryEffectSlotsDirect(ContextHandle context, uint effectslots) =>
-            T.DeleteAuxiliaryEffectSlotsDirect(context, effectslots);
-
         [NativeName("alDeleteBuffers")]
         [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
         [NativeFunction("openal", EntryPoint = "alDeleteBuffers")]
@@ -9575,6 +9575,18 @@ public void DeleteBuffersDirect(ContextHandle context, int n, Ref<uint> buffers)
         )]
         public void DeleteEffect(uint effects) => T.DeleteEffect(effects);
 
+        [NativeName("alDeleteEffectsDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+        ]
+        [NativeFunction("openal", EntryPoint = "alDeleteEffectsDirect")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void DeleteEffectDirect(ContextHandle context, uint effects) =>
+            T.DeleteEffectDirect(context, effects);
+
         [NativeName("alDeleteEffects")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
         [NativeFunction("openal", EntryPoint = "alDeleteEffects")]
@@ -9615,18 +9627,6 @@ public void DeleteEffectsDirect(ContextHandle context, int n, uint* effects) =>
         public void DeleteEffectsDirect(ContextHandle context, int n, Ref<uint> effects) =>
             T.DeleteEffectsDirect(context, n, effects);
 
-        [NativeName("alDeleteEffectsDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-        ]
-        [NativeFunction("openal", EntryPoint = "alDeleteEffectsDirect")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void DeleteEffectsDirect(ContextHandle context, uint effects) =>
-            T.DeleteEffectsDirect(context, effects);
-
         [NativeName("alDeleteFilters")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
         [NativeFunction("openal", EntryPoint = "alDeleteFilters")]
@@ -9635,6 +9635,18 @@ public void DeleteEffectsDirect(ContextHandle context, uint effects) =>
         )]
         public void DeleteFilter(uint filters) => T.DeleteFilter(filters);
 
+        [NativeName("alDeleteFiltersDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+        ]
+        [NativeFunction("openal", EntryPoint = "alDeleteFiltersDirect")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void DeleteFilterDirect(ContextHandle context, uint filters) =>
+            T.DeleteFilterDirect(context, filters);
+
         [NativeName("alDeleteFilters")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
         [NativeFunction("openal", EntryPoint = "alDeleteFilters")]
@@ -9675,18 +9687,6 @@ public void DeleteFiltersDirect(ContextHandle context, int n, uint* filters) =>
         public void DeleteFiltersDirect(ContextHandle context, int n, Ref<uint> filters) =>
             T.DeleteFiltersDirect(context, n, filters);
 
-        [NativeName("alDeleteFiltersDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-        ]
-        [NativeFunction("openal", EntryPoint = "alDeleteFiltersDirect")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void DeleteFiltersDirect(ContextHandle context, uint filters) =>
-            T.DeleteFiltersDirect(context, filters);
-
         [NativeName("alDeleteSources")]
         [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
         [NativeFunction("openal", EntryPoint = "alDeleteSources")]
@@ -9695,6 +9695,18 @@ public void DeleteFiltersDirect(ContextHandle context, uint filters) =>
         )]
         public void DeleteSource(uint sources) => T.DeleteSource(sources);
 
+        [NativeName("alDeleteSourcesDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context"]),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context"])
+        ]
+        [NativeFunction("openal", EntryPoint = "alDeleteSourcesDirect")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void DeleteSourceDirect(ContextHandle context, uint sources) =>
+            T.DeleteSourceDirect(context, sources);
+
         [NativeName("alDeleteSources")]
         [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
         [NativeFunction("openal", EntryPoint = "alDeleteSources")]
@@ -9735,18 +9747,6 @@ public void DeleteSourcesDirect(ContextHandle context, int n, uint* sources) =>
         public void DeleteSourcesDirect(ContextHandle context, int n, Ref<uint> sources) =>
             T.DeleteSourcesDirect(context, n, sources);
 
-        [NativeName("alDeleteSourcesDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context"]),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context"])
-        ]
-        [NativeFunction("openal", EntryPoint = "alDeleteSourcesDirect")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void DeleteSourcesDirect(ContextHandle context, uint sources) =>
-            T.DeleteSourcesDirect(context, sources);
-
         [NativeName("alDisable")]
         [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
         [NativeFunction("openal", EntryPoint = "alDisable")]
@@ -10458,6 +10458,18 @@ Ref<int> piValues
         )]
         public uint GenAuxiliaryEffectSlot() => T.GenAuxiliaryEffectSlot();
 
+        [NativeName("alGenAuxiliaryEffectSlotsDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+        ]
+        [NativeFunction("openal", EntryPoint = "alGenAuxiliaryEffectSlotsDirect")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public uint GenAuxiliaryEffectSlotDirect(ContextHandle context) =>
+            T.GenAuxiliaryEffectSlotDirect(context);
+
         [NativeName("alGenAuxiliaryEffectSlots")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
         [NativeFunction("openal", EntryPoint = "alGenAuxiliaryEffectSlots")]
@@ -10506,18 +10518,6 @@ public void GenAuxiliaryEffectSlotsDirect(
             Ref<uint> effectslots
         ) => T.GenAuxiliaryEffectSlotsDirect(context, n, effectslots);
 
-        [NativeName("alGenAuxiliaryEffectSlotsDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-        ]
-        [NativeFunction("openal", EntryPoint = "alGenAuxiliaryEffectSlotsDirect")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public uint GenAuxiliaryEffectSlotsDirect(ContextHandle context) =>
-            T.GenAuxiliaryEffectSlotsDirect(context);
-
         [NativeName("alGenBuffers")]
         [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
         [NativeFunction("openal", EntryPoint = "alGenBuffers")]
@@ -10574,6 +10574,17 @@ public void GenBuffersDirect(ContextHandle context, int n, Ref<uint> buffers) =>
         )]
         public uint GenEffect() => T.GenEffect();
 
+        [NativeName("alGenEffectsDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+        ]
+        [NativeFunction("openal", EntryPoint = "alGenEffectsDirect")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public uint GenEffectDirect(ContextHandle context) => T.GenEffectDirect(context);
+
         [NativeName("alGenEffects")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
         [NativeFunction("openal", EntryPoint = "alGenEffects")]
@@ -10614,17 +10625,6 @@ public void GenEffectsDirect(ContextHandle context, int n, uint* effects) =>
         public void GenEffectsDirect(ContextHandle context, int n, Ref<uint> effects) =>
             T.GenEffectsDirect(context, n, effects);
 
-        [NativeName("alGenEffectsDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-        ]
-        [NativeFunction("openal", EntryPoint = "alGenEffectsDirect")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public uint GenEffectsDirect(ContextHandle context) => T.GenEffectsDirect(context);
-
         [NativeName("alGenFilters")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
         [NativeFunction("openal", EntryPoint = "alGenFilters")]
@@ -10633,6 +10633,17 @@ public void GenEffectsDirect(ContextHandle context, int n, Ref<uint> effects) =>
         )]
         public uint GenFilter() => T.GenFilter();
 
+        [NativeName("alGenFiltersDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+        ]
+        [NativeFunction("openal", EntryPoint = "alGenFiltersDirect")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public uint GenFilterDirect(ContextHandle context) => T.GenFilterDirect(context);
+
         [NativeName("alGenFilters")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
         [NativeFunction("openal", EntryPoint = "alGenFilters")]
@@ -10673,17 +10684,6 @@ public void GenFiltersDirect(ContextHandle context, int n, uint* filters) =>
         public void GenFiltersDirect(ContextHandle context, int n, Ref<uint> filters) =>
             T.GenFiltersDirect(context, n, filters);
 
-        [NativeName("alGenFiltersDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-        ]
-        [NativeFunction("openal", EntryPoint = "alGenFiltersDirect")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public uint GenFiltersDirect(ContextHandle context) => T.GenFiltersDirect(context);
-
         [NativeName("alGenSources")]
         [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
         [NativeFunction("openal", EntryPoint = "alGenSources")]
@@ -10692,6 +10692,17 @@ public void GenFiltersDirect(ContextHandle context, int n, Ref<uint> filters) =>
         )]
         public uint GenSource() => T.GenSource();
 
+        [NativeName("alGenSourcesDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context"]),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context"])
+        ]
+        [NativeFunction("openal", EntryPoint = "alGenSourcesDirect")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public uint GenSourceDirect(ContextHandle context) => T.GenSourceDirect(context);
+
         [NativeName("alGenSources")]
         [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
         [NativeFunction("openal", EntryPoint = "alGenSources")]
@@ -10732,17 +10743,6 @@ public void GenSourcesDirect(ContextHandle context, int n, uint* sources) =>
         public void GenSourcesDirect(ContextHandle context, int n, Ref<uint> sources) =>
             T.GenSourcesDirect(context, n, sources);
 
-        [NativeName("alGenSourcesDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context"]),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context"])
-        ]
-        [NativeFunction("openal", EntryPoint = "alGenSourcesDirect")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public uint GenSourcesDirect(ContextHandle context) => T.GenSourcesDirect(context);
-
         [NativeName("alGetAuxiliaryEffectSlotf")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
         [NativeFunction("openal", EntryPoint = "alGetAuxiliaryEffectSlotf")]
@@ -17789,6 +17789,20 @@ public static void DeferUpdatesDirectSOFT(ContextHandle context) =>
         public static void DeleteAuxiliaryEffectSlot(uint effectslots) =>
             Underlying.Value!.DeleteAuxiliaryEffectSlot(effectslots);
 
+        [NativeName("alDeleteAuxiliaryEffectSlotsDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+        ]
+        [NativeFunction("openal", EntryPoint = "alDeleteAuxiliaryEffectSlotsDirect")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void DeleteAuxiliaryEffectSlotDirect(
+            ContextHandle context,
+            uint effectslots
+        ) => Underlying.Value!.DeleteAuxiliaryEffectSlotDirect(context, effectslots);
+
         [NativeName("alDeleteAuxiliaryEffectSlots")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
         [NativeFunction("openal", EntryPoint = "alDeleteAuxiliaryEffectSlots")]
@@ -17848,20 +17862,6 @@ Ref<uint> effectslots
             }
         }
 
-        [NativeName("alDeleteAuxiliaryEffectSlotsDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-        ]
-        [NativeFunction("openal", EntryPoint = "alDeleteAuxiliaryEffectSlotsDirect")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void DeleteAuxiliaryEffectSlotsDirect(
-            ContextHandle context,
-            uint effectslots
-        ) => Underlying.Value!.DeleteAuxiliaryEffectSlotsDirect(context, effectslots);
-
         [NativeName("alDeleteBuffers")]
         [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
         [NativeFunction("openal", EntryPoint = "alDeleteBuffers")]
@@ -17930,6 +17930,18 @@ public static void DeleteBuffersDirect(ContextHandle context, int n, Ref<uint> b
         )]
         public static void DeleteEffect(uint effects) => Underlying.Value!.DeleteEffect(effects);
 
+        [NativeName("alDeleteEffectsDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+        ]
+        [NativeFunction("openal", EntryPoint = "alDeleteEffectsDirect")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void DeleteEffectDirect(ContextHandle context, uint effects) =>
+            Underlying.Value!.DeleteEffectDirect(context, effects);
+
         [NativeName("alDeleteEffects")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
         [NativeFunction("openal", EntryPoint = "alDeleteEffects")]
@@ -17982,18 +17994,6 @@ public static void DeleteEffectsDirect(ContextHandle context, int n, Ref<uint> e
             }
         }
 
-        [NativeName("alDeleteEffectsDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-        ]
-        [NativeFunction("openal", EntryPoint = "alDeleteEffectsDirect")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void DeleteEffectsDirect(ContextHandle context, uint effects) =>
-            Underlying.Value!.DeleteEffectsDirect(context, effects);
-
         [NativeName("alDeleteFilters")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
         [NativeFunction("openal", EntryPoint = "alDeleteFilters")]
@@ -18002,6 +18002,18 @@ public static void DeleteEffectsDirect(ContextHandle context, uint effects) =>
         )]
         public static void DeleteFilter(uint filters) => Underlying.Value!.DeleteFilter(filters);
 
+        [NativeName("alDeleteFiltersDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+        ]
+        [NativeFunction("openal", EntryPoint = "alDeleteFiltersDirect")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void DeleteFilterDirect(ContextHandle context, uint filters) =>
+            Underlying.Value!.DeleteFilterDirect(context, filters);
+
         [NativeName("alDeleteFilters")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
         [NativeFunction("openal", EntryPoint = "alDeleteFilters")]
@@ -18054,18 +18066,6 @@ public static void DeleteFiltersDirect(ContextHandle context, int n, Ref<uint> f
             }
         }
 
-        [NativeName("alDeleteFiltersDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-        ]
-        [NativeFunction("openal", EntryPoint = "alDeleteFiltersDirect")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void DeleteFiltersDirect(ContextHandle context, uint filters) =>
-            Underlying.Value!.DeleteFiltersDirect(context, filters);
-
         [NativeName("alDeleteSources")]
         [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
         [NativeFunction("openal", EntryPoint = "alDeleteSources")]
@@ -18074,6 +18074,18 @@ public static void DeleteFiltersDirect(ContextHandle context, uint filters) =>
         )]
         public static void DeleteSource(uint sources) => Underlying.Value!.DeleteSource(sources);
 
+        [NativeName("alDeleteSourcesDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context"]),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context"])
+        ]
+        [NativeFunction("openal", EntryPoint = "alDeleteSourcesDirect")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void DeleteSourceDirect(ContextHandle context, uint sources) =>
+            Underlying.Value!.DeleteSourceDirect(context, sources);
+
         [NativeName("alDeleteSources")]
         [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
         [NativeFunction("openal", EntryPoint = "alDeleteSources")]
@@ -18126,18 +18138,6 @@ public static void DeleteSourcesDirect(ContextHandle context, int n, Ref<uint> s
             }
         }
 
-        [NativeName("alDeleteSourcesDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context"]),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context"])
-        ]
-        [NativeFunction("openal", EntryPoint = "alDeleteSourcesDirect")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void DeleteSourcesDirect(ContextHandle context, uint sources) =>
-            Underlying.Value!.DeleteSourcesDirect(context, sources);
-
         [NativeName("alDisable")]
         [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
         [NativeFunction("openal", EntryPoint = "alDisable")]
@@ -18965,6 +18965,22 @@ public static uint GenAuxiliaryEffectSlot()
             return effectslots;
         }
 
+        [NativeName("alGenAuxiliaryEffectSlotsDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+        ]
+        [NativeFunction("openal", EntryPoint = "alGenAuxiliaryEffectSlotsDirect")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static uint GenAuxiliaryEffectSlotDirect(ContextHandle context)
+        {
+            uint effectslots = default;
+            GenAuxiliaryEffectSlotsDirect(context, 1, (uint*)&effectslots);
+            return effectslots;
+        }
+
         [NativeName("alGenAuxiliaryEffectSlots")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
         [NativeFunction("openal", EntryPoint = "alGenAuxiliaryEffectSlots")]
@@ -19024,22 +19040,6 @@ Ref<uint> effectslots
             }
         }
 
-        [NativeName("alGenAuxiliaryEffectSlotsDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-        ]
-        [NativeFunction("openal", EntryPoint = "alGenAuxiliaryEffectSlotsDirect")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static uint GenAuxiliaryEffectSlotsDirect(ContextHandle context)
-        {
-            uint effectslots = default;
-            GenAuxiliaryEffectSlotsDirect(context, 1, (uint*)&effectslots);
-            return effectslots;
-        }
-
         [NativeName("alGenBuffers")]
         [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
         [NativeFunction("openal", EntryPoint = "alGenBuffers")]
@@ -19118,6 +19118,22 @@ public static uint GenEffect()
             return effects;
         }
 
+        [NativeName("alGenEffectsDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+        ]
+        [NativeFunction("openal", EntryPoint = "alGenEffectsDirect")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static uint GenEffectDirect(ContextHandle context)
+        {
+            uint effects = default;
+            GenEffectsDirect(context, 1, (uint*)&effects);
+            return effects;
+        }
+
         [NativeName("alGenEffects")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
         [NativeFunction("openal", EntryPoint = "alGenEffects")]
@@ -19170,32 +19186,32 @@ public static void GenEffectsDirect(ContextHandle context, int n, Ref<uint> effe
             }
         }
 
-        [NativeName("alGenEffectsDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-        ]
-        [NativeFunction("openal", EntryPoint = "alGenEffectsDirect")]
+        [NativeName("alGenFilters")]
+        [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
+        [NativeFunction("openal", EntryPoint = "alGenFilters")]
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static uint GenEffectsDirect(ContextHandle context)
+        public static uint GenFilter()
         {
-            uint effects = default;
-            GenEffectsDirect(context, 1, (uint*)&effects);
-            return effects;
+            uint filters = default;
+            GenFilters(1, (uint*)&filters);
+            return filters;
         }
 
-        [NativeName("alGenFilters")]
-        [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
-        [NativeFunction("openal", EntryPoint = "alGenFilters")]
+        [NativeName("alGenFiltersDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+        ]
+        [NativeFunction("openal", EntryPoint = "alGenFiltersDirect")]
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static uint GenFilter()
+        public static uint GenFilterDirect(ContextHandle context)
         {
             uint filters = default;
-            GenFilters(1, (uint*)&filters);
+            GenFiltersDirect(context, 1, (uint*)&filters);
             return filters;
         }
 
@@ -19251,32 +19267,32 @@ public static void GenFiltersDirect(ContextHandle context, int n, Ref<uint> filt
             }
         }
 
-        [NativeName("alGenFiltersDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-        ]
-        [NativeFunction("openal", EntryPoint = "alGenFiltersDirect")]
+        [NativeName("alGenSources")]
+        [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
+        [NativeFunction("openal", EntryPoint = "alGenSources")]
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static uint GenFiltersDirect(ContextHandle context)
+        public static uint GenSource()
         {
-            uint filters = default;
-            GenFiltersDirect(context, 1, (uint*)&filters);
-            return filters;
+            uint sources = default;
+            GenSources(1, (uint*)&sources);
+            return sources;
         }
 
-        [NativeName("alGenSources")]
-        [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
-        [NativeFunction("openal", EntryPoint = "alGenSources")]
+        [NativeName("alGenSourcesDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context"]),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context"])
+        ]
+        [NativeFunction("openal", EntryPoint = "alGenSourcesDirect")]
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static uint GenSource()
+        public static uint GenSourceDirect(ContextHandle context)
         {
             uint sources = default;
-            GenSources(1, (uint*)&sources);
+            GenSourcesDirect(context, 1, (uint*)&sources);
             return sources;
         }
 
@@ -19332,22 +19348,6 @@ public static void GenSourcesDirect(ContextHandle context, int n, Ref<uint> sour
             }
         }
 
-        [NativeName("alGenSourcesDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context"]),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context"])
-        ]
-        [NativeFunction("openal", EntryPoint = "alGenSourcesDirect")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static uint GenSourcesDirect(ContextHandle context)
-        {
-            uint sources = default;
-            GenSourcesDirect(context, 1, (uint*)&sources);
-            return sources;
-        }
-
         [NativeName("alGetAuxiliaryEffectSlotf")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
         [NativeFunction("openal", EntryPoint = "alGetAuxiliaryEffectSlotf")]
@@ -28604,6 +28604,26 @@ void IAL.DeleteAuxiliaryEffectSlot(uint effectslots) =>
     public static void DeleteAuxiliaryEffectSlot(uint effectslots) =>
         ThisThread.DeleteAuxiliaryEffectSlot(effectslots);
 
+    [NativeName("alDeleteAuxiliaryEffectSlotsDirect")]
+    [
+        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+    ]
+    [NativeFunction("openal", EntryPoint = "alDeleteAuxiliaryEffectSlotsDirect")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IAL.DeleteAuxiliaryEffectSlotDirect(ContextHandle context, uint effectslots) =>
+        ((IAL)this).DeleteAuxiliaryEffectSlotsDirect(context, 1, (uint*)&effectslots);
+
+    [NativeName("alDeleteAuxiliaryEffectSlotsDirect")]
+    [
+        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+    ]
+    [NativeFunction("openal", EntryPoint = "alDeleteAuxiliaryEffectSlotsDirect")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void DeleteAuxiliaryEffectSlotDirect(ContextHandle context, uint effectslots) =>
+        ThisThread.DeleteAuxiliaryEffectSlotDirect(context, effectslots);
+
     [NativeName("alDeleteAuxiliaryEffectSlots")]
     [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
     [NativeFunction("openal", EntryPoint = "alDeleteAuxiliaryEffectSlots")]
@@ -28706,26 +28726,6 @@ public static void DeleteAuxiliaryEffectSlotsDirect(
         Ref<uint> effectslots
     ) => ThisThread.DeleteAuxiliaryEffectSlotsDirect(context, n, effectslots);
 
-    [NativeName("alDeleteAuxiliaryEffectSlotsDirect")]
-    [
-        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-    ]
-    [NativeFunction("openal", EntryPoint = "alDeleteAuxiliaryEffectSlotsDirect")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IAL.DeleteAuxiliaryEffectSlotsDirect(ContextHandle context, uint effectslots) =>
-        ((IAL)this).DeleteAuxiliaryEffectSlotsDirect(context, 1, (uint*)&effectslots);
-
-    [NativeName("alDeleteAuxiliaryEffectSlotsDirect")]
-    [
-        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-    ]
-    [NativeFunction("openal", EntryPoint = "alDeleteAuxiliaryEffectSlotsDirect")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DeleteAuxiliaryEffectSlotsDirect(ContextHandle context, uint effectslots) =>
-        ThisThread.DeleteAuxiliaryEffectSlotsDirect(context, effectslots);
-
     [NativeName("alDeleteBuffers")]
     [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
     [NativeFunction("openal", EntryPoint = "alDeleteBuffers")]
@@ -28839,6 +28839,26 @@ public static void DeleteBuffersDirect(ContextHandle context, int n, Ref<uint> b
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static void DeleteEffect(uint effects) => ThisThread.DeleteEffect(effects);
 
+    [NativeName("alDeleteEffectsDirect")]
+    [
+        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+    ]
+    [NativeFunction("openal", EntryPoint = "alDeleteEffectsDirect")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IAL.DeleteEffectDirect(ContextHandle context, uint effects) =>
+        ((IAL)this).DeleteEffectsDirect(context, 1, (uint*)&effects);
+
+    [NativeName("alDeleteEffectsDirect")]
+    [
+        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+    ]
+    [NativeFunction("openal", EntryPoint = "alDeleteEffectsDirect")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void DeleteEffectDirect(ContextHandle context, uint effects) =>
+        ThisThread.DeleteEffectDirect(context, effects);
+
     [NativeName("alDeleteEffects")]
     [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
     [NativeFunction("openal", EntryPoint = "alDeleteEffects")]
@@ -28928,26 +28948,6 @@ void IAL.DeleteEffectsDirect(ContextHandle context, int n, Ref<uint> effects)
     public static void DeleteEffectsDirect(ContextHandle context, int n, Ref<uint> effects) =>
         ThisThread.DeleteEffectsDirect(context, n, effects);
 
-    [NativeName("alDeleteEffectsDirect")]
-    [
-        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-    ]
-    [NativeFunction("openal", EntryPoint = "alDeleteEffectsDirect")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IAL.DeleteEffectsDirect(ContextHandle context, uint effects) =>
-        ((IAL)this).DeleteEffectsDirect(context, 1, (uint*)&effects);
-
-    [NativeName("alDeleteEffectsDirect")]
-    [
-        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-    ]
-    [NativeFunction("openal", EntryPoint = "alDeleteEffectsDirect")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DeleteEffectsDirect(ContextHandle context, uint effects) =>
-        ThisThread.DeleteEffectsDirect(context, effects);
-
     [NativeName("alDeleteFilters")]
     [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
     [NativeFunction("openal", EntryPoint = "alDeleteFilters")]
@@ -28960,6 +28960,26 @@ public static void DeleteEffectsDirect(ContextHandle context, uint effects) =>
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static void DeleteFilter(uint filters) => ThisThread.DeleteFilter(filters);
 
+    [NativeName("alDeleteFiltersDirect")]
+    [
+        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+    ]
+    [NativeFunction("openal", EntryPoint = "alDeleteFiltersDirect")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IAL.DeleteFilterDirect(ContextHandle context, uint filters) =>
+        ((IAL)this).DeleteFiltersDirect(context, 1, (uint*)&filters);
+
+    [NativeName("alDeleteFiltersDirect")]
+    [
+        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+    ]
+    [NativeFunction("openal", EntryPoint = "alDeleteFiltersDirect")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void DeleteFilterDirect(ContextHandle context, uint filters) =>
+        ThisThread.DeleteFilterDirect(context, filters);
+
     [NativeName("alDeleteFilters")]
     [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
     [NativeFunction("openal", EntryPoint = "alDeleteFilters")]
@@ -29049,26 +29069,6 @@ void IAL.DeleteFiltersDirect(ContextHandle context, int n, Ref<uint> filters)
     public static void DeleteFiltersDirect(ContextHandle context, int n, Ref<uint> filters) =>
         ThisThread.DeleteFiltersDirect(context, n, filters);
 
-    [NativeName("alDeleteFiltersDirect")]
-    [
-        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-    ]
-    [NativeFunction("openal", EntryPoint = "alDeleteFiltersDirect")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IAL.DeleteFiltersDirect(ContextHandle context, uint filters) =>
-        ((IAL)this).DeleteFiltersDirect(context, 1, (uint*)&filters);
-
-    [NativeName("alDeleteFiltersDirect")]
-    [
-        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-    ]
-    [NativeFunction("openal", EntryPoint = "alDeleteFiltersDirect")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DeleteFiltersDirect(ContextHandle context, uint filters) =>
-        ThisThread.DeleteFiltersDirect(context, filters);
-
     [NativeName("alDeleteSources")]
     [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
     [NativeFunction("openal", EntryPoint = "alDeleteSources")]
@@ -29081,6 +29081,26 @@ public static void DeleteFiltersDirect(ContextHandle context, uint filters) =>
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static void DeleteSource(uint sources) => ThisThread.DeleteSource(sources);
 
+    [NativeName("alDeleteSourcesDirect")]
+    [
+        SupportedApiProfile("al", ["AL_EXT_direct_context"]),
+        SupportedApiProfile("alc", ["AL_EXT_direct_context"])
+    ]
+    [NativeFunction("openal", EntryPoint = "alDeleteSourcesDirect")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IAL.DeleteSourceDirect(ContextHandle context, uint sources) =>
+        ((IAL)this).DeleteSourcesDirect(context, 1, (uint*)&sources);
+
+    [NativeName("alDeleteSourcesDirect")]
+    [
+        SupportedApiProfile("al", ["AL_EXT_direct_context"]),
+        SupportedApiProfile("alc", ["AL_EXT_direct_context"])
+    ]
+    [NativeFunction("openal", EntryPoint = "alDeleteSourcesDirect")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void DeleteSourceDirect(ContextHandle context, uint sources) =>
+        ThisThread.DeleteSourceDirect(context, sources);
+
     [NativeName("alDeleteSources")]
     [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
     [NativeFunction("openal", EntryPoint = "alDeleteSources")]
@@ -29170,26 +29190,6 @@ void IAL.DeleteSourcesDirect(ContextHandle context, int n, Ref<uint> sources)
     public static void DeleteSourcesDirect(ContextHandle context, int n, Ref<uint> sources) =>
         ThisThread.DeleteSourcesDirect(context, n, sources);
 
-    [NativeName("alDeleteSourcesDirect")]
-    [
-        SupportedApiProfile("al", ["AL_EXT_direct_context"]),
-        SupportedApiProfile("alc", ["AL_EXT_direct_context"])
-    ]
-    [NativeFunction("openal", EntryPoint = "alDeleteSourcesDirect")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IAL.DeleteSourcesDirect(ContextHandle context, uint sources) =>
-        ((IAL)this).DeleteSourcesDirect(context, 1, (uint*)&sources);
-
-    [NativeName("alDeleteSourcesDirect")]
-    [
-        SupportedApiProfile("al", ["AL_EXT_direct_context"]),
-        SupportedApiProfile("alc", ["AL_EXT_direct_context"])
-    ]
-    [NativeFunction("openal", EntryPoint = "alDeleteSourcesDirect")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DeleteSourcesDirect(ContextHandle context, uint sources) =>
-        ThisThread.DeleteSourcesDirect(context, sources);
-
     [NativeName("alDisable")]
     [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
     [NativeFunction("openal", EntryPoint = "alDisable")]
@@ -30552,6 +30552,30 @@ uint IAL.GenAuxiliaryEffectSlot()
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static uint GenAuxiliaryEffectSlot() => ThisThread.GenAuxiliaryEffectSlot();
 
+    [NativeName("alGenAuxiliaryEffectSlotsDirect")]
+    [
+        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+    ]
+    [NativeFunction("openal", EntryPoint = "alGenAuxiliaryEffectSlotsDirect")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IAL.GenAuxiliaryEffectSlotDirect(ContextHandle context)
+    {
+        uint effectslots = default;
+        ((IAL)this).GenAuxiliaryEffectSlotsDirect(context, 1, (uint*)&effectslots);
+        return effectslots;
+    }
+
+    [NativeName("alGenAuxiliaryEffectSlotsDirect")]
+    [
+        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+    ]
+    [NativeFunction("openal", EntryPoint = "alGenAuxiliaryEffectSlotsDirect")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint GenAuxiliaryEffectSlotDirect(ContextHandle context) =>
+        ThisThread.GenAuxiliaryEffectSlotDirect(context);
+
     [NativeName("alGenAuxiliaryEffectSlots")]
     [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
     [NativeFunction("openal", EntryPoint = "alGenAuxiliaryEffectSlots")]
@@ -30651,30 +30675,6 @@ public static void GenAuxiliaryEffectSlotsDirect(
         Ref<uint> effectslots
     ) => ThisThread.GenAuxiliaryEffectSlotsDirect(context, n, effectslots);
 
-    [NativeName("alGenAuxiliaryEffectSlotsDirect")]
-    [
-        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-    ]
-    [NativeFunction("openal", EntryPoint = "alGenAuxiliaryEffectSlotsDirect")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IAL.GenAuxiliaryEffectSlotsDirect(ContextHandle context)
-    {
-        uint effectslots = default;
-        ((IAL)this).GenAuxiliaryEffectSlotsDirect(context, 1, (uint*)&effectslots);
-        return effectslots;
-    }
-
-    [NativeName("alGenAuxiliaryEffectSlotsDirect")]
-    [
-        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-    ]
-    [NativeFunction("openal", EntryPoint = "alGenAuxiliaryEffectSlotsDirect")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint GenAuxiliaryEffectSlotsDirect(ContextHandle context) =>
-        ThisThread.GenAuxiliaryEffectSlotsDirect(context);
-
     [NativeName("alGenBuffers")]
     [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
     [NativeFunction("openal", EntryPoint = "alGenBuffers")]
@@ -30797,6 +30797,30 @@ uint IAL.GenEffect()
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static uint GenEffect() => ThisThread.GenEffect();
 
+    [NativeName("alGenEffectsDirect")]
+    [
+        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+    ]
+    [NativeFunction("openal", EntryPoint = "alGenEffectsDirect")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IAL.GenEffectDirect(ContextHandle context)
+    {
+        uint effects = default;
+        ((IAL)this).GenEffectsDirect(context, 1, (uint*)&effects);
+        return effects;
+    }
+
+    [NativeName("alGenEffectsDirect")]
+    [
+        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+    ]
+    [NativeFunction("openal", EntryPoint = "alGenEffectsDirect")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint GenEffectDirect(ContextHandle context) =>
+        ThisThread.GenEffectDirect(context);
+
     [NativeName("alGenEffects")]
     [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
     [NativeFunction("openal", EntryPoint = "alGenEffects")]
@@ -30885,30 +30909,6 @@ void IAL.GenEffectsDirect(ContextHandle context, int n, Ref<uint> effects)
     public static void GenEffectsDirect(ContextHandle context, int n, Ref<uint> effects) =>
         ThisThread.GenEffectsDirect(context, n, effects);
 
-    [NativeName("alGenEffectsDirect")]
-    [
-        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-    ]
-    [NativeFunction("openal", EntryPoint = "alGenEffectsDirect")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IAL.GenEffectsDirect(ContextHandle context)
-    {
-        uint effects = default;
-        ((IAL)this).GenEffectsDirect(context, 1, (uint*)&effects);
-        return effects;
-    }
-
-    [NativeName("alGenEffectsDirect")]
-    [
-        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-    ]
-    [NativeFunction("openal", EntryPoint = "alGenEffectsDirect")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint GenEffectsDirect(ContextHandle context) =>
-        ThisThread.GenEffectsDirect(context);
-
     [NativeName("alGenFilters")]
     [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
     [NativeFunction("openal", EntryPoint = "alGenFilters")]
@@ -30926,6 +30926,30 @@ uint IAL.GenFilter()
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static uint GenFilter() => ThisThread.GenFilter();
 
+    [NativeName("alGenFiltersDirect")]
+    [
+        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+    ]
+    [NativeFunction("openal", EntryPoint = "alGenFiltersDirect")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IAL.GenFilterDirect(ContextHandle context)
+    {
+        uint filters = default;
+        ((IAL)this).GenFiltersDirect(context, 1, (uint*)&filters);
+        return filters;
+    }
+
+    [NativeName("alGenFiltersDirect")]
+    [
+        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+    ]
+    [NativeFunction("openal", EntryPoint = "alGenFiltersDirect")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint GenFilterDirect(ContextHandle context) =>
+        ThisThread.GenFilterDirect(context);
+
     [NativeName("alGenFilters")]
     [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
     [NativeFunction("openal", EntryPoint = "alGenFilters")]
@@ -31014,30 +31038,6 @@ void IAL.GenFiltersDirect(ContextHandle context, int n, Ref<uint> filters)
     public static void GenFiltersDirect(ContextHandle context, int n, Ref<uint> filters) =>
         ThisThread.GenFiltersDirect(context, n, filters);
 
-    [NativeName("alGenFiltersDirect")]
-    [
-        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-    ]
-    [NativeFunction("openal", EntryPoint = "alGenFiltersDirect")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IAL.GenFiltersDirect(ContextHandle context)
-    {
-        uint filters = default;
-        ((IAL)this).GenFiltersDirect(context, 1, (uint*)&filters);
-        return filters;
-    }
-
-    [NativeName("alGenFiltersDirect")]
-    [
-        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-    ]
-    [NativeFunction("openal", EntryPoint = "alGenFiltersDirect")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint GenFiltersDirect(ContextHandle context) =>
-        ThisThread.GenFiltersDirect(context);
-
     [NativeName("alGenSources")]
     [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
     [NativeFunction("openal", EntryPoint = "alGenSources")]
@@ -31055,6 +31055,30 @@ uint IAL.GenSource()
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static uint GenSource() => ThisThread.GenSource();
 
+    [NativeName("alGenSourcesDirect")]
+    [
+        SupportedApiProfile("al", ["AL_EXT_direct_context"]),
+        SupportedApiProfile("alc", ["AL_EXT_direct_context"])
+    ]
+    [NativeFunction("openal", EntryPoint = "alGenSourcesDirect")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IAL.GenSourceDirect(ContextHandle context)
+    {
+        uint sources = default;
+        ((IAL)this).GenSourcesDirect(context, 1, (uint*)&sources);
+        return sources;
+    }
+
+    [NativeName("alGenSourcesDirect")]
+    [
+        SupportedApiProfile("al", ["AL_EXT_direct_context"]),
+        SupportedApiProfile("alc", ["AL_EXT_direct_context"])
+    ]
+    [NativeFunction("openal", EntryPoint = "alGenSourcesDirect")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint GenSourceDirect(ContextHandle context) =>
+        ThisThread.GenSourceDirect(context);
+
     [NativeName("alGenSources")]
     [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
     [NativeFunction("openal", EntryPoint = "alGenSources")]
@@ -31143,30 +31167,6 @@ void IAL.GenSourcesDirect(ContextHandle context, int n, Ref<uint> sources)
     public static void GenSourcesDirect(ContextHandle context, int n, Ref<uint> sources) =>
         ThisThread.GenSourcesDirect(context, n, sources);
 
-    [NativeName("alGenSourcesDirect")]
-    [
-        SupportedApiProfile("al", ["AL_EXT_direct_context"]),
-        SupportedApiProfile("alc", ["AL_EXT_direct_context"])
-    ]
-    [NativeFunction("openal", EntryPoint = "alGenSourcesDirect")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IAL.GenSourcesDirect(ContextHandle context)
-    {
-        uint sources = default;
-        ((IAL)this).GenSourcesDirect(context, 1, (uint*)&sources);
-        return sources;
-    }
-
-    [NativeName("alGenSourcesDirect")]
-    [
-        SupportedApiProfile("al", ["AL_EXT_direct_context"]),
-        SupportedApiProfile("alc", ["AL_EXT_direct_context"])
-    ]
-    [NativeFunction("openal", EntryPoint = "alGenSourcesDirect")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint GenSourcesDirect(ContextHandle context) =>
-        ThisThread.GenSourcesDirect(context);
-
     [NativeName("alGetAuxiliaryEffectSlotf")]
     [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
     [NativeFunction("openal", EntryPoint = "alGetAuxiliaryEffectSlotf")]
diff --git a/sources/OpenAL/OpenAL/al/IAL.gen.cs b/sources/OpenAL/OpenAL/al/IAL.gen.cs
index 3b8e3e9179..669d756827 100644
--- a/sources/OpenAL/OpenAL/al/IAL.gen.cs
+++ b/sources/OpenAL/OpenAL/al/IAL.gen.cs
@@ -910,6 +910,17 @@ sbyte message
         [NativeFunction("openal", EntryPoint = "alDeleteAuxiliaryEffectSlots")]
         static abstract void DeleteAuxiliaryEffectSlot(uint effectslots);
 
+        [NativeName("alDeleteAuxiliaryEffectSlotsDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+        ]
+        [NativeFunction("openal", EntryPoint = "alDeleteAuxiliaryEffectSlotsDirect")]
+        static abstract void DeleteAuxiliaryEffectSlotDirect(
+            ContextHandle context,
+            uint effectslots
+        );
+
         [NativeName("alDeleteAuxiliaryEffectSlots")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
         [NativeFunction("openal", EntryPoint = "alDeleteAuxiliaryEffectSlots")]
@@ -944,17 +955,6 @@ static abstract void DeleteAuxiliaryEffectSlotsDirect(
             Ref<uint> effectslots
         );
 
-        [NativeName("alDeleteAuxiliaryEffectSlotsDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-        ]
-        [NativeFunction("openal", EntryPoint = "alDeleteAuxiliaryEffectSlotsDirect")]
-        static abstract void DeleteAuxiliaryEffectSlotsDirect(
-            ContextHandle context,
-            uint effectslots
-        );
-
         [NativeName("alDeleteBuffers")]
         [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
         [NativeFunction("openal", EntryPoint = "alDeleteBuffers")]
@@ -991,6 +991,14 @@ uint effectslots
         [NativeFunction("openal", EntryPoint = "alDeleteEffects")]
         static abstract void DeleteEffect(uint effects);
 
+        [NativeName("alDeleteEffectsDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+        ]
+        [NativeFunction("openal", EntryPoint = "alDeleteEffectsDirect")]
+        static abstract void DeleteEffectDirect(ContextHandle context, uint effects);
+
         [NativeName("alDeleteEffects")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
         [NativeFunction("openal", EntryPoint = "alDeleteEffects")]
@@ -1017,19 +1025,19 @@ uint effectslots
         [NativeFunction("openal", EntryPoint = "alDeleteEffectsDirect")]
         static abstract void DeleteEffectsDirect(ContextHandle context, int n, Ref<uint> effects);
 
-        [NativeName("alDeleteEffectsDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-        ]
-        [NativeFunction("openal", EntryPoint = "alDeleteEffectsDirect")]
-        static abstract void DeleteEffectsDirect(ContextHandle context, uint effects);
-
         [NativeName("alDeleteFilters")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
         [NativeFunction("openal", EntryPoint = "alDeleteFilters")]
         static abstract void DeleteFilter(uint filters);
 
+        [NativeName("alDeleteFiltersDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+        ]
+        [NativeFunction("openal", EntryPoint = "alDeleteFiltersDirect")]
+        static abstract void DeleteFilterDirect(ContextHandle context, uint filters);
+
         [NativeName("alDeleteFilters")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
         [NativeFunction("openal", EntryPoint = "alDeleteFilters")]
@@ -1056,19 +1064,19 @@ uint effectslots
         [NativeFunction("openal", EntryPoint = "alDeleteFiltersDirect")]
         static abstract void DeleteFiltersDirect(ContextHandle context, int n, Ref<uint> filters);
 
-        [NativeName("alDeleteFiltersDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-        ]
-        [NativeFunction("openal", EntryPoint = "alDeleteFiltersDirect")]
-        static abstract void DeleteFiltersDirect(ContextHandle context, uint filters);
-
         [NativeName("alDeleteSources")]
         [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
         [NativeFunction("openal", EntryPoint = "alDeleteSources")]
         static abstract void DeleteSource(uint sources);
 
+        [NativeName("alDeleteSourcesDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context"]),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context"])
+        ]
+        [NativeFunction("openal", EntryPoint = "alDeleteSourcesDirect")]
+        static abstract void DeleteSourceDirect(ContextHandle context, uint sources);
+
         [NativeName("alDeleteSources")]
         [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
         [NativeFunction("openal", EntryPoint = "alDeleteSources")]
@@ -1095,14 +1103,6 @@ uint effectslots
         [NativeFunction("openal", EntryPoint = "alDeleteSourcesDirect")]
         static abstract void DeleteSourcesDirect(ContextHandle context, int n, Ref<uint> sources);
 
-        [NativeName("alDeleteSourcesDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context"]),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context"])
-        ]
-        [NativeFunction("openal", EntryPoint = "alDeleteSourcesDirect")]
-        static abstract void DeleteSourcesDirect(ContextHandle context, uint sources);
-
         [NativeName("alDisable")]
         [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
         [NativeFunction("openal", EntryPoint = "alDisable")]
@@ -1660,6 +1660,14 @@ Ref<int> piValues
         [NativeFunction("openal", EntryPoint = "alGenAuxiliaryEffectSlots")]
         static abstract uint GenAuxiliaryEffectSlot();
 
+        [NativeName("alGenAuxiliaryEffectSlotsDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+        ]
+        [NativeFunction("openal", EntryPoint = "alGenAuxiliaryEffectSlotsDirect")]
+        static abstract uint GenAuxiliaryEffectSlotDirect(ContextHandle context);
+
         [NativeName("alGenAuxiliaryEffectSlots")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
         [NativeFunction("openal", EntryPoint = "alGenAuxiliaryEffectSlots")]
@@ -1694,14 +1702,6 @@ static abstract void GenAuxiliaryEffectSlotsDirect(
             Ref<uint> effectslots
         );
 
-        [NativeName("alGenAuxiliaryEffectSlotsDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-        ]
-        [NativeFunction("openal", EntryPoint = "alGenAuxiliaryEffectSlotsDirect")]
-        static abstract uint GenAuxiliaryEffectSlotsDirect(ContextHandle context);
-
         [NativeName("alGenBuffers")]
         [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
         [NativeFunction("openal", EntryPoint = "alGenBuffers")]
@@ -1738,6 +1738,14 @@ Ref<uint> effectslots
         [NativeFunction("openal", EntryPoint = "alGenEffects")]
         static abstract uint GenEffect();
 
+        [NativeName("alGenEffectsDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+        ]
+        [NativeFunction("openal", EntryPoint = "alGenEffectsDirect")]
+        static abstract uint GenEffectDirect(ContextHandle context);
+
         [NativeName("alGenEffects")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
         [NativeFunction("openal", EntryPoint = "alGenEffects")]
@@ -1764,19 +1772,19 @@ Ref<uint> effectslots
         [NativeFunction("openal", EntryPoint = "alGenEffectsDirect")]
         static abstract void GenEffectsDirect(ContextHandle context, int n, Ref<uint> effects);
 
-        [NativeName("alGenEffectsDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-        ]
-        [NativeFunction("openal", EntryPoint = "alGenEffectsDirect")]
-        static abstract uint GenEffectsDirect(ContextHandle context);
-
         [NativeName("alGenFilters")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
         [NativeFunction("openal", EntryPoint = "alGenFilters")]
         static abstract uint GenFilter();
 
+        [NativeName("alGenFiltersDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+        ]
+        [NativeFunction("openal", EntryPoint = "alGenFiltersDirect")]
+        static abstract uint GenFilterDirect(ContextHandle context);
+
         [NativeName("alGenFilters")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
         [NativeFunction("openal", EntryPoint = "alGenFilters")]
@@ -1803,19 +1811,19 @@ Ref<uint> effectslots
         [NativeFunction("openal", EntryPoint = "alGenFiltersDirect")]
         static abstract void GenFiltersDirect(ContextHandle context, int n, Ref<uint> filters);
 
-        [NativeName("alGenFiltersDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-        ]
-        [NativeFunction("openal", EntryPoint = "alGenFiltersDirect")]
-        static abstract uint GenFiltersDirect(ContextHandle context);
-
         [NativeName("alGenSources")]
         [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
         [NativeFunction("openal", EntryPoint = "alGenSources")]
         static abstract uint GenSource();
 
+        [NativeName("alGenSourcesDirect")]
+        [
+            SupportedApiProfile("al", ["AL_EXT_direct_context"]),
+            SupportedApiProfile("alc", ["AL_EXT_direct_context"])
+        ]
+        [NativeFunction("openal", EntryPoint = "alGenSourcesDirect")]
+        static abstract uint GenSourceDirect(ContextHandle context);
+
         [NativeName("alGenSources")]
         [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
         [NativeFunction("openal", EntryPoint = "alGenSources")]
@@ -1842,14 +1850,6 @@ Ref<uint> effectslots
         [NativeFunction("openal", EntryPoint = "alGenSourcesDirect")]
         static abstract void GenSourcesDirect(ContextHandle context, int n, Ref<uint> sources);
 
-        [NativeName("alGenSourcesDirect")]
-        [
-            SupportedApiProfile("al", ["AL_EXT_direct_context"]),
-            SupportedApiProfile("alc", ["AL_EXT_direct_context"])
-        ]
-        [NativeFunction("openal", EntryPoint = "alGenSourcesDirect")]
-        static abstract uint GenSourcesDirect(ContextHandle context);
-
         [NativeName("alGetAuxiliaryEffectSlotf")]
         [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
         [NativeFunction("openal", EntryPoint = "alGetAuxiliaryEffectSlotf")]
@@ -6959,6 +6959,14 @@ sbyte message
     [NativeFunction("openal", EntryPoint = "alDeleteAuxiliaryEffectSlots")]
     void DeleteAuxiliaryEffectSlot(uint effectslots);
 
+    [NativeName("alDeleteAuxiliaryEffectSlotsDirect")]
+    [
+        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+    ]
+    [NativeFunction("openal", EntryPoint = "alDeleteAuxiliaryEffectSlotsDirect")]
+    void DeleteAuxiliaryEffectSlotDirect(ContextHandle context, uint effectslots);
+
     [NativeName("alDeleteAuxiliaryEffectSlots")]
     [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
     [NativeFunction("openal", EntryPoint = "alDeleteAuxiliaryEffectSlots")]
@@ -6985,14 +6993,6 @@ sbyte message
     [NativeFunction("openal", EntryPoint = "alDeleteAuxiliaryEffectSlotsDirect")]
     void DeleteAuxiliaryEffectSlotsDirect(ContextHandle context, int n, Ref<uint> effectslots);
 
-    [NativeName("alDeleteAuxiliaryEffectSlotsDirect")]
-    [
-        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-    ]
-    [NativeFunction("openal", EntryPoint = "alDeleteAuxiliaryEffectSlotsDirect")]
-    void DeleteAuxiliaryEffectSlotsDirect(ContextHandle context, uint effectslots);
-
     [NativeName("alDeleteBuffers")]
     [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
     [NativeFunction("openal", EntryPoint = "alDeleteBuffers")]
@@ -7029,6 +7029,14 @@ sbyte message
     [NativeFunction("openal", EntryPoint = "alDeleteEffects")]
     void DeleteEffect(uint effects);
 
+    [NativeName("alDeleteEffectsDirect")]
+    [
+        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+    ]
+    [NativeFunction("openal", EntryPoint = "alDeleteEffectsDirect")]
+    void DeleteEffectDirect(ContextHandle context, uint effects);
+
     [NativeName("alDeleteEffects")]
     [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
     [NativeFunction("openal", EntryPoint = "alDeleteEffects")]
@@ -7055,19 +7063,19 @@ sbyte message
     [NativeFunction("openal", EntryPoint = "alDeleteEffectsDirect")]
     void DeleteEffectsDirect(ContextHandle context, int n, Ref<uint> effects);
 
-    [NativeName("alDeleteEffectsDirect")]
-    [
-        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-    ]
-    [NativeFunction("openal", EntryPoint = "alDeleteEffectsDirect")]
-    void DeleteEffectsDirect(ContextHandle context, uint effects);
-
     [NativeName("alDeleteFilters")]
     [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
     [NativeFunction("openal", EntryPoint = "alDeleteFilters")]
     void DeleteFilter(uint filters);
 
+    [NativeName("alDeleteFiltersDirect")]
+    [
+        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+    ]
+    [NativeFunction("openal", EntryPoint = "alDeleteFiltersDirect")]
+    void DeleteFilterDirect(ContextHandle context, uint filters);
+
     [NativeName("alDeleteFilters")]
     [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
     [NativeFunction("openal", EntryPoint = "alDeleteFilters")]
@@ -7094,19 +7102,19 @@ sbyte message
     [NativeFunction("openal", EntryPoint = "alDeleteFiltersDirect")]
     void DeleteFiltersDirect(ContextHandle context, int n, Ref<uint> filters);
 
-    [NativeName("alDeleteFiltersDirect")]
-    [
-        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-    ]
-    [NativeFunction("openal", EntryPoint = "alDeleteFiltersDirect")]
-    void DeleteFiltersDirect(ContextHandle context, uint filters);
-
     [NativeName("alDeleteSources")]
     [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
     [NativeFunction("openal", EntryPoint = "alDeleteSources")]
     void DeleteSource(uint sources);
 
+    [NativeName("alDeleteSourcesDirect")]
+    [
+        SupportedApiProfile("al", ["AL_EXT_direct_context"]),
+        SupportedApiProfile("alc", ["AL_EXT_direct_context"])
+    ]
+    [NativeFunction("openal", EntryPoint = "alDeleteSourcesDirect")]
+    void DeleteSourceDirect(ContextHandle context, uint sources);
+
     [NativeName("alDeleteSources")]
     [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
     [NativeFunction("openal", EntryPoint = "alDeleteSources")]
@@ -7133,14 +7141,6 @@ sbyte message
     [NativeFunction("openal", EntryPoint = "alDeleteSourcesDirect")]
     void DeleteSourcesDirect(ContextHandle context, int n, Ref<uint> sources);
 
-    [NativeName("alDeleteSourcesDirect")]
-    [
-        SupportedApiProfile("al", ["AL_EXT_direct_context"]),
-        SupportedApiProfile("alc", ["AL_EXT_direct_context"])
-    ]
-    [NativeFunction("openal", EntryPoint = "alDeleteSourcesDirect")]
-    void DeleteSourcesDirect(ContextHandle context, uint sources);
-
     [NativeName("alDisable")]
     [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
     [NativeFunction("openal", EntryPoint = "alDisable")]
@@ -7563,6 +7563,14 @@ Ref<int> piValues
     [NativeFunction("openal", EntryPoint = "alGenAuxiliaryEffectSlots")]
     uint GenAuxiliaryEffectSlot();
 
+    [NativeName("alGenAuxiliaryEffectSlotsDirect")]
+    [
+        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+    ]
+    [NativeFunction("openal", EntryPoint = "alGenAuxiliaryEffectSlotsDirect")]
+    uint GenAuxiliaryEffectSlotDirect(ContextHandle context);
+
     [NativeName("alGenAuxiliaryEffectSlots")]
     [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
     [NativeFunction("openal", EntryPoint = "alGenAuxiliaryEffectSlots")]
@@ -7589,14 +7597,6 @@ Ref<int> piValues
     [NativeFunction("openal", EntryPoint = "alGenAuxiliaryEffectSlotsDirect")]
     void GenAuxiliaryEffectSlotsDirect(ContextHandle context, int n, Ref<uint> effectslots);
 
-    [NativeName("alGenAuxiliaryEffectSlotsDirect")]
-    [
-        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-    ]
-    [NativeFunction("openal", EntryPoint = "alGenAuxiliaryEffectSlotsDirect")]
-    uint GenAuxiliaryEffectSlotsDirect(ContextHandle context);
-
     [NativeName("alGenBuffers")]
     [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
     [NativeFunction("openal", EntryPoint = "alGenBuffers")]
@@ -7633,6 +7633,14 @@ Ref<int> piValues
     [NativeFunction("openal", EntryPoint = "alGenEffects")]
     uint GenEffect();
 
+    [NativeName("alGenEffectsDirect")]
+    [
+        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+    ]
+    [NativeFunction("openal", EntryPoint = "alGenEffectsDirect")]
+    uint GenEffectDirect(ContextHandle context);
+
     [NativeName("alGenEffects")]
     [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
     [NativeFunction("openal", EntryPoint = "alGenEffects")]
@@ -7659,19 +7667,19 @@ Ref<int> piValues
     [NativeFunction("openal", EntryPoint = "alGenEffectsDirect")]
     void GenEffectsDirect(ContextHandle context, int n, Ref<uint> effects);
 
-    [NativeName("alGenEffectsDirect")]
-    [
-        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-    ]
-    [NativeFunction("openal", EntryPoint = "alGenEffectsDirect")]
-    uint GenEffectsDirect(ContextHandle context);
-
     [NativeName("alGenFilters")]
     [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
     [NativeFunction("openal", EntryPoint = "alGenFilters")]
     uint GenFilter();
 
+    [NativeName("alGenFiltersDirect")]
+    [
+        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
+        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
+    ]
+    [NativeFunction("openal", EntryPoint = "alGenFiltersDirect")]
+    uint GenFilterDirect(ContextHandle context);
+
     [NativeName("alGenFilters")]
     [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
     [NativeFunction("openal", EntryPoint = "alGenFilters")]
@@ -7698,19 +7706,19 @@ Ref<int> piValues
     [NativeFunction("openal", EntryPoint = "alGenFiltersDirect")]
     void GenFiltersDirect(ContextHandle context, int n, Ref<uint> filters);
 
-    [NativeName("alGenFiltersDirect")]
-    [
-        SupportedApiProfile("al", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true),
-        SupportedApiProfile("alc", ["AL_EXT_direct_context", "ALC_EXT_EFX"], RequireAll = true)
-    ]
-    [NativeFunction("openal", EntryPoint = "alGenFiltersDirect")]
-    uint GenFiltersDirect(ContextHandle context);
-
     [NativeName("alGenSources")]
     [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
     [NativeFunction("openal", EntryPoint = "alGenSources")]
     uint GenSource();
 
+    [NativeName("alGenSourcesDirect")]
+    [
+        SupportedApiProfile("al", ["AL_EXT_direct_context"]),
+        SupportedApiProfile("alc", ["AL_EXT_direct_context"])
+    ]
+    [NativeFunction("openal", EntryPoint = "alGenSourcesDirect")]
+    uint GenSourceDirect(ContextHandle context);
+
     [NativeName("alGenSources")]
     [SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
     [NativeFunction("openal", EntryPoint = "alGenSources")]
@@ -7737,14 +7745,6 @@ Ref<int> piValues
     [NativeFunction("openal", EntryPoint = "alGenSourcesDirect")]
     void GenSourcesDirect(ContextHandle context, int n, Ref<uint> sources);
 
-    [NativeName("alGenSourcesDirect")]
-    [
-        SupportedApiProfile("al", ["AL_EXT_direct_context"]),
-        SupportedApiProfile("alc", ["AL_EXT_direct_context"])
-    ]
-    [NativeFunction("openal", EntryPoint = "alGenSourcesDirect")]
-    uint GenSourcesDirect(ContextHandle context);
-
     [NativeName("alGetAuxiliaryEffectSlotf")]
     [SupportedApiProfile("al", ["ALC_EXT_EFX"]), SupportedApiProfile("alc", ["ALC_EXT_EFX"])]
     [NativeFunction("openal", EntryPoint = "alGetAuxiliaryEffectSlotf")]
diff --git a/sources/OpenGL/OpenGL/gl/GL.gen.cs b/sources/OpenGL/OpenGL/gl/GL.gen.cs
index f29275bbe0..b63d475d3f 100644
--- a/sources/OpenGL/OpenGL/gl/GL.gen.cs
+++ b/sources/OpenGL/OpenGL/gl/GL.gen.cs
@@ -15747,6 +15747,17 @@ public static void CreateBuffers(uint n, Ref<uint> buffers)
             }
         }
 
+        [NativeName("glCreateCommandListsNV")]
+        [SupportedApiProfile("gl", ["GL_NV_command_list"])]
+        [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
+        [NativeFunction("opengl", EntryPoint = "glCreateCommandListsNV")]
+        public static uint CreateCommandListNV()
+        {
+            uint lists = default;
+            CreateCommandListsNV(1, (uint*)&lists);
+            return lists;
+        }
+
         [NativeName("glCreateCommandListsNV")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glCreateCommandListsNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
@@ -15768,17 +15779,6 @@ public static void CreateCommandListsNV(uint n, Ref<uint> lists)
             }
         }
 
-        [NativeName("glCreateCommandListsNV")]
-        [SupportedApiProfile("gl", ["GL_NV_command_list"])]
-        [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
-        [NativeFunction("opengl", EntryPoint = "glCreateCommandListsNV")]
-        public static uint CreateCommandListsNV()
-        {
-            uint lists = default;
-            CreateCommandListsNV(1, (uint*)&lists);
-            return lists;
-        }
-
         [NativeName("glCreateFramebuffers")]
         [SupportedApiProfile(
             "gl",
@@ -15835,6 +15835,17 @@ public static void CreateFramebuffers(uint n, Ref<uint> framebuffers)
             }
         }
 
+        [NativeName("glCreateMemoryObjectsEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
+        [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])]
+        [NativeFunction("opengl", EntryPoint = "glCreateMemoryObjectsEXT")]
+        public static uint CreateMemoryObjectEXT()
+        {
+            uint memoryObjects = default;
+            CreateMemoryObjectsEXT(1, (uint*)&memoryObjects);
+            return memoryObjects;
+        }
+
         [NativeName("glCreateMemoryObjectsEXT")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glCreateMemoryObjectsEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
@@ -15856,17 +15867,6 @@ public static void CreateMemoryObjectsEXT(uint n, Ref<uint> memoryObjects)
             }
         }
 
-        [NativeName("glCreateMemoryObjectsEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
-        [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])]
-        [NativeFunction("opengl", EntryPoint = "glCreateMemoryObjectsEXT")]
-        public static uint CreateMemoryObjectsEXT()
-        {
-            uint memoryObjects = default;
-            CreateMemoryObjectsEXT(1, (uint*)&memoryObjects);
-            return memoryObjects;
-        }
-
         [NativeName("glCreatePerfQueryINTEL")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glCreatePerfQueryINTEL")]
         [SupportedApiProfile("gl", ["GL_INTEL_performance_query"])]
@@ -16187,6 +16187,17 @@ public static void CreateSamplers(uint n, Ref<uint> samplers)
             }
         }
 
+        [NativeName("glCreateSemaphoresNV")]
+        [SupportedApiProfile("gl", ["GL_NV_timeline_semaphore"])]
+        [SupportedApiProfile("gles2", ["GL_NV_timeline_semaphore"])]
+        [NativeFunction("opengl", EntryPoint = "glCreateSemaphoresNV")]
+        public static uint CreateSemaphoreNV()
+        {
+            uint semaphores = default;
+            CreateSemaphoresNV(1, (uint*)&semaphores);
+            return semaphores;
+        }
+
         [NativeName("glCreateSemaphoresNV")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glCreateSemaphoresNV")]
         [SupportedApiProfile("gl", ["GL_NV_timeline_semaphore"])]
@@ -16208,17 +16219,6 @@ public static void CreateSemaphoresNV(uint n, Ref<uint> semaphores)
             }
         }
 
-        [NativeName("glCreateSemaphoresNV")]
-        [SupportedApiProfile("gl", ["GL_NV_timeline_semaphore"])]
-        [SupportedApiProfile("gles2", ["GL_NV_timeline_semaphore"])]
-        [NativeFunction("opengl", EntryPoint = "glCreateSemaphoresNV")]
-        public static uint CreateSemaphoresNV()
-        {
-            uint semaphores = default;
-            CreateSemaphoresNV(1, (uint*)&semaphores);
-            return semaphores;
-        }
-
         [NativeName("glCreateShader")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glCreateShader")]
         [SupportedApiProfile(
@@ -16445,6 +16445,17 @@ Ref2D<sbyte> strings
             }
         }
 
+        [NativeName("glCreateStatesNV")]
+        [SupportedApiProfile("gl", ["GL_NV_command_list"])]
+        [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
+        [NativeFunction("opengl", EntryPoint = "glCreateStatesNV")]
+        public static uint CreateStateNV()
+        {
+            uint states = default;
+            CreateStatesNV(1, (uint*)&states);
+            return states;
+        }
+
         [NativeName("glCreateStatesNV")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glCreateStatesNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
@@ -16466,17 +16477,6 @@ public static void CreateStatesNV(uint n, Ref<uint> states)
             }
         }
 
-        [NativeName("glCreateStatesNV")]
-        [SupportedApiProfile("gl", ["GL_NV_command_list"])]
-        [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
-        [NativeFunction("opengl", EntryPoint = "glCreateStatesNV")]
-        public static uint CreateStatesNV()
-        {
-            uint states = default;
-            CreateStatesNV(1, (uint*)&states);
-            return states;
-        }
-
         [NativeName("glCreateSyncFromCLeventARB")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glCreateSyncFromCLeventARB")]
         [SupportedApiProfile("gl", ["GL_ARB_cl_event"])]
@@ -17663,6 +17663,11 @@ public static void DeformSGIX(Constant<uint, GLEnum, FfdMaskSGIX> mask) =>
         [NativeFunction("opengl", EntryPoint = "glDeleteBuffers")]
         public static void DeleteBuffer(uint buffers) => DeleteBuffers(1, (uint*)&buffers);
 
+        [NativeName("glDeleteBuffersARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteBuffersARB")]
+        public static void DeleteBufferARB(uint buffers) => DeleteBuffersARB(1, (uint*)&buffers);
+
         [NativeName("glDeleteBuffers")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteBuffers")]
         [SupportedApiProfile(
@@ -17791,10 +17796,12 @@ public static void DeleteBuffersARB(uint n, Ref<uint> buffers)
             }
         }
 
-        [NativeName("glDeleteBuffersARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteBuffersARB")]
-        public static void DeleteBuffersARB(uint buffers) => DeleteBuffersARB(1, (uint*)&buffers);
+        [NativeName("glDeleteCommandListsNV")]
+        [SupportedApiProfile("gl", ["GL_NV_command_list"])]
+        [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteCommandListsNV")]
+        public static void DeleteCommandListNV(uint lists) =>
+            DeleteCommandListsNV(1, (uint*)&lists);
 
         [NativeName("glDeleteCommandListsNV")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteCommandListsNV")]
@@ -17817,12 +17824,17 @@ public static void DeleteCommandListsNV(uint n, Ref<uint> lists)
             }
         }
 
-        [NativeName("glDeleteCommandListsNV")]
-        [SupportedApiProfile("gl", ["GL_NV_command_list"])]
-        [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteCommandListsNV")]
-        public static void DeleteCommandListsNV(uint lists) =>
-            DeleteCommandListsNV(1, (uint*)&lists);
+        [NativeName("glDeleteFencesAPPLE")]
+        [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteFencesAPPLE")]
+        public static void DeleteFenceAPPLE(uint fences) => DeleteFencesAPPLE(1, (uint*)&fences);
+
+        [NativeName("glDeleteFencesNV")]
+        [SupportedApiProfile("gl", ["GL_NV_fence"])]
+        [SupportedApiProfile("gles2", ["GL_NV_fence"])]
+        [SupportedApiProfile("gles1", ["GL_NV_fence"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteFencesNV")]
+        public static void DeleteFenceNV(uint fences) => DeleteFencesNV(1, (uint*)&fences);
 
         [NativeName("glDeleteFencesAPPLE")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteFencesAPPLE")]
@@ -17843,11 +17855,6 @@ public static void DeleteFencesAPPLE(uint n, Ref<uint> fences)
             }
         }
 
-        [NativeName("glDeleteFencesAPPLE")]
-        [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteFencesAPPLE")]
-        public static void DeleteFencesAPPLE(uint fences) => DeleteFencesAPPLE(1, (uint*)&fences);
-
         [NativeName("glDeleteFencesNV")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteFencesNV")]
         [SupportedApiProfile("gl", ["GL_NV_fence"])]
@@ -17871,13 +17878,6 @@ public static void DeleteFencesNV(uint n, Ref<uint> fences)
             }
         }
 
-        [NativeName("glDeleteFencesNV")]
-        [SupportedApiProfile("gl", ["GL_NV_fence"])]
-        [SupportedApiProfile("gles2", ["GL_NV_fence"])]
-        [SupportedApiProfile("gles1", ["GL_NV_fence"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteFencesNV")]
-        public static void DeleteFencesNV(uint fences) => DeleteFencesNV(1, (uint*)&fences);
-
         [NativeName("glDeleteFragmentShaderATI")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteFragmentShaderATI")]
         [SupportedApiProfile("gl", ["GL_ATI_fragment_shader"])]
@@ -17929,6 +17929,18 @@ public static void DeleteFencesNV(uint n, Ref<uint> fences)
         public static void DeleteFramebuffer(uint framebuffers) =>
             DeleteFramebuffers(1, (uint*)&framebuffers);
 
+        [NativeName("glDeleteFramebuffersEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersEXT")]
+        public static void DeleteFramebufferEXT(uint framebuffers) =>
+            DeleteFramebuffersEXT(1, (uint*)&framebuffers);
+
+        [NativeName("glDeleteFramebuffersOES")]
+        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")]
+        public static void DeleteFramebufferOES(uint framebuffers) =>
+            DeleteFramebuffersOES(1, (uint*)&framebuffers);
+
         [NativeName("glDeleteFramebuffers")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteFramebuffers")]
         [SupportedApiProfile(
@@ -18047,12 +18059,6 @@ public static void DeleteFramebuffersEXT(uint n, Ref<uint> framebuffers)
             }
         }
 
-        [NativeName("glDeleteFramebuffersEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersEXT")]
-        public static void DeleteFramebuffersEXT(uint framebuffers) =>
-            DeleteFramebuffersEXT(1, (uint*)&framebuffers);
-
         [NativeName("glDeleteFramebuffersOES")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteFramebuffersOES")]
         [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
@@ -18072,12 +18078,6 @@ public static void DeleteFramebuffersOES(uint n, Ref<uint> framebuffers)
             }
         }
 
-        [NativeName("glDeleteFramebuffersOES")]
-        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")]
-        public static void DeleteFramebuffersOES(uint framebuffers) =>
-            DeleteFramebuffersOES(1, (uint*)&framebuffers);
-
         [NativeName("glDeleteLists")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteLists")]
         [SupportedApiProfile(
@@ -18107,6 +18107,13 @@ public static void DeleteFramebuffersOES(uint framebuffers) =>
         )]
         public static extern void DeleteLists(uint list, uint range);
 
+        [NativeName("glDeleteMemoryObjectsEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
+        [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteMemoryObjectsEXT")]
+        public static void DeleteMemoryObjectEXT(uint memoryObjects) =>
+            DeleteMemoryObjectsEXT(1, (uint*)&memoryObjects);
+
         [NativeName("glDeleteMemoryObjectsEXT")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteMemoryObjectsEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
@@ -18128,12 +18135,11 @@ public static void DeleteMemoryObjectsEXT(uint n, Ref<uint> memoryObjects)
             }
         }
 
-        [NativeName("glDeleteMemoryObjectsEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
-        [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteMemoryObjectsEXT")]
-        public static void DeleteMemoryObjectsEXT(uint memoryObjects) =>
-            DeleteMemoryObjectsEXT(1, (uint*)&memoryObjects);
+        [NativeName("glDeleteNamesAMD")]
+        [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteNamesAMD")]
+        public static void DeleteNameAMD(uint identifier, uint names) =>
+            DeleteNamesAMD(identifier, 1, (uint*)&names);
 
         [NativeName("glDeleteNamedStringARB")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteNamedStringARB")]
@@ -18182,12 +18188,6 @@ public static void DeleteNamesAMD(uint identifier, uint num, Ref<uint> names)
             }
         }
 
-        [NativeName("glDeleteNamesAMD")]
-        [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteNamesAMD")]
-        public static void DeleteNamesAMD(uint identifier, uint names) =>
-            DeleteNamesAMD(identifier, 1, (uint*)&names);
-
         [NativeName("glDeleteObjectARB")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteObjectARB")]
         [SupportedApiProfile("gl", ["GL_ARB_shader_objects"])]
@@ -18215,7 +18215,7 @@ public static void DeleteOcclusionQueriesNV(uint n, Ref<uint> ids)
         [NativeName("glDeleteOcclusionQueriesNV")]
         [SupportedApiProfile("gl", ["GL_NV_occlusion_query"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteOcclusionQueriesNV")]
-        public static void DeleteOcclusionQueriesNV(uint ids) =>
+        public static void DeleteOcclusionQueryNV(uint ids) =>
             DeleteOcclusionQueriesNV(1, (uint*)&ids);
 
         [NativeName("glDeletePathsNV")]
@@ -18225,6 +18225,18 @@ public static void DeleteOcclusionQueriesNV(uint ids) =>
         [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])]
         public static extern void DeletePathNV(uint path, uint range);
 
+        [NativeName("glDeletePerfMonitorsAMD")]
+        [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
+        [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
+        [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
+        [NativeFunction("opengl", EntryPoint = "glDeletePerfMonitorsAMD")]
+        public static uint DeletePerfMonitorAMD()
+        {
+            uint monitors = default;
+            DeletePerfMonitorsAMD(1, (uint*)&monitors);
+            return monitors;
+        }
+
         [NativeName("glDeletePerfMonitorsAMD")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeletePerfMonitorsAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
@@ -18248,18 +18260,6 @@ public static void DeletePerfMonitorsAMD(uint n, Ref<uint> monitors)
             }
         }
 
-        [NativeName("glDeletePerfMonitorsAMD")]
-        [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
-        [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
-        [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
-        [NativeFunction("opengl", EntryPoint = "glDeletePerfMonitorsAMD")]
-        public static uint DeletePerfMonitorsAMD()
-        {
-            uint monitors = default;
-            DeletePerfMonitorsAMD(1, (uint*)&monitors);
-            return monitors;
-        }
-
         [NativeName("glDeletePerfQueryINTEL")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeletePerfQueryINTEL")]
         [SupportedApiProfile("gl", ["GL_INTEL_performance_query"])]
@@ -18345,6 +18345,12 @@ public static uint DeletePerfMonitorsAMD()
         public static void DeleteProgramPipeline(uint pipelines) =>
             DeleteProgramPipelines(1, (uint*)&pipelines);
 
+        [NativeName("glDeleteProgramPipelinesEXT")]
+        [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteProgramPipelinesEXT")]
+        public static void DeleteProgramPipelineEXT(uint pipelines) =>
+            DeleteProgramPipelinesEXT(1, (uint*)&pipelines);
+
         [NativeName("glDeleteProgramPipelines")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteProgramPipelines")]
         [SupportedApiProfile(
@@ -18433,12 +18439,6 @@ public static void DeleteProgramPipelinesEXT(uint n, Ref<uint> pipelines)
             }
         }
 
-        [NativeName("glDeleteProgramPipelinesEXT")]
-        [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteProgramPipelinesEXT")]
-        public static void DeleteProgramPipelinesEXT(uint pipelines) =>
-            DeleteProgramPipelinesEXT(1, (uint*)&pipelines);
-
         [NativeName("glDeleteProgramsARB")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteProgramsARB")]
         [SupportedApiProfile("gl", ["GL_ARB_fragment_program", "GL_ARB_vertex_program"])]
@@ -18603,11 +18603,6 @@ public static void DeleteQueriesARB(uint n, Ref<uint> ids)
             }
         }
 
-        [NativeName("glDeleteQueriesARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteQueriesARB")]
-        public static void DeleteQueriesARB(uint ids) => DeleteQueriesARB(1, (uint*)&ids);
-
         [NativeName("glDeleteQueriesEXT")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteQueriesEXT")]
         [SupportedApiProfile(
@@ -18633,14 +18628,6 @@ public static void DeleteQueriesEXT(uint n, Ref<uint> ids)
             }
         }
 
-        [NativeName("glDeleteQueriesEXT")]
-        [SupportedApiProfile(
-            "gles2",
-            ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
-        )]
-        [NativeFunction("opengl", EntryPoint = "glDeleteQueriesEXT")]
-        public static void DeleteQueriesEXT(uint ids) => DeleteQueriesEXT(1, (uint*)&ids);
-
         [NativeName("glDeleteQueries")]
         [SupportedApiProfile(
             "gl",
@@ -18685,6 +18672,19 @@ public static void DeleteQueriesEXT(uint n, Ref<uint> ids)
         [NativeFunction("opengl", EntryPoint = "glDeleteQueries")]
         public static void DeleteQuery(uint ids) => DeleteQueries(1, (uint*)&ids);
 
+        [NativeName("glDeleteQueriesARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteQueriesARB")]
+        public static void DeleteQueryARB(uint ids) => DeleteQueriesARB(1, (uint*)&ids);
+
+        [NativeName("glDeleteQueriesEXT")]
+        [SupportedApiProfile(
+            "gles2",
+            ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
+        )]
+        [NativeFunction("opengl", EntryPoint = "glDeleteQueriesEXT")]
+        public static void DeleteQueryEXT(uint ids) => DeleteQueriesEXT(1, (uint*)&ids);
+
         [NativeName("glDeleteQueryResourceTagNV")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteQueryResourceTagNV")]
         [SupportedApiProfile("gl", ["GL_NV_query_resource_tag"])]
@@ -18756,6 +18756,18 @@ public static void DeleteQueryResourceTagNV(int tagIds) =>
         public static void DeleteRenderbuffer(uint renderbuffers) =>
             DeleteRenderbuffers(1, (uint*)&renderbuffers);
 
+        [NativeName("glDeleteRenderbuffersEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersEXT")]
+        public static void DeleteRenderbufferEXT(uint renderbuffers) =>
+            DeleteRenderbuffersEXT(1, (uint*)&renderbuffers);
+
+        [NativeName("glDeleteRenderbuffersOES")]
+        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")]
+        public static void DeleteRenderbufferOES(uint renderbuffers) =>
+            DeleteRenderbuffersOES(1, (uint*)&renderbuffers);
+
         [NativeName("glDeleteRenderbuffers")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteRenderbuffers")]
         [SupportedApiProfile(
@@ -18874,12 +18886,6 @@ public static void DeleteRenderbuffersEXT(uint n, Ref<uint> renderbuffers)
             }
         }
 
-        [NativeName("glDeleteRenderbuffersEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersEXT")]
-        public static void DeleteRenderbuffersEXT(uint renderbuffers) =>
-            DeleteRenderbuffersEXT(1, (uint*)&renderbuffers);
-
         [NativeName("glDeleteRenderbuffersOES")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteRenderbuffersOES")]
         [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
@@ -18899,12 +18905,6 @@ public static void DeleteRenderbuffersOES(uint n, Ref<uint> renderbuffers)
             }
         }
 
-        [NativeName("glDeleteRenderbuffersOES")]
-        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")]
-        public static void DeleteRenderbuffersOES(uint renderbuffers) =>
-            DeleteRenderbuffersOES(1, (uint*)&renderbuffers);
-
         [NativeName("glDeleteSamplers")]
         [SupportedApiProfile(
             "gl",
@@ -19046,6 +19046,13 @@ public static void DeleteSamplers(uint count, Ref<uint> samplers)
             }
         }
 
+        [NativeName("glDeleteSemaphoresEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
+        [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteSemaphoresEXT")]
+        public static void DeleteSemaphoreEXT(uint semaphores) =>
+            DeleteSemaphoresEXT(1, (uint*)&semaphores);
+
         [NativeName("glDeleteSemaphoresEXT")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteSemaphoresEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
@@ -19067,13 +19074,6 @@ public static void DeleteSemaphoresEXT(uint n, Ref<uint> semaphores)
             }
         }
 
-        [NativeName("glDeleteSemaphoresEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
-        [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteSemaphoresEXT")]
-        public static void DeleteSemaphoresEXT(uint semaphores) =>
-            DeleteSemaphoresEXT(1, (uint*)&semaphores);
-
         [NativeName("glDeleteShader")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteShader")]
         [SupportedApiProfile(
@@ -19121,6 +19121,12 @@ public static void DeleteSemaphoresEXT(uint semaphores) =>
         )]
         public static extern void DeleteShader(uint shader);
 
+        [NativeName("glDeleteStatesNV")]
+        [SupportedApiProfile("gl", ["GL_NV_command_list"])]
+        [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteStatesNV")]
+        public static void DeleteStateNV(uint states) => DeleteStatesNV(1, (uint*)&states);
+
         [NativeName("glDeleteStatesNV")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteStatesNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
@@ -19142,12 +19148,6 @@ public static void DeleteStatesNV(uint n, Ref<uint> states)
             }
         }
 
-        [NativeName("glDeleteStatesNV")]
-        [SupportedApiProfile("gl", ["GL_NV_command_list"])]
-        [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteStatesNV")]
-        public static void DeleteStatesNV(uint states) => DeleteStatesNV(1, (uint*)&states);
-
         [NativeName("glDeleteSync")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteSync")]
         [SupportedApiProfile(
@@ -19308,6 +19308,12 @@ public static void DeleteSyncAPPLE(Ref<Sync> sync)
         [NativeFunction("opengl", EntryPoint = "glDeleteTextures")]
         public static void DeleteTexture(uint textures) => DeleteTextures(1, (uint*)&textures);
 
+        [NativeName("glDeleteTexturesEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_texture_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteTexturesEXT")]
+        public static void DeleteTextureEXT(uint textures) =>
+            DeleteTexturesEXT(1, (uint*)&textures);
+
         [NativeName("glDeleteTextures")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteTextures")]
         [SupportedApiProfile(
@@ -19452,12 +19458,6 @@ public static void DeleteTexturesEXT(uint n, Ref<uint> textures)
             }
         }
 
-        [NativeName("glDeleteTexturesEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_texture_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteTexturesEXT")]
-        public static void DeleteTexturesEXT(uint textures) =>
-            DeleteTexturesEXT(1, (uint*)&textures);
-
         [NativeName("glDeleteTransformFeedbacks")]
         [SupportedApiProfile(
             "gl",
@@ -19491,6 +19491,12 @@ public static void DeleteTexturesEXT(uint textures) =>
         public static void DeleteTransformFeedback(uint ids) =>
             DeleteTransformFeedbacks(1, (uint*)&ids);
 
+        [NativeName("glDeleteTransformFeedbacksNV")]
+        [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteTransformFeedbacksNV")]
+        public static void DeleteTransformFeedbackNV(uint ids) =>
+            DeleteTransformFeedbacksNV(1, (uint*)&ids);
+
         [NativeName("glDeleteTransformFeedbacks")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteTransformFeedbacks")]
         [SupportedApiProfile(
@@ -19583,12 +19589,6 @@ public static void DeleteTransformFeedbacksNV(uint n, Ref<uint> ids)
             }
         }
 
-        [NativeName("glDeleteTransformFeedbacksNV")]
-        [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteTransformFeedbacksNV")]
-        public static void DeleteTransformFeedbacksNV(uint ids) =>
-            DeleteTransformFeedbacksNV(1, (uint*)&ids);
-
         [NativeName("glDeleteVertexArrays")]
         [SupportedApiProfile(
             "gl",
@@ -19629,6 +19629,19 @@ public static void DeleteTransformFeedbacksNV(uint ids) =>
         [NativeFunction("opengl", EntryPoint = "glDeleteVertexArrays")]
         public static void DeleteVertexArray(uint arrays) => DeleteVertexArrays(1, (uint*)&arrays);
 
+        [NativeName("glDeleteVertexArraysAPPLE")]
+        [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysAPPLE")]
+        public static void DeleteVertexArrayAPPLE(uint arrays) =>
+            DeleteVertexArraysAPPLE(1, (uint*)&arrays);
+
+        [NativeName("glDeleteVertexArraysOES")]
+        [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
+        [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")]
+        public static void DeleteVertexArrayOES(uint arrays) =>
+            DeleteVertexArraysOES(1, (uint*)&arrays);
+
         [NativeName("glDeleteVertexArrays")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteVertexArrays")]
         [SupportedApiProfile(
@@ -19737,12 +19750,6 @@ public static void DeleteVertexArraysAPPLE(uint n, Ref<uint> arrays)
             }
         }
 
-        [NativeName("glDeleteVertexArraysAPPLE")]
-        [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysAPPLE")]
-        public static void DeleteVertexArraysAPPLE(uint arrays) =>
-            DeleteVertexArraysAPPLE(1, (uint*)&arrays);
-
         [NativeName("glDeleteVertexArraysOES")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteVertexArraysOES")]
         [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
@@ -19764,13 +19771,6 @@ public static void DeleteVertexArraysOES(uint n, Ref<uint> arrays)
             }
         }
 
-        [NativeName("glDeleteVertexArraysOES")]
-        [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
-        [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")]
-        public static void DeleteVertexArraysOES(uint arrays) =>
-            DeleteVertexArraysOES(1, (uint*)&arrays);
-
         [NativeName("glDeleteVertexShaderEXT")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDeleteVertexShaderEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])]
@@ -21703,6 +21703,48 @@ public static void DrawBuffer(Constant<uint, GLEnum, DrawBufferMode> buf) =>
         public static void DrawBuffer(DrawBufferMode bufs) =>
             DrawBuffers(1, (uint*)(DrawBufferMode*)&bufs);
 
+        [NativeName("glDrawBuffersARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
+        public static void DrawBufferARB(uint bufs) => DrawBuffersARB(1, (uint*)&bufs);
+
+        [NativeName("glDrawBuffersARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
+        public static void DrawBufferARB(GLEnum bufs) => DrawBuffersARB(1, (uint*)(GLEnum*)&bufs);
+
+        [NativeName("glDrawBuffersARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
+        public static void DrawBufferARB(DrawBufferMode bufs) =>
+            DrawBuffersARB(1, (uint*)(DrawBufferMode*)&bufs);
+
+        [NativeName("glDrawBuffersATI")]
+        [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
+        public static void DrawBufferATI(uint bufs) => DrawBuffersATI(1, (uint*)&bufs);
+
+        [NativeName("glDrawBuffersATI")]
+        [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
+        public static void DrawBufferATI(GLEnum bufs) => DrawBuffersATI(1, (uint*)(GLEnum*)&bufs);
+
+        [NativeName("glDrawBuffersATI")]
+        [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
+        public static void DrawBufferATI(DrawBufferMode bufs) =>
+            DrawBuffersATI(1, (uint*)(DrawBufferMode*)&bufs);
+
+        [NativeName("glDrawBuffersEXT")]
+        [SupportedApiProfile("gles2", ["GL_EXT_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersEXT")]
+        public static void DrawBufferEXT(uint bufs) => DrawBuffersEXT(1, (uint*)&bufs);
+
+        [NativeName("glDrawBuffersNV")]
+        [SupportedApiProfile("gles2", ["GL_NV_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersNV")]
+        public static void DrawBufferNV(uint bufs) => DrawBuffersNV(1, (uint*)&bufs);
+
         [NativeName("glDrawBuffers")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDrawBuffers")]
         [SupportedApiProfile(
@@ -21917,11 +21959,6 @@ public static void DrawBuffersARB(uint n, Ref<uint> bufs)
             }
         }
 
-        [NativeName("glDrawBuffersARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
-        public static void DrawBuffersARB(uint bufs) => DrawBuffersARB(1, (uint*)&bufs);
-
         [NativeName("glDrawBuffersARB")]
         [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
         [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
@@ -21936,11 +21973,6 @@ public static void DrawBuffersARB(uint n, Ref<GLEnum> bufs)
             }
         }
 
-        [NativeName("glDrawBuffersARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
-        public static void DrawBuffersARB(GLEnum bufs) => DrawBuffersARB(1, (uint*)(GLEnum*)&bufs);
-
         [NativeName("glDrawBuffersARB")]
         [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
         [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
@@ -21955,12 +21987,6 @@ public static void DrawBuffersARB(uint n, Ref<DrawBufferMode> bufs)
             }
         }
 
-        [NativeName("glDrawBuffersARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
-        public static void DrawBuffersARB(DrawBufferMode bufs) =>
-            DrawBuffersARB(1, (uint*)(DrawBufferMode*)&bufs);
-
         [NativeName("glDrawBuffersATI")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDrawBuffersATI")]
         [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
@@ -21980,11 +22006,6 @@ public static void DrawBuffersATI(uint n, Ref<uint> bufs)
             }
         }
 
-        [NativeName("glDrawBuffersATI")]
-        [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
-        public static void DrawBuffersATI(uint bufs) => DrawBuffersATI(1, (uint*)&bufs);
-
         [NativeName("glDrawBuffersATI")]
         [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
         [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
@@ -21999,11 +22020,6 @@ public static void DrawBuffersATI(uint n, Ref<GLEnum> bufs)
             }
         }
 
-        [NativeName("glDrawBuffersATI")]
-        [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
-        public static void DrawBuffersATI(GLEnum bufs) => DrawBuffersATI(1, (uint*)(GLEnum*)&bufs);
-
         [NativeName("glDrawBuffersATI")]
         [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
         [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
@@ -22018,12 +22034,6 @@ public static void DrawBuffersATI(uint n, Ref<DrawBufferMode> bufs)
             }
         }
 
-        [NativeName("glDrawBuffersATI")]
-        [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
-        public static void DrawBuffersATI(DrawBufferMode bufs) =>
-            DrawBuffersATI(1, (uint*)(DrawBufferMode*)&bufs);
-
         [NativeName("glDrawBuffersEXT")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDrawBuffersEXT")]
         [SupportedApiProfile("gles2", ["GL_EXT_draw_buffers"])]
@@ -22043,11 +22053,6 @@ public static void DrawBuffersEXT(uint n, Ref<uint> bufs)
             }
         }
 
-        [NativeName("glDrawBuffersEXT")]
-        [SupportedApiProfile("gles2", ["GL_EXT_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersEXT")]
-        public static void DrawBuffersEXT(uint bufs) => DrawBuffersEXT(1, (uint*)&bufs);
-
         [NativeName("glDrawBuffersIndexedEXT")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDrawBuffersIndexedEXT")]
         [SupportedApiProfile("gles2", ["GL_EXT_multiview_draw_buffers"])]
@@ -22087,11 +22092,6 @@ public static void DrawBuffersNV(uint n, Ref<uint> bufs)
             }
         }
 
-        [NativeName("glDrawBuffersNV")]
-        [SupportedApiProfile("gles2", ["GL_NV_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersNV")]
-        public static void DrawBuffersNV(uint bufs) => DrawBuffersNV(1, (uint*)&bufs);
-
         [NativeName("glDrawCommandsAddressNV")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glDrawCommandsAddressNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
@@ -26268,6 +26268,23 @@ public static void ExtGetBufferPointerQCOM(uint target, Ref2D @params)
             }
         }
 
+        [NativeName("glExtGetBuffersQCOM")]
+        [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
+        [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
+        [NativeFunction("opengl", EntryPoint = "glExtGetBuffersQCOM")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static uint ExtGetBufferQCOM(Ref<int> numBuffers)
+        {
+            fixed (int* __dsl_numBuffers = numBuffers)
+            {
+                uint buffers = default;
+                ExtGetBuffersQCOM((uint*)&buffers, 1, __dsl_numBuffers);
+                return buffers;
+            }
+        }
+
         [NativeName("glExtGetBuffersQCOM")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glExtGetBuffersQCOM")]
         [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
@@ -26290,20 +26307,20 @@ public static void ExtGetBuffersQCOM(Ref<uint> buffers, int maxBuffers, Ref<int>
             }
         }
 
-        [NativeName("glExtGetBuffersQCOM")]
+        [NativeName("glExtGetFramebuffersQCOM")]
         [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
         [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
-        [NativeFunction("opengl", EntryPoint = "glExtGetBuffersQCOM")]
+        [NativeFunction("opengl", EntryPoint = "glExtGetFramebuffersQCOM")]
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static uint ExtGetBuffersQCOM(Ref<int> numBuffers)
+        public static uint ExtGetFramebufferQCOM(Ref<int> numFramebuffers)
         {
-            fixed (int* __dsl_numBuffers = numBuffers)
+            fixed (int* __dsl_numFramebuffers = numFramebuffers)
             {
-                uint buffers = default;
-                ExtGetBuffersQCOM((uint*)&buffers, 1, __dsl_numBuffers);
-                return buffers;
+                uint framebuffers = default;
+                ExtGetFramebuffersQCOM((uint*)&framebuffers, 1, __dsl_numFramebuffers);
+                return framebuffers;
             }
         }
 
@@ -26337,23 +26354,6 @@ Ref<int> numFramebuffers
             }
         }
 
-        [NativeName("glExtGetFramebuffersQCOM")]
-        [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
-        [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
-        [NativeFunction("opengl", EntryPoint = "glExtGetFramebuffersQCOM")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static uint ExtGetFramebuffersQCOM(Ref<int> numFramebuffers)
-        {
-            fixed (int* __dsl_numFramebuffers = numFramebuffers)
-            {
-                uint framebuffers = default;
-                ExtGetFramebuffersQCOM((uint*)&framebuffers, 1, __dsl_numFramebuffers);
-                return framebuffers;
-            }
-        }
-
         [NativeName("glExtGetProgramBinarySourceQCOM")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glExtGetProgramBinarySourceQCOM")]
         [SupportedApiProfile("gles2", ["GL_QCOM_extended_get2"])]
@@ -26438,6 +26438,23 @@ public static uint ExtGetProgramQCOM(Ref<int> numPrograms)
             }
         }
 
+        [NativeName("glExtGetRenderbuffersQCOM")]
+        [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
+        [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
+        [NativeFunction("opengl", EntryPoint = "glExtGetRenderbuffersQCOM")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static uint ExtGetRenderbufferQCOM(Ref<int> numRenderbuffers)
+        {
+            fixed (int* __dsl_numRenderbuffers = numRenderbuffers)
+            {
+                uint renderbuffers = default;
+                ExtGetRenderbuffersQCOM((uint*)&renderbuffers, 1, __dsl_numRenderbuffers);
+                return renderbuffers;
+            }
+        }
+
         [NativeName("glExtGetRenderbuffersQCOM")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glExtGetRenderbuffersQCOM")]
         [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
@@ -26472,20 +26489,20 @@ Ref<int> numRenderbuffers
             }
         }
 
-        [NativeName("glExtGetRenderbuffersQCOM")]
-        [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
-        [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
-        [NativeFunction("opengl", EntryPoint = "glExtGetRenderbuffersQCOM")]
+        [NativeName("glExtGetShadersQCOM")]
+        [SupportedApiProfile("gles2", ["GL_QCOM_extended_get2"])]
+        [SupportedApiProfile("gles1", ["GL_QCOM_extended_get2"])]
+        [NativeFunction("opengl", EntryPoint = "glExtGetShadersQCOM")]
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static uint ExtGetRenderbuffersQCOM(Ref<int> numRenderbuffers)
+        public static uint ExtGetShaderQCOM(Ref<int> numShaders)
         {
-            fixed (int* __dsl_numRenderbuffers = numRenderbuffers)
+            fixed (int* __dsl_numShaders = numShaders)
             {
-                uint renderbuffers = default;
-                ExtGetRenderbuffersQCOM((uint*)&renderbuffers, 1, __dsl_numRenderbuffers);
-                return renderbuffers;
+                uint shaders = default;
+                ExtGetShadersQCOM((uint*)&shaders, 1, __dsl_numShaders);
+                return shaders;
             }
         }
 
@@ -26511,23 +26528,6 @@ public static void ExtGetShadersQCOM(Ref<uint> shaders, int maxShaders, Ref<int>
             }
         }
 
-        [NativeName("glExtGetShadersQCOM")]
-        [SupportedApiProfile("gles2", ["GL_QCOM_extended_get2"])]
-        [SupportedApiProfile("gles1", ["GL_QCOM_extended_get2"])]
-        [NativeFunction("opengl", EntryPoint = "glExtGetShadersQCOM")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static uint ExtGetShadersQCOM(Ref<int> numShaders)
-        {
-            fixed (int* __dsl_numShaders = numShaders)
-            {
-                uint shaders = default;
-                ExtGetShadersQCOM((uint*)&shaders, 1, __dsl_numShaders);
-                return shaders;
-            }
-        }
-
         [NativeName("glExtGetTexLevelParameterivQCOM")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glExtGetTexLevelParameterivQCOM")]
         [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
@@ -28299,6 +28299,20 @@ public static void FramebufferDrawBufferEXT(
             Constant<uint, GLEnum, DrawBufferMode> mode
         ) => FramebufferDrawBufferEXT(framebuffer, (uint)mode);
 
+        [NativeName("glFramebufferDrawBuffersEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
+        [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
+        [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
+        public static void FramebufferDrawBufferEXT(uint framebuffer, GLEnum bufs) =>
+            FramebufferDrawBuffersEXT(framebuffer, 1, (uint*)(GLEnum*)&bufs);
+
+        [NativeName("glFramebufferDrawBuffersEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
+        [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
+        [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
+        public static void FramebufferDrawBufferEXT(uint framebuffer, DrawBufferMode bufs) =>
+            FramebufferDrawBuffersEXT(framebuffer, 1, (uint*)(DrawBufferMode*)&bufs);
+
         [NativeName("glFramebufferDrawBuffersEXT")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glFramebufferDrawBuffersEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
@@ -28320,13 +28334,6 @@ public static void FramebufferDrawBuffersEXT(uint framebuffer, uint n, Ref<uint>
             }
         }
 
-        [NativeName("glFramebufferDrawBuffersEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
-        [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
-        [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
-        public static void FramebufferDrawBuffersEXT(uint framebuffer, uint bufs) =>
-            FramebufferDrawBuffersEXT(framebuffer, 1, (uint*)&bufs);
-
         [NativeName("glFramebufferDrawBuffersEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
         [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
@@ -28342,13 +28349,6 @@ public static void FramebufferDrawBuffersEXT(uint framebuffer, uint n, Ref<GLEnu
             }
         }
 
-        [NativeName("glFramebufferDrawBuffersEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
-        [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
-        [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
-        public static void FramebufferDrawBuffersEXT(uint framebuffer, GLEnum bufs) =>
-            FramebufferDrawBuffersEXT(framebuffer, 1, (uint*)(GLEnum*)&bufs);
-
         [NativeName("glFramebufferDrawBuffersEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
         [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
@@ -28368,13 +28368,6 @@ Ref<DrawBufferMode> bufs
             }
         }
 
-        [NativeName("glFramebufferDrawBuffersEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
-        [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
-        [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
-        public static void FramebufferDrawBuffersEXT(uint framebuffer, DrawBufferMode bufs) =>
-            FramebufferDrawBuffersEXT(framebuffer, 1, (uint*)(DrawBufferMode*)&bufs);
-
         [NativeName("glFramebufferFetchBarrierEXT")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glFramebufferFetchBarrierEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_shader_framebuffer_fetch_non_coherent"])]
@@ -30111,6 +30104,16 @@ public static uint GenBuffer()
             return buffers;
         }
 
+        [NativeName("glGenBuffersARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenBuffersARB")]
+        public static uint GenBufferARB()
+        {
+            uint buffers = default;
+            GenBuffersARB(1, (uint*)&buffers);
+            return buffers;
+        }
+
         [NativeName("glGenBuffers")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGenBuffers")]
         [SupportedApiProfile(
@@ -30239,16 +30242,6 @@ public static void GenBuffersARB(uint n, Ref<uint> buffers)
             }
         }
 
-        [NativeName("glGenBuffersARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenBuffersARB")]
-        public static uint GenBuffersARB()
-        {
-            uint buffers = default;
-            GenBuffersARB(1, (uint*)&buffers);
-            return buffers;
-        }
-
         [NativeName("glGenerateMipmap")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGenerateMipmap")]
         [SupportedApiProfile(
@@ -30406,6 +30399,28 @@ public static void GenerateTextureMipmapEXT(
             Constant<uint, GLEnum, TextureTarget> target
         ) => GenerateTextureMipmapEXT(texture, (uint)target);
 
+        [NativeName("glGenFencesAPPLE")]
+        [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
+        [NativeFunction("opengl", EntryPoint = "glGenFencesAPPLE")]
+        public static uint GenFenceAPPLE()
+        {
+            uint fences = default;
+            GenFencesAPPLE(1, (uint*)&fences);
+            return fences;
+        }
+
+        [NativeName("glGenFencesNV")]
+        [SupportedApiProfile("gl", ["GL_NV_fence"])]
+        [SupportedApiProfile("gles2", ["GL_NV_fence"])]
+        [SupportedApiProfile("gles1", ["GL_NV_fence"])]
+        [NativeFunction("opengl", EntryPoint = "glGenFencesNV")]
+        public static uint GenFenceNV()
+        {
+            uint fences = default;
+            GenFencesNV(1, (uint*)&fences);
+            return fences;
+        }
+
         [NativeName("glGenFencesAPPLE")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGenFencesAPPLE")]
         [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
@@ -30425,16 +30440,6 @@ public static void GenFencesAPPLE(uint n, Ref<uint> fences)
             }
         }
 
-        [NativeName("glGenFencesAPPLE")]
-        [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
-        [NativeFunction("opengl", EntryPoint = "glGenFencesAPPLE")]
-        public static uint GenFencesAPPLE()
-        {
-            uint fences = default;
-            GenFencesAPPLE(1, (uint*)&fences);
-            return fences;
-        }
-
         [NativeName("glGenFencesNV")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGenFencesNV")]
         [SupportedApiProfile("gl", ["GL_NV_fence"])]
@@ -30458,18 +30463,6 @@ public static void GenFencesNV(uint n, Ref<uint> fences)
             }
         }
 
-        [NativeName("glGenFencesNV")]
-        [SupportedApiProfile("gl", ["GL_NV_fence"])]
-        [SupportedApiProfile("gles2", ["GL_NV_fence"])]
-        [SupportedApiProfile("gles1", ["GL_NV_fence"])]
-        [NativeFunction("opengl", EntryPoint = "glGenFencesNV")]
-        public static uint GenFencesNV()
-        {
-            uint fences = default;
-            GenFencesNV(1, (uint*)&fences);
-            return fences;
-        }
-
         [NativeName("glGenFragmentShadersATI")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGenFragmentShadersATI")]
         [SupportedApiProfile("gl", ["GL_ATI_fragment_shader"])]
@@ -30525,6 +30518,26 @@ public static uint GenFramebuffer()
             return framebuffers;
         }
 
+        [NativeName("glGenFramebuffersEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenFramebuffersEXT")]
+        public static uint GenFramebufferEXT()
+        {
+            uint framebuffers = default;
+            GenFramebuffersEXT(1, (uint*)&framebuffers);
+            return framebuffers;
+        }
+
+        [NativeName("glGenFramebuffersOES")]
+        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")]
+        public static uint GenFramebufferOES()
+        {
+            uint framebuffers = default;
+            GenFramebuffersOES(1, (uint*)&framebuffers);
+            return framebuffers;
+        }
+
         [NativeName("glGenFramebuffers")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGenFramebuffers")]
         [SupportedApiProfile(
@@ -30643,16 +30656,6 @@ public static void GenFramebuffersEXT(uint n, Ref<uint> framebuffers)
             }
         }
 
-        [NativeName("glGenFramebuffersEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenFramebuffersEXT")]
-        public static uint GenFramebuffersEXT()
-        {
-            uint framebuffers = default;
-            GenFramebuffersEXT(1, (uint*)&framebuffers);
-            return framebuffers;
-        }
-
         [NativeName("glGenFramebuffersOES")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGenFramebuffersOES")]
         [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
@@ -30672,16 +30675,6 @@ public static void GenFramebuffersOES(uint n, Ref<uint> framebuffers)
             }
         }
 
-        [NativeName("glGenFramebuffersOES")]
-        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")]
-        public static uint GenFramebuffersOES()
-        {
-            uint framebuffers = default;
-            GenFramebuffersOES(1, (uint*)&framebuffers);
-            return framebuffers;
-        }
-
         [NativeName("glGenLists")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGenLists")]
         [SupportedApiProfile(
@@ -30711,6 +30704,16 @@ public static uint GenFramebuffersOES()
         )]
         public static extern uint GenLists(uint range);
 
+        [NativeName("glGenNamesAMD")]
+        [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
+        [NativeFunction("opengl", EntryPoint = "glGenNamesAMD")]
+        public static uint GenNameAMD(uint identifier)
+        {
+            uint names = default;
+            GenNamesAMD(identifier, 1, (uint*)&names);
+            return names;
+        }
+
         [NativeName("glGenNamesAMD")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGenNamesAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
@@ -30730,16 +30733,6 @@ public static void GenNamesAMD(uint identifier, uint num, Ref<uint> names)
             }
         }
 
-        [NativeName("glGenNamesAMD")]
-        [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
-        [NativeFunction("opengl", EntryPoint = "glGenNamesAMD")]
-        public static uint GenNamesAMD(uint identifier)
-        {
-            uint names = default;
-            GenNamesAMD(identifier, 1, (uint*)&names);
-            return names;
-        }
-
         [NativeName("glGenOcclusionQueriesNV")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGenOcclusionQueriesNV")]
         [SupportedApiProfile("gl", ["GL_NV_occlusion_query"])]
@@ -30762,7 +30755,7 @@ public static void GenOcclusionQueriesNV(uint n, Ref<uint> ids)
         [NativeName("glGenOcclusionQueriesNV")]
         [SupportedApiProfile("gl", ["GL_NV_occlusion_query"])]
         [NativeFunction("opengl", EntryPoint = "glGenOcclusionQueriesNV")]
-        public static uint GenOcclusionQueriesNV()
+        public static uint GenOcclusionQueryNV()
         {
             uint ids = default;
             GenOcclusionQueriesNV(1, (uint*)&ids);
@@ -30776,6 +30769,18 @@ public static uint GenOcclusionQueriesNV()
         [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])]
         public static extern uint GenPathNV(uint range);
 
+        [NativeName("glGenPerfMonitorsAMD")]
+        [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
+        [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
+        [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
+        [NativeFunction("opengl", EntryPoint = "glGenPerfMonitorsAMD")]
+        public static uint GenPerfMonitorAMD()
+        {
+            uint monitors = default;
+            GenPerfMonitorsAMD(1, (uint*)&monitors);
+            return monitors;
+        }
+
         [NativeName("glGenPerfMonitorsAMD")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGenPerfMonitorsAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
@@ -30799,18 +30804,6 @@ public static void GenPerfMonitorsAMD(uint n, Ref<uint> monitors)
             }
         }
 
-        [NativeName("glGenPerfMonitorsAMD")]
-        [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
-        [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
-        [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
-        [NativeFunction("opengl", EntryPoint = "glGenPerfMonitorsAMD")]
-        public static uint GenPerfMonitorsAMD()
-        {
-            uint monitors = default;
-            GenPerfMonitorsAMD(1, (uint*)&monitors);
-            return monitors;
-        }
-
         [NativeName("glGenProgramPipelines")]
         [SupportedApiProfile(
             "gl",
@@ -30846,6 +30839,16 @@ public static uint GenProgramPipeline()
             return pipelines;
         }
 
+        [NativeName("glGenProgramPipelinesEXT")]
+        [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])]
+        [NativeFunction("opengl", EntryPoint = "glGenProgramPipelinesEXT")]
+        public static uint GenProgramPipelineEXT()
+        {
+            uint pipelines = default;
+            GenProgramPipelinesEXT(1, (uint*)&pipelines);
+            return pipelines;
+        }
+
         [NativeName("glGenProgramPipelines")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGenProgramPipelines")]
         [SupportedApiProfile(
@@ -30934,16 +30937,6 @@ public static void GenProgramPipelinesEXT(uint n, Ref<uint> pipelines)
             }
         }
 
-        [NativeName("glGenProgramPipelinesEXT")]
-        [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])]
-        [NativeFunction("opengl", EntryPoint = "glGenProgramPipelinesEXT")]
-        public static uint GenProgramPipelinesEXT()
-        {
-            uint pipelines = default;
-            GenProgramPipelinesEXT(1, (uint*)&pipelines);
-            return pipelines;
-        }
-
         [NativeName("glGenProgramsARB")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGenProgramsARB")]
         [SupportedApiProfile("gl", ["GL_ARB_fragment_program", "GL_ARB_vertex_program"])]
@@ -31118,16 +31111,6 @@ public static void GenQueriesARB(uint n, Ref<uint> ids)
             }
         }
 
-        [NativeName("glGenQueriesARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
-        [NativeFunction("opengl", EntryPoint = "glGenQueriesARB")]
-        public static uint GenQueriesARB()
-        {
-            uint ids = default;
-            GenQueriesARB(1, (uint*)&ids);
-            return ids;
-        }
-
         [NativeName("glGenQueriesEXT")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGenQueriesEXT")]
         [SupportedApiProfile(
@@ -31153,19 +31136,6 @@ public static void GenQueriesEXT(uint n, Ref<uint> ids)
             }
         }
 
-        [NativeName("glGenQueriesEXT")]
-        [SupportedApiProfile(
-            "gles2",
-            ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
-        )]
-        [NativeFunction("opengl", EntryPoint = "glGenQueriesEXT")]
-        public static uint GenQueriesEXT()
-        {
-            uint ids = default;
-            GenQueriesEXT(1, (uint*)&ids);
-            return ids;
-        }
-
         [NativeName("glGenQueries")]
         [SupportedApiProfile(
             "gl",
@@ -31215,6 +31185,29 @@ public static uint GenQuery()
             return ids;
         }
 
+        [NativeName("glGenQueriesARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
+        [NativeFunction("opengl", EntryPoint = "glGenQueriesARB")]
+        public static uint GenQueryARB()
+        {
+            uint ids = default;
+            GenQueriesARB(1, (uint*)&ids);
+            return ids;
+        }
+
+        [NativeName("glGenQueriesEXT")]
+        [SupportedApiProfile(
+            "gles2",
+            ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
+        )]
+        [NativeFunction("opengl", EntryPoint = "glGenQueriesEXT")]
+        public static uint GenQueryEXT()
+        {
+            uint ids = default;
+            GenQueriesEXT(1, (uint*)&ids);
+            return ids;
+        }
+
         [NativeName("glGenQueryResourceTagNV")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGenQueryResourceTagNV")]
         [SupportedApiProfile("gl", ["GL_NV_query_resource_tag"])]
@@ -31294,6 +31287,26 @@ public static uint GenRenderbuffer()
             return renderbuffers;
         }
 
+        [NativeName("glGenRenderbuffersEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersEXT")]
+        public static uint GenRenderbufferEXT()
+        {
+            uint renderbuffers = default;
+            GenRenderbuffersEXT(1, (uint*)&renderbuffers);
+            return renderbuffers;
+        }
+
+        [NativeName("glGenRenderbuffersOES")]
+        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")]
+        public static uint GenRenderbufferOES()
+        {
+            uint renderbuffers = default;
+            GenRenderbuffersOES(1, (uint*)&renderbuffers);
+            return renderbuffers;
+        }
+
         [NativeName("glGenRenderbuffers")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGenRenderbuffers")]
         [SupportedApiProfile(
@@ -31412,16 +31425,6 @@ public static void GenRenderbuffersEXT(uint n, Ref<uint> renderbuffers)
             }
         }
 
-        [NativeName("glGenRenderbuffersEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersEXT")]
-        public static uint GenRenderbuffersEXT()
-        {
-            uint renderbuffers = default;
-            GenRenderbuffersEXT(1, (uint*)&renderbuffers);
-            return renderbuffers;
-        }
-
         [NativeName("glGenRenderbuffersOES")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGenRenderbuffersOES")]
         [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
@@ -31441,16 +31444,6 @@ public static void GenRenderbuffersOES(uint n, Ref<uint> renderbuffers)
             }
         }
 
-        [NativeName("glGenRenderbuffersOES")]
-        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")]
-        public static uint GenRenderbuffersOES()
-        {
-            uint renderbuffers = default;
-            GenRenderbuffersOES(1, (uint*)&renderbuffers);
-            return renderbuffers;
-        }
-
         [NativeName("glGenSamplers")]
         [SupportedApiProfile(
             "gl",
@@ -31597,6 +31590,17 @@ public static void GenSamplers(uint count, Ref<uint> samplers)
             }
         }
 
+        [NativeName("glGenSemaphoresEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
+        [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])]
+        [NativeFunction("opengl", EntryPoint = "glGenSemaphoresEXT")]
+        public static uint GenSemaphoreEXT()
+        {
+            uint semaphores = default;
+            GenSemaphoresEXT(1, (uint*)&semaphores);
+            return semaphores;
+        }
+
         [NativeName("glGenSemaphoresEXT")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGenSemaphoresEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
@@ -31618,17 +31622,6 @@ public static void GenSemaphoresEXT(uint n, Ref<uint> semaphores)
             }
         }
 
-        [NativeName("glGenSemaphoresEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
-        [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])]
-        [NativeFunction("opengl", EntryPoint = "glGenSemaphoresEXT")]
-        public static uint GenSemaphoresEXT()
-        {
-            uint semaphores = default;
-            GenSemaphoresEXT(1, (uint*)&semaphores);
-            return semaphores;
-        }
-
         [NativeName("glGenSymbolsEXT")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGenSymbolsEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])]
@@ -31712,6 +31705,16 @@ public static uint GenTexture()
             return textures;
         }
 
+        [NativeName("glGenTexturesEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_texture_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenTexturesEXT")]
+        public static uint GenTextureEXT()
+        {
+            uint textures = default;
+            GenTexturesEXT(1, (uint*)&textures);
+            return textures;
+        }
+
         [NativeName("glGenTextures")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGenTextures")]
         [SupportedApiProfile(
@@ -31856,16 +31859,6 @@ public static void GenTexturesEXT(uint n, Ref<uint> textures)
             }
         }
 
-        [NativeName("glGenTexturesEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_texture_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenTexturesEXT")]
-        public static uint GenTexturesEXT()
-        {
-            uint textures = default;
-            GenTexturesEXT(1, (uint*)&textures);
-            return textures;
-        }
-
         [NativeName("glGenTransformFeedbacks")]
         [SupportedApiProfile(
             "gl",
@@ -31903,6 +31896,16 @@ public static uint GenTransformFeedback()
             return ids;
         }
 
+        [NativeName("glGenTransformFeedbacksNV")]
+        [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])]
+        [NativeFunction("opengl", EntryPoint = "glGenTransformFeedbacksNV")]
+        public static uint GenTransformFeedbackNV()
+        {
+            uint ids = default;
+            GenTransformFeedbacksNV(1, (uint*)&ids);
+            return ids;
+        }
+
         [NativeName("glGenTransformFeedbacks")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGenTransformFeedbacks")]
         [SupportedApiProfile(
@@ -31995,16 +31998,6 @@ public static void GenTransformFeedbacksNV(uint n, Ref<uint> ids)
             }
         }
 
-        [NativeName("glGenTransformFeedbacksNV")]
-        [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])]
-        [NativeFunction("opengl", EntryPoint = "glGenTransformFeedbacksNV")]
-        public static uint GenTransformFeedbacksNV()
-        {
-            uint ids = default;
-            GenTransformFeedbacksNV(1, (uint*)&ids);
-            return ids;
-        }
-
         [NativeName("glGenVertexArrays")]
         [SupportedApiProfile(
             "gl",
@@ -32050,6 +32043,27 @@ public static uint GenVertexArray()
             return arrays;
         }
 
+        [NativeName("glGenVertexArraysAPPLE")]
+        [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenVertexArraysAPPLE")]
+        public static uint GenVertexArrayAPPLE()
+        {
+            uint arrays = default;
+            GenVertexArraysAPPLE(1, (uint*)&arrays);
+            return arrays;
+        }
+
+        [NativeName("glGenVertexArraysOES")]
+        [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
+        [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenVertexArraysOES")]
+        public static uint GenVertexArrayOES()
+        {
+            uint arrays = default;
+            GenVertexArraysOES(1, (uint*)&arrays);
+            return arrays;
+        }
+
         [NativeName("glGenVertexArrays")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGenVertexArrays")]
         [SupportedApiProfile(
@@ -32158,16 +32172,6 @@ public static void GenVertexArraysAPPLE(uint n, Ref<uint> arrays)
             }
         }
 
-        [NativeName("glGenVertexArraysAPPLE")]
-        [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenVertexArraysAPPLE")]
-        public static uint GenVertexArraysAPPLE()
-        {
-            uint arrays = default;
-            GenVertexArraysAPPLE(1, (uint*)&arrays);
-            return arrays;
-        }
-
         [NativeName("glGenVertexArraysOES")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGenVertexArraysOES")]
         [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
@@ -32189,17 +32193,6 @@ public static void GenVertexArraysOES(uint n, Ref<uint> arrays)
             }
         }
 
-        [NativeName("glGenVertexArraysOES")]
-        [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
-        [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenVertexArraysOES")]
-        public static uint GenVertexArraysOES()
-        {
-            uint arrays = default;
-            GenVertexArraysOES(1, (uint*)&arrays);
-            return arrays;
-        }
-
         [NativeName("glGenVertexShadersEXT")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGenVertexShadersEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])]
@@ -34802,6 +34795,22 @@ Constant<uint, GLEnum, ArrayObjectPNameATI> pname
             return @params;
         }
 
+        [NativeName("glGetAttachedObjectsARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_shader_objects"])]
+        [NativeFunction("opengl", EntryPoint = "glGetAttachedObjectsARB")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static uint GetAttachedObjectARB(uint containerObj, Ref<uint> count)
+        {
+            fixed (uint* __dsl_count = count)
+            {
+                uint obj = default;
+                GetAttachedObjectsARB(containerObj, 1, __dsl_count, (uint*)&obj);
+                return obj;
+            }
+        }
+
         [NativeName("glGetAttachedObjectsARB")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGetAttachedObjectsARB")]
         [SupportedApiProfile("gl", ["GL_ARB_shader_objects"])]
@@ -34832,22 +34841,6 @@ Ref<uint> obj
             }
         }
 
-        [NativeName("glGetAttachedObjectsARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_shader_objects"])]
-        [NativeFunction("opengl", EntryPoint = "glGetAttachedObjectsARB")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static uint GetAttachedObjectsARB(uint containerObj, Ref<uint> count)
-        {
-            fixed (uint* __dsl_count = count)
-            {
-                uint obj = default;
-                GetAttachedObjectsARB(containerObj, 1, __dsl_count, (uint*)&obj);
-                return obj;
-            }
-        }
-
         [NativeName("glGetAttachedShaders")]
         [SupportedApiProfile(
             "gl",
@@ -38835,6 +38828,22 @@ Ref<int> @params
             }
         }
 
+        [NativeName("glGetFragmentShadingRatesEXT")]
+        [SupportedApiProfile("gles2", ["GL_EXT_fragment_shading_rate"])]
+        [NativeFunction("opengl", EntryPoint = "glGetFragmentShadingRatesEXT")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static uint GetFragmentShadingRateEXT(uint samples, Ref<uint> count)
+        {
+            fixed (uint* __dsl_count = count)
+            {
+                uint shadingRates = default;
+                GetFragmentShadingRatesEXT(samples, 1, __dsl_count, (uint*)&shadingRates);
+                return shadingRates;
+            }
+        }
+
         [NativeName("glGetFragmentShadingRatesEXT")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGetFragmentShadingRatesEXT")]
         [SupportedApiProfile("gles2", ["GL_EXT_fragment_shading_rate"])]
@@ -38865,22 +38874,6 @@ Ref<uint> shadingRates
             }
         }
 
-        [NativeName("glGetFragmentShadingRatesEXT")]
-        [SupportedApiProfile("gles2", ["GL_EXT_fragment_shading_rate"])]
-        [NativeFunction("opengl", EntryPoint = "glGetFragmentShadingRatesEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static uint GetFragmentShadingRatesEXT(uint samples, Ref<uint> count)
-        {
-            fixed (uint* __dsl_count = count)
-            {
-                uint shadingRates = default;
-                GetFragmentShadingRatesEXT(samples, 1, __dsl_count, (uint*)&shadingRates);
-                return shadingRates;
-            }
-        }
-
         [NativeName("glGetFragmentShadingRatesEXT")]
         [SupportedApiProfile("gles2", ["GL_EXT_fragment_shading_rate"])]
         [NativeFunction("opengl", EntryPoint = "glGetFragmentShadingRatesEXT")]
@@ -45286,6 +45279,18 @@ Ref<int> value
             }
         }
 
+        [NativeName("glGetPathCommandsNV")]
+        [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
+        [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
+        [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])]
+        [NativeFunction("opengl", EntryPoint = "glGetPathCommandsNV")]
+        public static byte GetPathCommandNV()
+        {
+            byte commands = default;
+            GetPathCommandsNV(1, (byte*)&commands);
+            return commands;
+        }
+
         [NativeName("glGetPathCommandsNV")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGetPathCommandsNV")]
         [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
@@ -45309,18 +45314,6 @@ public static void GetPathCommandsNV(uint path, Ref<byte> commands)
             }
         }
 
-        [NativeName("glGetPathCommandsNV")]
-        [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
-        [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
-        [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])]
-        [NativeFunction("opengl", EntryPoint = "glGetPathCommandsNV")]
-        public static byte GetPathCommandsNV()
-        {
-            byte commands = default;
-            GetPathCommandsNV(1, (byte*)&commands);
-            return commands;
-        }
-
         [NativeName("glGetPathCommandsNV")]
         [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
         [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
@@ -45337,6 +45330,18 @@ public static void GetPathCommandsNV(uint path, Ref<PathCoordType> commands)
             }
         }
 
+        [NativeName("glGetPathCoordsNV")]
+        [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
+        [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
+        [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])]
+        [NativeFunction("opengl", EntryPoint = "glGetPathCoordsNV")]
+        public static float GetPathCoordNV()
+        {
+            float coords = default;
+            GetPathCoordsNV(1, (float*)&coords);
+            return coords;
+        }
+
         [NativeName("glGetPathCoordsNV")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGetPathCoordsNV")]
         [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
@@ -45360,18 +45365,6 @@ public static void GetPathCoordsNV(uint path, Ref<float> coords)
             }
         }
 
-        [NativeName("glGetPathCoordsNV")]
-        [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
-        [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
-        [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])]
-        [NativeFunction("opengl", EntryPoint = "glGetPathCoordsNV")]
-        public static float GetPathCoordsNV()
-        {
-            float coords = default;
-            GetPathCoordsNV(1, (float*)&coords);
-            return coords;
-        }
-
         [NativeName("glGetPathDashArrayNV")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGetPathDashArrayNV")]
         [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
@@ -45722,6 +45715,35 @@ Ref<ulong> rawCounterMaxValue
             }
         }
 
+        [NativeName("glGetPerfMonitorCountersAMD")]
+        [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
+        [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
+        [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
+        [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorCountersAMD")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static uint GetPerfMonitorCounterAMD(
+            uint group,
+            Ref<int> numCounters,
+            Ref<int> maxActiveCounters
+        )
+        {
+            fixed (int* __dsl_maxActiveCounters = maxActiveCounters)
+            fixed (int* __dsl_numCounters = numCounters)
+            {
+                uint counters = default;
+                GetPerfMonitorCountersAMD(
+                    group,
+                    __dsl_numCounters,
+                    __dsl_maxActiveCounters,
+                    1,
+                    (uint*)&counters
+                );
+                return counters;
+            }
+        }
+
         [NativeName("glGetPerfMonitorCounterDataAMD")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGetPerfMonitorCounterDataAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
@@ -45772,7 +45794,7 @@ Ref<int> bytesWritten
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static int GetPerfMonitorCounterDataAMD(
+        public static int GetPerfMonitorCounterDatumAMD(
             uint monitor,
             uint pname,
             uint dataSize,
@@ -45869,35 +45891,6 @@ Ref<uint> counters
             }
         }
 
-        [NativeName("glGetPerfMonitorCountersAMD")]
-        [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
-        [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
-        [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
-        [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorCountersAMD")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static uint GetPerfMonitorCountersAMD(
-            uint group,
-            Ref<int> numCounters,
-            Ref<int> maxActiveCounters
-        )
-        {
-            fixed (int* __dsl_maxActiveCounters = maxActiveCounters)
-            fixed (int* __dsl_numCounters = numCounters)
-            {
-                uint counters = default;
-                GetPerfMonitorCountersAMD(
-                    group,
-                    __dsl_numCounters,
-                    __dsl_maxActiveCounters,
-                    1,
-                    (uint*)&counters
-                );
-                return counters;
-            }
-        }
-
         [NativeName("glGetPerfMonitorCounterStringAMD")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGetPerfMonitorCounterStringAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
@@ -45968,6 +45961,24 @@ Ref<uint> length
             }
         }
 
+        [NativeName("glGetPerfMonitorGroupsAMD")]
+        [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
+        [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
+        [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
+        [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorGroupsAMD")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static uint GetPerfMonitorGroupAMD(Ref<int> numGroups)
+        {
+            fixed (int* __dsl_numGroups = numGroups)
+            {
+                uint groups = default;
+                GetPerfMonitorGroupsAMD(__dsl_numGroups, 1, (uint*)&groups);
+                return groups;
+            }
+        }
+
         [NativeName("glGetPerfMonitorGroupsAMD")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGetPerfMonitorGroupsAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
@@ -46000,24 +46011,6 @@ Ref<uint> groups
             }
         }
 
-        [NativeName("glGetPerfMonitorGroupsAMD")]
-        [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
-        [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
-        [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
-        [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorGroupsAMD")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static uint GetPerfMonitorGroupsAMD(Ref<int> numGroups)
-        {
-            fixed (int* __dsl_numGroups = numGroups)
-            {
-                uint groups = default;
-                GetPerfMonitorGroupsAMD(__dsl_numGroups, 1, (uint*)&groups);
-                return groups;
-            }
-        }
-
         [NativeName("glGetPerfMonitorGroupStringAMD")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glGetPerfMonitorGroupStringAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
@@ -79847,6 +79840,16 @@ public static void ProgramBinaryOES(uint program, uint binaryFormat, Ref binary,
             }
         }
 
+        [NativeName("glProgramBufferParametersfvNV")]
+        [SupportedApiProfile("gl", ["GL_NV_parameter_buffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glProgramBufferParametersfvNV")]
+        public static void ProgramBufferParameterNV(
+            Constant<uint, GLEnum, ProgramTarget> target,
+            uint bindingIndex,
+            uint wordIndex,
+            float @params
+        ) => ProgramBufferParametersNV((uint)target, bindingIndex, wordIndex, 1, (float*)&@params);
+
         [NativeName("glProgramBufferParametersfvNV")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glProgramBufferParametersfvNV")]
         [SupportedApiProfile("gl", ["GL_NV_parameter_buffer_object"])]
@@ -79884,16 +79887,6 @@ Ref<float> @params
             }
         }
 
-        [NativeName("glProgramBufferParametersfvNV")]
-        [SupportedApiProfile("gl", ["GL_NV_parameter_buffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glProgramBufferParametersfvNV")]
-        public static void ProgramBufferParametersNV(
-            Constant<uint, GLEnum, ProgramTarget> target,
-            uint bindingIndex,
-            uint wordIndex,
-            float @params
-        ) => ProgramBufferParametersNV((uint)target, bindingIndex, wordIndex, 1, (float*)&@params);
-
         [NativeName("glProgramBufferParametersIivNV")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glProgramBufferParametersIivNV")]
         [SupportedApiProfile("gl", ["GL_NV_parameter_buffer_object"])]
@@ -81066,7 +81059,7 @@ public static void ProgramSubroutineParametersNV(uint target, uint count, Ref<ui
         [NativeName("glProgramSubroutineParametersuivNV")]
         [SupportedApiProfile("gl", ["GL_NV_gpu_program5"])]
         [NativeFunction("opengl", EntryPoint = "glProgramSubroutineParametersuivNV")]
-        public static void ProgramSubroutineParametersNV(uint target, uint @params) =>
+        public static void ProgramSubroutineParameterNV(uint target, uint @params) =>
             ProgramSubroutineParametersNV(target, 1, (uint*)&@params);
 
         [NativeName("glProgramUniform1d")]
@@ -94541,6 +94534,22 @@ public static uint SelectBuffer()
             return buffer;
         }
 
+        [NativeName("glSelectPerfMonitorCountersAMD")]
+        [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
+        [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
+        [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
+        [NativeFunction("opengl", EntryPoint = "glSelectPerfMonitorCountersAMD")]
+        public static uint SelectPerfMonitorCounterAMD(
+            uint monitor,
+            MaybeBool<uint> enable,
+            uint group
+        )
+        {
+            uint counterList = default;
+            SelectPerfMonitorCountersAMD(monitor, (uint)enable, group, 1, (uint*)&counterList);
+            return counterList;
+        }
+
         [NativeName("glSelectPerfMonitorCountersAMD")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glSelectPerfMonitorCountersAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
@@ -94582,22 +94591,6 @@ Ref<uint> counterList
             }
         }
 
-        [NativeName("glSelectPerfMonitorCountersAMD")]
-        [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
-        [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
-        [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
-        [NativeFunction("opengl", EntryPoint = "glSelectPerfMonitorCountersAMD")]
-        public static uint SelectPerfMonitorCountersAMD(
-            uint monitor,
-            MaybeBool<uint> enable,
-            uint group
-        )
-        {
-            uint counterList = default;
-            SelectPerfMonitorCountersAMD(monitor, (uint)enable, group, 1, (uint*)&counterList);
-            return counterList;
-        }
-
         [NativeName("glSemaphoreParameterivNV")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glSemaphoreParameterivNV")]
         [SupportedApiProfile("gl", ["GL_NV_timeline_semaphore"])]
@@ -100279,15 +100272,6 @@ public static extern void TexEstimateMotionRegionQCOM(
             uint mask
         );
 
-        [NativeName("glTexFilterFuncSGIS")]
-        [SupportedApiProfile("gl", ["GL_SGIS_texture_filter4"])]
-        [NativeFunction("opengl", EntryPoint = "glTexFilterFuncSGIS")]
-        public static void TexFilterFuncSgiSGIS(
-            Constant<uint, GLEnum, TextureTarget> target,
-            Constant<uint, GLEnum, TextureFilterSGIS> filter,
-            float weights
-        ) => TexFilterFuncSGIS((uint)target, (uint)filter, 1, (float*)&weights);
-
         [NativeName("glTexFilterFuncSGIS")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glTexFilterFuncSGIS")]
         [SupportedApiProfile("gl", ["GL_SGIS_texture_filter4"])]
@@ -100317,6 +100301,15 @@ Ref<float> weights
             }
         }
 
+        [NativeName("glTexFilterFuncSGIS")]
+        [SupportedApiProfile("gl", ["GL_SGIS_texture_filter4"])]
+        [NativeFunction("opengl", EntryPoint = "glTexFilterFuncSGIS")]
+        public static void TexFilterFuncSGIS(
+            Constant<uint, GLEnum, TextureTarget> target,
+            Constant<uint, GLEnum, TextureFilterSGIS> filter,
+            float weights
+        ) => TexFilterFuncSGIS((uint)target, (uint)filter, 1, (float*)&weights);
+
         [NativeName("glTexGend")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glTexGend")]
         [SupportedApiProfile(
@@ -106713,6 +106706,62 @@ Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
             }
         }
 
+        [NativeName("glTransformFeedbackVaryingsEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_transform_feedback"])]
+        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsEXT")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void TransformFeedbackVaryingEXT(
+            uint program,
+            Ref<sbyte> varyings,
+            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
+        )
+        {
+            fixed (sbyte* __dsl_varyings = varyings)
+            {
+                TransformFeedbackVaryingsEXT(
+                    program,
+                    1,
+                    (sbyte**)&__dsl_varyings,
+                    (uint)bufferMode
+                );
+            }
+        }
+
+        [NativeName("glTransformFeedbackVaryingsNV")]
+        [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
+        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
+        public static void TransformFeedbackVaryingNV(
+            uint program,
+            int locations,
+            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
+        ) => TransformFeedbackVaryingsNV(program, 1, (int*)&locations, (uint)bufferMode);
+
+        [NativeName("glTransformFeedbackVaryingsNV")]
+        [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
+        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
+        public static void TransformFeedbackVaryingNV(
+            uint program,
+            GLEnum locations,
+            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
+        ) => TransformFeedbackVaryingsNV(program, 1, (int*)(GLEnum*)&locations, (uint)bufferMode);
+
+        [NativeName("glTransformFeedbackVaryingsNV")]
+        [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
+        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
+        public static void TransformFeedbackVaryingNV(
+            uint program,
+            TransformFeedbackTokenNV locations,
+            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
+        ) =>
+            TransformFeedbackVaryingsNV(
+                program,
+                1,
+                (int*)(TransformFeedbackTokenNV*)&locations,
+                (uint)bufferMode
+            );
+
         [NativeName("glTransformFeedbackVaryings")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glTransformFeedbackVaryings")]
         [SupportedApiProfile(
@@ -106837,29 +106886,6 @@ Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
             }
         }
 
-        [NativeName("glTransformFeedbackVaryingsEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_transform_feedback"])]
-        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void TransformFeedbackVaryingsEXT(
-            uint program,
-            Ref<sbyte> varyings,
-            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
-        )
-        {
-            fixed (sbyte* __dsl_varyings = varyings)
-            {
-                TransformFeedbackVaryingsEXT(
-                    program,
-                    1,
-                    (sbyte**)&__dsl_varyings,
-                    (uint)bufferMode
-                );
-            }
-        }
-
         [NativeName("glTransformFeedbackVaryingsNV")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glTransformFeedbackVaryingsNV")]
         [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
@@ -106889,15 +106915,6 @@ Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
             }
         }
 
-        [NativeName("glTransformFeedbackVaryingsNV")]
-        [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
-        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
-        public static void TransformFeedbackVaryingsNV(
-            uint program,
-            int locations,
-            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
-        ) => TransformFeedbackVaryingsNV(program, 1, (int*)&locations, (uint)bufferMode);
-
         [NativeName("glTransformFeedbackVaryingsNV")]
         [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
         [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
@@ -106922,15 +106939,6 @@ Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
             }
         }
 
-        [NativeName("glTransformFeedbackVaryingsNV")]
-        [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
-        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
-        public static void TransformFeedbackVaryingsNV(
-            uint program,
-            GLEnum locations,
-            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
-        ) => TransformFeedbackVaryingsNV(program, 1, (int*)(GLEnum*)&locations, (uint)bufferMode);
-
         [NativeName("glTransformFeedbackVaryingsNV")]
         [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
         [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
@@ -106955,21 +106963,6 @@ Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
             }
         }
 
-        [NativeName("glTransformFeedbackVaryingsNV")]
-        [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
-        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
-        public static void TransformFeedbackVaryingsNV(
-            uint program,
-            TransformFeedbackTokenNV locations,
-            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
-        ) =>
-            TransformFeedbackVaryingsNV(
-                program,
-                1,
-                (int*)(TransformFeedbackTokenNV*)&locations,
-                (uint)bufferMode
-            );
-
         [NativeName("glTransformPathNV")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glTransformPathNV")]
         [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
@@ -112126,7 +112119,7 @@ Ref<uint> indices
             MinVersion = "4.0"
         )]
         [NativeFunction("opengl", EntryPoint = "glUniformSubroutinesuiv")]
-        public static void UniformSubroutines(
+        public static void UniformSubroutine(
             Constant<uint, GLEnum, ShaderType> shadertype,
             uint indices
         ) => UniformSubroutines((uint)shadertype, 1, (uint*)&indices);
@@ -112909,6 +112902,12 @@ public static MaybeBool<uint> VdpauIsSurfaceNV(nint surface) =>
         [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
         public static extern uint VdpauIsSurfaceRawNV(nint surface);
 
+        [NativeName("glVDPAUMapSurfacesNV")]
+        [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
+        [NativeFunction("opengl", EntryPoint = "glVDPAUMapSurfacesNV")]
+        public static void VdpauMapSurfaceNV(nint surfaces) =>
+            VdpauMapSurfacesNV(1, (nint*)&surfaces);
+
         [NativeName("glVDPAUMapSurfacesNV")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glVDPAUMapSurfacesNV")]
         [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
@@ -112928,12 +112927,6 @@ public static void VdpauMapSurfacesNV(uint numSurfaces, Ref<nint> surfaces)
             }
         }
 
-        [NativeName("glVDPAUMapSurfacesNV")]
-        [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
-        [NativeFunction("opengl", EntryPoint = "glVDPAUMapSurfacesNV")]
-        public static void VdpauMapSurfacesNV(nint surfaces) =>
-            VdpauMapSurfacesNV(1, (nint*)&surfaces);
-
         [NativeName("glVDPAURegisterOutputSurfaceNV")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glVDPAURegisterOutputSurfaceNV")]
         [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
@@ -113051,6 +113044,12 @@ MaybeBool<uint> isFrameStructure
         [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
         public static extern void VdpauSurfaceAccessNV(nint surface, uint access);
 
+        [NativeName("glVDPAUUnmapSurfacesNV")]
+        [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
+        [NativeFunction("opengl", EntryPoint = "glVDPAUUnmapSurfacesNV")]
+        public static void VdpauUnmapSurfaceNV(nint surfaces) =>
+            VdpauUnmapSurfacesNV(1, (nint*)&surfaces);
+
         [NativeName("glVDPAUUnmapSurfacesNV")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glVDPAUUnmapSurfacesNV")]
         [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
@@ -113070,12 +113069,6 @@ public static void VdpauUnmapSurfacesNV(uint numSurface, Ref<nint> surfaces)
             }
         }
 
-        [NativeName("glVDPAUUnmapSurfacesNV")]
-        [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
-        [NativeFunction("opengl", EntryPoint = "glVDPAUUnmapSurfacesNV")]
-        public static void VdpauUnmapSurfacesNV(nint surfaces) =>
-            VdpauUnmapSurfacesNV(1, (nint*)&surfaces);
-
         [NativeName("glVDPAUUnregisterSurfaceNV")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glVDPAUUnregisterSurfaceNV")]
         [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
@@ -126973,6 +126966,14 @@ public static void WindowPos4MESA(Ref<short> v)
             }
         }
 
+        [NativeName("glWindowRectanglesEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_window_rectangles"])]
+        [SupportedApiProfile("glcore", ["GL_EXT_window_rectangles"])]
+        [SupportedApiProfile("gles2", ["GL_EXT_window_rectangles"])]
+        [NativeFunction("opengl", EntryPoint = "glWindowRectanglesEXT")]
+        public static void WindowRectangleEXT(uint mode, int box) =>
+            WindowRectanglesEXT(mode, 1, (int*)&box);
+
         [NativeName("glWindowRectanglesEXT")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glWindowRectanglesEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_window_rectangles"])]
@@ -126996,14 +126997,6 @@ public static void WindowRectanglesEXT(uint mode, uint count, Ref<int> box)
             }
         }
 
-        [NativeName("glWindowRectanglesEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_window_rectangles"])]
-        [SupportedApiProfile("glcore", ["GL_EXT_window_rectangles"])]
-        [SupportedApiProfile("gles2", ["GL_EXT_window_rectangles"])]
-        [NativeFunction("opengl", EntryPoint = "glWindowRectanglesEXT")]
-        public static void WindowRectanglesEXT(uint mode, int box) =>
-            WindowRectanglesEXT(mode, 1, (int*)&box);
-
         [NativeName("glWriteMaskEXT")]
         [DllImport("opengl", ExactSpelling = true, EntryPoint = "glWriteMaskEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])]
@@ -144020,7 +144013,7 @@ public void CoverStrokePathNV(uint path, Constant<uint, GLEnum, PathCoverMode> c
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void CreateCommandListsNV(uint n, uint* lists) => T.CreateCommandListsNV(n, lists);
+        public uint CreateCommandListNV() => T.CreateCommandListNV();
 
         [NativeName("glCreateCommandListsNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
@@ -144029,8 +144022,7 @@ public void CoverStrokePathNV(uint path, Constant<uint, GLEnum, PathCoverMode> c
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void CreateCommandListsNV(uint n, Ref<uint> lists) =>
-            T.CreateCommandListsNV(n, lists);
+        public void CreateCommandListsNV(uint n, uint* lists) => T.CreateCommandListsNV(n, lists);
 
         [NativeName("glCreateCommandListsNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
@@ -144039,7 +144031,8 @@ public void CreateCommandListsNV(uint n, Ref<uint> lists) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public uint CreateCommandListsNV() => T.CreateCommandListsNV();
+        public void CreateCommandListsNV(uint n, Ref<uint> lists) =>
+            T.CreateCommandListsNV(n, lists);
 
         [NativeName("glCreateFramebuffers")]
         [SupportedApiProfile(
@@ -144101,8 +144094,7 @@ public void CreateFramebuffers(uint n, Ref<uint> framebuffers) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void CreateMemoryObjectsEXT(uint n, uint* memoryObjects) =>
-            T.CreateMemoryObjectsEXT(n, memoryObjects);
+        public uint CreateMemoryObjectEXT() => T.CreateMemoryObjectEXT();
 
         [NativeName("glCreateMemoryObjectsEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
@@ -144111,7 +144103,7 @@ public void CreateMemoryObjectsEXT(uint n, uint* memoryObjects) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void CreateMemoryObjectsEXT(uint n, Ref<uint> memoryObjects) =>
+        public void CreateMemoryObjectsEXT(uint n, uint* memoryObjects) =>
             T.CreateMemoryObjectsEXT(n, memoryObjects);
 
         [NativeName("glCreateMemoryObjectsEXT")]
@@ -144121,7 +144113,8 @@ public void CreateMemoryObjectsEXT(uint n, Ref<uint> memoryObjects) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public uint CreateMemoryObjectsEXT() => T.CreateMemoryObjectsEXT();
+        public void CreateMemoryObjectsEXT(uint n, Ref<uint> memoryObjects) =>
+            T.CreateMemoryObjectsEXT(n, memoryObjects);
 
         [NativeName("glCreatePerfQueryINTEL")]
         [SupportedApiProfile("gl", ["GL_INTEL_performance_query"])]
@@ -144442,8 +144435,7 @@ public void CreateRenderbuffers(uint n, Ref<uint> renderbuffers) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void CreateSemaphoresNV(uint n, uint* semaphores) =>
-            T.CreateSemaphoresNV(n, semaphores);
+        public uint CreateSemaphoreNV() => T.CreateSemaphoreNV();
 
         [NativeName("glCreateSemaphoresNV")]
         [SupportedApiProfile("gl", ["GL_NV_timeline_semaphore"])]
@@ -144452,7 +144444,7 @@ public void CreateSemaphoresNV(uint n, uint* semaphores) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void CreateSemaphoresNV(uint n, Ref<uint> semaphores) =>
+        public void CreateSemaphoresNV(uint n, uint* semaphores) =>
             T.CreateSemaphoresNV(n, semaphores);
 
         [NativeName("glCreateSemaphoresNV")]
@@ -144462,7 +144454,8 @@ public void CreateSemaphoresNV(uint n, Ref<uint> semaphores) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public uint CreateSemaphoresNV() => T.CreateSemaphoresNV();
+        public void CreateSemaphoresNV(uint n, Ref<uint> semaphores) =>
+            T.CreateSemaphoresNV(n, semaphores);
 
         [NativeName("glCreateShader")]
         [SupportedApiProfile(
@@ -144702,7 +144695,7 @@ Ref2D<sbyte> strings
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void CreateStatesNV(uint n, uint* states) => T.CreateStatesNV(n, states);
+        public uint CreateStateNV() => T.CreateStateNV();
 
         [NativeName("glCreateStatesNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
@@ -144711,7 +144704,7 @@ Ref2D<sbyte> strings
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void CreateStatesNV(uint n, Ref<uint> states) => T.CreateStatesNV(n, states);
+        public void CreateStatesNV(uint n, uint* states) => T.CreateStatesNV(n, states);
 
         [NativeName("glCreateStatesNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
@@ -144720,7 +144713,7 @@ Ref2D<sbyte> strings
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public uint CreateStatesNV() => T.CreateStatesNV();
+        public void CreateStatesNV(uint n, Ref<uint> states) => T.CreateStatesNV(n, states);
 
         [NativeName("glCreateSyncFromCLeventARB")]
         [SupportedApiProfile("gl", ["GL_ARB_cl_event"])]
@@ -145867,6 +145860,14 @@ public void DeleteAsyncMarkersSGIX(uint marker, uint range) =>
         )]
         public void DeleteBuffer(uint buffers) => T.DeleteBuffer(buffers);
 
+        [NativeName("glDeleteBuffersARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteBuffersARB")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void DeleteBufferARB(uint buffers) => T.DeleteBufferARB(buffers);
+
         [NativeName("glDeleteBuffers")]
         [SupportedApiProfile(
             "gl",
@@ -145989,14 +145990,6 @@ public void DeleteAsyncMarkersSGIX(uint marker, uint range) =>
         )]
         public void DeleteBuffersARB(uint n, Ref<uint> buffers) => T.DeleteBuffersARB(n, buffers);
 
-        [NativeName("glDeleteBuffersARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteBuffersARB")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void DeleteBuffersARB(uint buffers) => T.DeleteBuffersARB(buffers);
-
         [NativeName("glDeleteCommandListsNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
         [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
@@ -146004,7 +145997,7 @@ public void DeleteAsyncMarkersSGIX(uint marker, uint range) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void DeleteCommandListsNV(uint n, uint* lists) => T.DeleteCommandListsNV(n, lists);
+        public void DeleteCommandListNV(uint lists) => T.DeleteCommandListNV(lists);
 
         [NativeName("glDeleteCommandListsNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
@@ -146013,8 +146006,7 @@ public void DeleteAsyncMarkersSGIX(uint marker, uint range) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void DeleteCommandListsNV(uint n, Ref<uint> lists) =>
-            T.DeleteCommandListsNV(n, lists);
+        public void DeleteCommandListsNV(uint n, uint* lists) => T.DeleteCommandListsNV(n, lists);
 
         [NativeName("glDeleteCommandListsNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
@@ -146023,7 +146015,8 @@ public void DeleteCommandListsNV(uint n, Ref<uint> lists) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void DeleteCommandListsNV(uint lists) => T.DeleteCommandListsNV(lists);
+        public void DeleteCommandListsNV(uint n, Ref<uint> lists) =>
+            T.DeleteCommandListsNV(n, lists);
 
         [NativeName("glDeleteFencesAPPLE")]
         [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
@@ -146031,7 +146024,17 @@ public void DeleteCommandListsNV(uint n, Ref<uint> lists) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void DeleteFencesAPPLE(uint n, uint* fences) => T.DeleteFencesAPPLE(n, fences);
+        public void DeleteFenceAPPLE(uint fences) => T.DeleteFenceAPPLE(fences);
+
+        [NativeName("glDeleteFencesNV")]
+        [SupportedApiProfile("gl", ["GL_NV_fence"])]
+        [SupportedApiProfile("gles2", ["GL_NV_fence"])]
+        [SupportedApiProfile("gles1", ["GL_NV_fence"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteFencesNV")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void DeleteFenceNV(uint fences) => T.DeleteFenceNV(fences);
 
         [NativeName("glDeleteFencesAPPLE")]
         [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
@@ -146039,7 +146042,7 @@ public void DeleteCommandListsNV(uint n, Ref<uint> lists) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void DeleteFencesAPPLE(uint n, Ref<uint> fences) => T.DeleteFencesAPPLE(n, fences);
+        public void DeleteFencesAPPLE(uint n, uint* fences) => T.DeleteFencesAPPLE(n, fences);
 
         [NativeName("glDeleteFencesAPPLE")]
         [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
@@ -146047,7 +146050,7 @@ public void DeleteCommandListsNV(uint n, Ref<uint> lists) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void DeleteFencesAPPLE(uint fences) => T.DeleteFencesAPPLE(fences);
+        public void DeleteFencesAPPLE(uint n, Ref<uint> fences) => T.DeleteFencesAPPLE(n, fences);
 
         [NativeName("glDeleteFencesNV")]
         [SupportedApiProfile("gl", ["GL_NV_fence"])]
@@ -146069,16 +146072,6 @@ public void DeleteCommandListsNV(uint n, Ref<uint> lists) =>
         )]
         public void DeleteFencesNV(uint n, Ref<uint> fences) => T.DeleteFencesNV(n, fences);
 
-        [NativeName("glDeleteFencesNV")]
-        [SupportedApiProfile("gl", ["GL_NV_fence"])]
-        [SupportedApiProfile("gles2", ["GL_NV_fence"])]
-        [SupportedApiProfile("gles1", ["GL_NV_fence"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteFencesNV")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void DeleteFencesNV(uint fences) => T.DeleteFencesNV(fences);
-
         [NativeName("glDeleteFragmentShaderATI")]
         [SupportedApiProfile("gl", ["GL_ATI_fragment_shader"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteFragmentShaderATI")]
@@ -146135,6 +146128,22 @@ public void DeleteCommandListsNV(uint n, Ref<uint> lists) =>
         )]
         public void DeleteFramebuffer(uint framebuffers) => T.DeleteFramebuffer(framebuffers);
 
+        [NativeName("glDeleteFramebuffersEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersEXT")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void DeleteFramebufferEXT(uint framebuffers) => T.DeleteFramebufferEXT(framebuffers);
+
+        [NativeName("glDeleteFramebuffersOES")]
+        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void DeleteFramebufferOES(uint framebuffers) => T.DeleteFramebufferOES(framebuffers);
+
         [NativeName("glDeleteFramebuffers")]
         [SupportedApiProfile(
             "gl",
@@ -146251,15 +146260,6 @@ public void DeleteFramebuffersEXT(uint n, uint* framebuffers) =>
         public void DeleteFramebuffersEXT(uint n, Ref<uint> framebuffers) =>
             T.DeleteFramebuffersEXT(n, framebuffers);
 
-        [NativeName("glDeleteFramebuffersEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void DeleteFramebuffersEXT(uint framebuffers) =>
-            T.DeleteFramebuffersEXT(framebuffers);
-
         [NativeName("glDeleteFramebuffersOES")]
         [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")]
@@ -146278,15 +146278,6 @@ public void DeleteFramebuffersOES(uint n, uint* framebuffers) =>
         public void DeleteFramebuffersOES(uint n, Ref<uint> framebuffers) =>
             T.DeleteFramebuffersOES(n, framebuffers);
 
-        [NativeName("glDeleteFramebuffersOES")]
-        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void DeleteFramebuffersOES(uint framebuffers) =>
-            T.DeleteFramebuffersOES(framebuffers);
-
         [NativeName("glDeleteLists")]
         [SupportedApiProfile(
             "gl",
@@ -146326,8 +146317,8 @@ public void DeleteFramebuffersOES(uint framebuffers) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void DeleteMemoryObjectsEXT(uint n, uint* memoryObjects) =>
-            T.DeleteMemoryObjectsEXT(n, memoryObjects);
+        public void DeleteMemoryObjectEXT(uint memoryObjects) =>
+            T.DeleteMemoryObjectEXT(memoryObjects);
 
         [NativeName("glDeleteMemoryObjectsEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
@@ -146336,7 +146327,7 @@ public void DeleteMemoryObjectsEXT(uint n, uint* memoryObjects) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void DeleteMemoryObjectsEXT(uint n, Ref<uint> memoryObjects) =>
+        public void DeleteMemoryObjectsEXT(uint n, uint* memoryObjects) =>
             T.DeleteMemoryObjectsEXT(n, memoryObjects);
 
         [NativeName("glDeleteMemoryObjectsEXT")]
@@ -146346,8 +146337,17 @@ public void DeleteMemoryObjectsEXT(uint n, Ref<uint> memoryObjects) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void DeleteMemoryObjectsEXT(uint memoryObjects) =>
-            T.DeleteMemoryObjectsEXT(memoryObjects);
+        public void DeleteMemoryObjectsEXT(uint n, Ref<uint> memoryObjects) =>
+            T.DeleteMemoryObjectsEXT(n, memoryObjects);
+
+        [NativeName("glDeleteNamesAMD")]
+        [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteNamesAMD")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void DeleteNameAMD(uint identifier, uint names) =>
+            T.DeleteNameAMD(identifier, names);
 
         [NativeName("glDeleteNamedStringARB")]
         [SupportedApiProfile("gl", ["GL_ARB_shading_language_include"])]
@@ -146396,15 +146396,6 @@ public void DeleteNamesAMD(uint identifier, uint num, uint* names) =>
         public void DeleteNamesAMD(uint identifier, uint num, Ref<uint> names) =>
             T.DeleteNamesAMD(identifier, num, names);
 
-        [NativeName("glDeleteNamesAMD")]
-        [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteNamesAMD")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void DeleteNamesAMD(uint identifier, uint names) =>
-            T.DeleteNamesAMD(identifier, names);
-
         [NativeName("glDeleteObjectARB")]
         [SupportedApiProfile("gl", ["GL_ARB_shader_objects"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteObjectARB")]
@@ -146437,7 +146428,7 @@ public void DeleteOcclusionQueriesNV(uint n, Ref<uint> ids) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void DeleteOcclusionQueriesNV(uint ids) => T.DeleteOcclusionQueriesNV(ids);
+        public void DeleteOcclusionQueryNV(uint ids) => T.DeleteOcclusionQueryNV(ids);
 
         [NativeName("glDeletePathsNV")]
         [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
@@ -146457,8 +146448,7 @@ public void DeleteOcclusionQueriesNV(uint n, Ref<uint> ids) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void DeletePerfMonitorsAMD(uint n, uint* monitors) =>
-            T.DeletePerfMonitorsAMD(n, monitors);
+        public uint DeletePerfMonitorAMD() => T.DeletePerfMonitorAMD();
 
         [NativeName("glDeletePerfMonitorsAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
@@ -146468,7 +146458,7 @@ public void DeletePerfMonitorsAMD(uint n, uint* monitors) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void DeletePerfMonitorsAMD(uint n, Ref<uint> monitors) =>
+        public void DeletePerfMonitorsAMD(uint n, uint* monitors) =>
             T.DeletePerfMonitorsAMD(n, monitors);
 
         [NativeName("glDeletePerfMonitorsAMD")]
@@ -146479,7 +146469,8 @@ public void DeletePerfMonitorsAMD(uint n, Ref<uint> monitors) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public uint DeletePerfMonitorsAMD() => T.DeletePerfMonitorsAMD();
+        public void DeletePerfMonitorsAMD(uint n, Ref<uint> monitors) =>
+            T.DeletePerfMonitorsAMD(n, monitors);
 
         [NativeName("glDeletePerfQueryINTEL")]
         [SupportedApiProfile("gl", ["GL_INTEL_performance_query"])]
@@ -146574,6 +146565,15 @@ public void DeletePerfMonitorsAMD(uint n, Ref<uint> monitors) =>
         )]
         public void DeleteProgramPipeline(uint pipelines) => T.DeleteProgramPipeline(pipelines);
 
+        [NativeName("glDeleteProgramPipelinesEXT")]
+        [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteProgramPipelinesEXT")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void DeleteProgramPipelineEXT(uint pipelines) =>
+            T.DeleteProgramPipelineEXT(pipelines);
+
         [NativeName("glDeleteProgramPipelines")]
         [SupportedApiProfile(
             "gl",
@@ -146660,15 +146660,6 @@ public void DeleteProgramPipelinesEXT(uint n, uint* pipelines) =>
         public void DeleteProgramPipelinesEXT(uint n, Ref<uint> pipelines) =>
             T.DeleteProgramPipelinesEXT(n, pipelines);
 
-        [NativeName("glDeleteProgramPipelinesEXT")]
-        [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteProgramPipelinesEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void DeleteProgramPipelinesEXT(uint pipelines) =>
-            T.DeleteProgramPipelinesEXT(pipelines);
-
         [NativeName("glDeleteProgramsARB")]
         [SupportedApiProfile("gl", ["GL_ARB_fragment_program", "GL_ARB_vertex_program"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteProgramsARB")]
@@ -146827,14 +146818,6 @@ public void DeleteProgramPipelinesEXT(uint pipelines) =>
         )]
         public void DeleteQueriesARB(uint n, Ref<uint> ids) => T.DeleteQueriesARB(n, ids);
 
-        [NativeName("glDeleteQueriesARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteQueriesARB")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void DeleteQueriesARB(uint ids) => T.DeleteQueriesARB(ids);
-
         [NativeName("glDeleteQueriesEXT")]
         [SupportedApiProfile(
             "gles2",
@@ -146857,17 +146840,6 @@ public void DeleteProgramPipelinesEXT(uint pipelines) =>
         )]
         public void DeleteQueriesEXT(uint n, Ref<uint> ids) => T.DeleteQueriesEXT(n, ids);
 
-        [NativeName("glDeleteQueriesEXT")]
-        [SupportedApiProfile(
-            "gles2",
-            ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
-        )]
-        [NativeFunction("opengl", EntryPoint = "glDeleteQueriesEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void DeleteQueriesEXT(uint ids) => T.DeleteQueriesEXT(ids);
-
         [NativeName("glDeleteQueries")]
         [SupportedApiProfile(
             "gl",
@@ -146915,6 +146887,25 @@ public void DeleteProgramPipelinesEXT(uint pipelines) =>
         )]
         public void DeleteQuery(uint ids) => T.DeleteQuery(ids);
 
+        [NativeName("glDeleteQueriesARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteQueriesARB")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void DeleteQueryARB(uint ids) => T.DeleteQueryARB(ids);
+
+        [NativeName("glDeleteQueriesEXT")]
+        [SupportedApiProfile(
+            "gles2",
+            ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
+        )]
+        [NativeFunction("opengl", EntryPoint = "glDeleteQueriesEXT")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void DeleteQueryEXT(uint ids) => T.DeleteQueryEXT(ids);
+
         [NativeName("glDeleteQueryResourceTagNV")]
         [SupportedApiProfile("gl", ["GL_NV_query_resource_tag"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteQueryResourceTagNV")]
@@ -146989,6 +146980,24 @@ public void DeleteQueryResourceTagNV(uint n, Ref<int> tagIds) =>
         )]
         public void DeleteRenderbuffer(uint renderbuffers) => T.DeleteRenderbuffer(renderbuffers);
 
+        [NativeName("glDeleteRenderbuffersEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersEXT")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void DeleteRenderbufferEXT(uint renderbuffers) =>
+            T.DeleteRenderbufferEXT(renderbuffers);
+
+        [NativeName("glDeleteRenderbuffersOES")]
+        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void DeleteRenderbufferOES(uint renderbuffers) =>
+            T.DeleteRenderbufferOES(renderbuffers);
+
         [NativeName("glDeleteRenderbuffers")]
         [SupportedApiProfile(
             "gl",
@@ -147105,15 +147114,6 @@ public void DeleteRenderbuffersEXT(uint n, uint* renderbuffers) =>
         public void DeleteRenderbuffersEXT(uint n, Ref<uint> renderbuffers) =>
             T.DeleteRenderbuffersEXT(n, renderbuffers);
 
-        [NativeName("glDeleteRenderbuffersEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void DeleteRenderbuffersEXT(uint renderbuffers) =>
-            T.DeleteRenderbuffersEXT(renderbuffers);
-
         [NativeName("glDeleteRenderbuffersOES")]
         [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")]
@@ -147132,15 +147132,6 @@ public void DeleteRenderbuffersOES(uint n, uint* renderbuffers) =>
         public void DeleteRenderbuffersOES(uint n, Ref<uint> renderbuffers) =>
             T.DeleteRenderbuffersOES(n, renderbuffers);
 
-        [NativeName("glDeleteRenderbuffersOES")]
-        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void DeleteRenderbuffersOES(uint renderbuffers) =>
-            T.DeleteRenderbuffersOES(renderbuffers);
-
         [NativeName("glDeleteSamplers")]
         [SupportedApiProfile(
             "gl",
@@ -147290,8 +147281,7 @@ public void DeleteSamplers(uint count, Ref<uint> samplers) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void DeleteSemaphoresEXT(uint n, uint* semaphores) =>
-            T.DeleteSemaphoresEXT(n, semaphores);
+        public void DeleteSemaphoreEXT(uint semaphores) => T.DeleteSemaphoreEXT(semaphores);
 
         [NativeName("glDeleteSemaphoresEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
@@ -147300,7 +147290,7 @@ public void DeleteSemaphoresEXT(uint n, uint* semaphores) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void DeleteSemaphoresEXT(uint n, Ref<uint> semaphores) =>
+        public void DeleteSemaphoresEXT(uint n, uint* semaphores) =>
             T.DeleteSemaphoresEXT(n, semaphores);
 
         [NativeName("glDeleteSemaphoresEXT")]
@@ -147310,7 +147300,8 @@ public void DeleteSemaphoresEXT(uint n, Ref<uint> semaphores) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void DeleteSemaphoresEXT(uint semaphores) => T.DeleteSemaphoresEXT(semaphores);
+        public void DeleteSemaphoresEXT(uint n, Ref<uint> semaphores) =>
+            T.DeleteSemaphoresEXT(n, semaphores);
 
         [NativeName("glDeleteShader")]
         [SupportedApiProfile(
@@ -147369,7 +147360,7 @@ public void DeleteSemaphoresEXT(uint n, Ref<uint> semaphores) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void DeleteStatesNV(uint n, uint* states) => T.DeleteStatesNV(n, states);
+        public void DeleteStateNV(uint states) => T.DeleteStateNV(states);
 
         [NativeName("glDeleteStatesNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
@@ -147378,7 +147369,7 @@ public void DeleteSemaphoresEXT(uint n, Ref<uint> semaphores) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void DeleteStatesNV(uint n, Ref<uint> states) => T.DeleteStatesNV(n, states);
+        public void DeleteStatesNV(uint n, uint* states) => T.DeleteStatesNV(n, states);
 
         [NativeName("glDeleteStatesNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
@@ -147387,7 +147378,7 @@ public void DeleteSemaphoresEXT(uint n, Ref<uint> semaphores) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void DeleteStatesNV(uint states) => T.DeleteStatesNV(states);
+        public void DeleteStatesNV(uint n, Ref<uint> states) => T.DeleteStatesNV(n, states);
 
         [NativeName("glDeleteSync")]
         [SupportedApiProfile(
@@ -147546,6 +147537,14 @@ public void DeleteSemaphoresEXT(uint n, Ref<uint> semaphores) =>
         )]
         public void DeleteTexture(uint textures) => T.DeleteTexture(textures);
 
+        [NativeName("glDeleteTexturesEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_texture_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteTexturesEXT")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void DeleteTextureEXT(uint textures) => T.DeleteTextureEXT(textures);
+
         [NativeName("glDeleteTextures")]
         [SupportedApiProfile(
             "gl",
@@ -147685,14 +147684,6 @@ public void DeleteSemaphoresEXT(uint n, Ref<uint> semaphores) =>
         public void DeleteTexturesEXT(uint n, Ref<uint> textures) =>
             T.DeleteTexturesEXT(n, textures);
 
-        [NativeName("glDeleteTexturesEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_texture_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteTexturesEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void DeleteTexturesEXT(uint textures) => T.DeleteTexturesEXT(textures);
-
         [NativeName("glDeleteTransformFeedbacks")]
         [SupportedApiProfile(
             "gl",
@@ -147728,6 +147719,14 @@ public void DeleteTexturesEXT(uint n, Ref<uint> textures) =>
         )]
         public void DeleteTransformFeedback(uint ids) => T.DeleteTransformFeedback(ids);
 
+        [NativeName("glDeleteTransformFeedbacksNV")]
+        [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteTransformFeedbacksNV")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void DeleteTransformFeedbackNV(uint ids) => T.DeleteTransformFeedbackNV(ids);
+
         [NativeName("glDeleteTransformFeedbacks")]
         [SupportedApiProfile(
             "gl",
@@ -147818,14 +147817,6 @@ public void DeleteTransformFeedbacksNV(uint n, uint* ids) =>
         public void DeleteTransformFeedbacksNV(uint n, Ref<uint> ids) =>
             T.DeleteTransformFeedbacksNV(n, ids);
 
-        [NativeName("glDeleteTransformFeedbacksNV")]
-        [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteTransformFeedbacksNV")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void DeleteTransformFeedbacksNV(uint ids) => T.DeleteTransformFeedbacksNV(ids);
-
         [NativeName("glDeleteVertexArrays")]
         [SupportedApiProfile(
             "gl",
@@ -147869,6 +147860,23 @@ public void DeleteTransformFeedbacksNV(uint n, Ref<uint> ids) =>
         )]
         public void DeleteVertexArray(uint arrays) => T.DeleteVertexArray(arrays);
 
+        [NativeName("glDeleteVertexArraysAPPLE")]
+        [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysAPPLE")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void DeleteVertexArrayAPPLE(uint arrays) => T.DeleteVertexArrayAPPLE(arrays);
+
+        [NativeName("glDeleteVertexArraysOES")]
+        [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
+        [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void DeleteVertexArrayOES(uint arrays) => T.DeleteVertexArrayOES(arrays);
+
         [NativeName("glDeleteVertexArrays")]
         [SupportedApiProfile(
             "gl",
@@ -147973,14 +147981,6 @@ public void DeleteVertexArraysAPPLE(uint n, uint* arrays) =>
         public void DeleteVertexArraysAPPLE(uint n, Ref<uint> arrays) =>
             T.DeleteVertexArraysAPPLE(n, arrays);
 
-        [NativeName("glDeleteVertexArraysAPPLE")]
-        [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysAPPLE")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void DeleteVertexArraysAPPLE(uint arrays) => T.DeleteVertexArraysAPPLE(arrays);
-
         [NativeName("glDeleteVertexArraysOES")]
         [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
         [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
@@ -148001,15 +148001,6 @@ public void DeleteVertexArraysOES(uint n, uint* arrays) =>
         public void DeleteVertexArraysOES(uint n, Ref<uint> arrays) =>
             T.DeleteVertexArraysOES(n, arrays);
 
-        [NativeName("glDeleteVertexArraysOES")]
-        [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
-        [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void DeleteVertexArraysOES(uint arrays) => T.DeleteVertexArraysOES(arrays);
-
         [NativeName("glDeleteVertexShaderEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteVertexShaderEXT")]
@@ -150106,6 +150097,70 @@ uint primcount
         )]
         public void DrawBuffer(DrawBufferMode bufs) => T.DrawBuffer(bufs);
 
+        [NativeName("glDrawBuffersARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void DrawBufferARB(uint bufs) => T.DrawBufferARB(bufs);
+
+        [NativeName("glDrawBuffersARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void DrawBufferARB(GLEnum bufs) => T.DrawBufferARB(bufs);
+
+        [NativeName("glDrawBuffersARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void DrawBufferARB(DrawBufferMode bufs) => T.DrawBufferARB(bufs);
+
+        [NativeName("glDrawBuffersATI")]
+        [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void DrawBufferATI(uint bufs) => T.DrawBufferATI(bufs);
+
+        [NativeName("glDrawBuffersATI")]
+        [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void DrawBufferATI(GLEnum bufs) => T.DrawBufferATI(bufs);
+
+        [NativeName("glDrawBuffersATI")]
+        [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void DrawBufferATI(DrawBufferMode bufs) => T.DrawBufferATI(bufs);
+
+        [NativeName("glDrawBuffersEXT")]
+        [SupportedApiProfile("gles2", ["GL_EXT_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersEXT")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void DrawBufferEXT(uint bufs) => T.DrawBufferEXT(bufs);
+
+        [NativeName("glDrawBuffersNV")]
+        [SupportedApiProfile("gles2", ["GL_NV_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersNV")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void DrawBufferNV(uint bufs) => T.DrawBufferNV(bufs);
+
         [NativeName("glDrawBuffers")]
         [SupportedApiProfile(
             "gl",
@@ -150302,14 +150357,6 @@ uint primcount
         )]
         public void DrawBuffersARB(uint n, Ref<uint> bufs) => T.DrawBuffersARB(n, bufs);
 
-        [NativeName("glDrawBuffersARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void DrawBuffersARB(uint bufs) => T.DrawBuffersARB(bufs);
-
         [NativeName("glDrawBuffersARB")]
         [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
         [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
@@ -150318,14 +150365,6 @@ uint primcount
         )]
         public void DrawBuffersARB(uint n, Ref<GLEnum> bufs) => T.DrawBuffersARB(n, bufs);
 
-        [NativeName("glDrawBuffersARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void DrawBuffersARB(GLEnum bufs) => T.DrawBuffersARB(bufs);
-
         [NativeName("glDrawBuffersARB")]
         [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
         [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
@@ -150334,14 +150373,6 @@ uint primcount
         )]
         public void DrawBuffersARB(uint n, Ref<DrawBufferMode> bufs) => T.DrawBuffersARB(n, bufs);
 
-        [NativeName("glDrawBuffersARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void DrawBuffersARB(DrawBufferMode bufs) => T.DrawBuffersARB(bufs);
-
         [NativeName("glDrawBuffersATI")]
         [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
         [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
@@ -150358,14 +150389,6 @@ uint primcount
         )]
         public void DrawBuffersATI(uint n, Ref<uint> bufs) => T.DrawBuffersATI(n, bufs);
 
-        [NativeName("glDrawBuffersATI")]
-        [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void DrawBuffersATI(uint bufs) => T.DrawBuffersATI(bufs);
-
         [NativeName("glDrawBuffersATI")]
         [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
         [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
@@ -150374,14 +150397,6 @@ uint primcount
         )]
         public void DrawBuffersATI(uint n, Ref<GLEnum> bufs) => T.DrawBuffersATI(n, bufs);
 
-        [NativeName("glDrawBuffersATI")]
-        [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void DrawBuffersATI(GLEnum bufs) => T.DrawBuffersATI(bufs);
-
         [NativeName("glDrawBuffersATI")]
         [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
         [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
@@ -150390,14 +150405,6 @@ uint primcount
         )]
         public void DrawBuffersATI(uint n, Ref<DrawBufferMode> bufs) => T.DrawBuffersATI(n, bufs);
 
-        [NativeName("glDrawBuffersATI")]
-        [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void DrawBuffersATI(DrawBufferMode bufs) => T.DrawBuffersATI(bufs);
-
         [NativeName("glDrawBuffersEXT")]
         [SupportedApiProfile("gles2", ["GL_EXT_draw_buffers"])]
         [NativeFunction("opengl", EntryPoint = "glDrawBuffersEXT")]
@@ -150414,14 +150421,6 @@ uint primcount
         )]
         public void DrawBuffersEXT(uint n, Ref<uint> bufs) => T.DrawBuffersEXT(n, bufs);
 
-        [NativeName("glDrawBuffersEXT")]
-        [SupportedApiProfile("gles2", ["GL_EXT_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void DrawBuffersEXT(uint bufs) => T.DrawBuffersEXT(bufs);
-
         [NativeName("glDrawBuffersIndexedEXT")]
         [SupportedApiProfile("gles2", ["GL_EXT_multiview_draw_buffers"])]
         [NativeFunction("opengl", EntryPoint = "glDrawBuffersIndexedEXT")]
@@ -150456,14 +150455,6 @@ public void DrawBuffersIndexedEXT(int n, Ref<uint> location, Ref<int> indices) =
         )]
         public void DrawBuffersNV(uint n, Ref<uint> bufs) => T.DrawBuffersNV(n, bufs);
 
-        [NativeName("glDrawBuffersNV")]
-        [SupportedApiProfile("gles2", ["GL_NV_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersNV")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void DrawBuffersNV(uint bufs) => T.DrawBuffersNV(bufs);
-
         [NativeName("glDrawCommandsAddressNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
         [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
@@ -154788,8 +154779,7 @@ public void ExtGetBufferPointerQCOM(uint target, Ref2D @params) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void ExtGetBuffersQCOM(uint* buffers, int maxBuffers, int* numBuffers) =>
-            T.ExtGetBuffersQCOM(buffers, maxBuffers, numBuffers);
+        public uint ExtGetBufferQCOM(Ref<int> numBuffers) => T.ExtGetBufferQCOM(numBuffers);
 
         [NativeName("glExtGetBuffersQCOM")]
         [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
@@ -154798,7 +154788,7 @@ public void ExtGetBuffersQCOM(uint* buffers, int maxBuffers, int* numBuffers) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void ExtGetBuffersQCOM(Ref<uint> buffers, int maxBuffers, Ref<int> numBuffers) =>
+        public void ExtGetBuffersQCOM(uint* buffers, int maxBuffers, int* numBuffers) =>
             T.ExtGetBuffersQCOM(buffers, maxBuffers, numBuffers);
 
         [NativeName("glExtGetBuffersQCOM")]
@@ -154808,7 +154798,8 @@ public void ExtGetBuffersQCOM(Ref<uint> buffers, int maxBuffers, Ref<int> numBuf
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public uint ExtGetBuffersQCOM(Ref<int> numBuffers) => T.ExtGetBuffersQCOM(numBuffers);
+        public void ExtGetBuffersQCOM(Ref<uint> buffers, int maxBuffers, Ref<int> numBuffers) =>
+            T.ExtGetBuffersQCOM(buffers, maxBuffers, numBuffers);
 
         [NativeName("glExtGetFramebuffersQCOM")]
         [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
@@ -154817,11 +154808,8 @@ public void ExtGetBuffersQCOM(Ref<uint> buffers, int maxBuffers, Ref<int> numBuf
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void ExtGetFramebuffersQCOM(
-            uint* framebuffers,
-            int maxFramebuffers,
-            int* numFramebuffers
-        ) => T.ExtGetFramebuffersQCOM(framebuffers, maxFramebuffers, numFramebuffers);
+        public uint ExtGetFramebufferQCOM(Ref<int> numFramebuffers) =>
+            T.ExtGetFramebufferQCOM(numFramebuffers);
 
         [NativeName("glExtGetFramebuffersQCOM")]
         [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
@@ -154831,9 +154819,9 @@ public void ExtGetFramebuffersQCOM(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
         public void ExtGetFramebuffersQCOM(
-            Ref<uint> framebuffers,
+            uint* framebuffers,
             int maxFramebuffers,
-            Ref<int> numFramebuffers
+            int* numFramebuffers
         ) => T.ExtGetFramebuffersQCOM(framebuffers, maxFramebuffers, numFramebuffers);
 
         [NativeName("glExtGetFramebuffersQCOM")]
@@ -154843,8 +154831,11 @@ Ref<int> numFramebuffers
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public uint ExtGetFramebuffersQCOM(Ref<int> numFramebuffers) =>
-            T.ExtGetFramebuffersQCOM(numFramebuffers);
+        public void ExtGetFramebuffersQCOM(
+            Ref<uint> framebuffers,
+            int maxFramebuffers,
+            Ref<int> numFramebuffers
+        ) => T.ExtGetFramebuffersQCOM(framebuffers, maxFramebuffers, numFramebuffers);
 
         [NativeName("glExtGetProgramBinarySourceQCOM")]
         [SupportedApiProfile("gles2", ["GL_QCOM_extended_get2"])]
@@ -154910,11 +154901,8 @@ public void ExtGetProgramQCOM(Ref<uint> programs, int maxPrograms, Ref<int> numP
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void ExtGetRenderbuffersQCOM(
-            uint* renderbuffers,
-            int maxRenderbuffers,
-            int* numRenderbuffers
-        ) => T.ExtGetRenderbuffersQCOM(renderbuffers, maxRenderbuffers, numRenderbuffers);
+        public uint ExtGetRenderbufferQCOM(Ref<int> numRenderbuffers) =>
+            T.ExtGetRenderbufferQCOM(numRenderbuffers);
 
         [NativeName("glExtGetRenderbuffersQCOM")]
         [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
@@ -154924,9 +154912,9 @@ public void ExtGetRenderbuffersQCOM(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
         public void ExtGetRenderbuffersQCOM(
-            Ref<uint> renderbuffers,
+            uint* renderbuffers,
             int maxRenderbuffers,
-            Ref<int> numRenderbuffers
+            int* numRenderbuffers
         ) => T.ExtGetRenderbuffersQCOM(renderbuffers, maxRenderbuffers, numRenderbuffers);
 
         [NativeName("glExtGetRenderbuffersQCOM")]
@@ -154936,8 +154924,11 @@ Ref<int> numRenderbuffers
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public uint ExtGetRenderbuffersQCOM(Ref<int> numRenderbuffers) =>
-            T.ExtGetRenderbuffersQCOM(numRenderbuffers);
+        public void ExtGetRenderbuffersQCOM(
+            Ref<uint> renderbuffers,
+            int maxRenderbuffers,
+            Ref<int> numRenderbuffers
+        ) => T.ExtGetRenderbuffersQCOM(renderbuffers, maxRenderbuffers, numRenderbuffers);
 
         [NativeName("glExtGetShadersQCOM")]
         [SupportedApiProfile("gles2", ["GL_QCOM_extended_get2"])]
@@ -154946,8 +154937,7 @@ public uint ExtGetRenderbuffersQCOM(Ref<int> numRenderbuffers) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void ExtGetShadersQCOM(uint* shaders, int maxShaders, int* numShaders) =>
-            T.ExtGetShadersQCOM(shaders, maxShaders, numShaders);
+        public uint ExtGetShaderQCOM(Ref<int> numShaders) => T.ExtGetShaderQCOM(numShaders);
 
         [NativeName("glExtGetShadersQCOM")]
         [SupportedApiProfile("gles2", ["GL_QCOM_extended_get2"])]
@@ -154956,7 +154946,7 @@ public void ExtGetShadersQCOM(uint* shaders, int maxShaders, int* numShaders) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void ExtGetShadersQCOM(Ref<uint> shaders, int maxShaders, Ref<int> numShaders) =>
+        public void ExtGetShadersQCOM(uint* shaders, int maxShaders, int* numShaders) =>
             T.ExtGetShadersQCOM(shaders, maxShaders, numShaders);
 
         [NativeName("glExtGetShadersQCOM")]
@@ -154966,7 +154956,8 @@ public void ExtGetShadersQCOM(Ref<uint> shaders, int maxShaders, Ref<int> numSha
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public uint ExtGetShadersQCOM(Ref<int> numShaders) => T.ExtGetShadersQCOM(numShaders);
+        public void ExtGetShadersQCOM(Ref<uint> shaders, int maxShaders, Ref<int> numShaders) =>
+            T.ExtGetShadersQCOM(shaders, maxShaders, numShaders);
 
         [NativeName("glExtGetTexLevelParameterivQCOM")]
         [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
@@ -156880,8 +156871,8 @@ Constant<uint, GLEnum, DrawBufferMode> mode
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void FramebufferDrawBuffersEXT(uint framebuffer, uint n, uint* bufs) =>
-            T.FramebufferDrawBuffersEXT(framebuffer, n, bufs);
+        public void FramebufferDrawBufferEXT(uint framebuffer, GLEnum bufs) =>
+            T.FramebufferDrawBufferEXT(framebuffer, bufs);
 
         [NativeName("glFramebufferDrawBuffersEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
@@ -156890,8 +156881,8 @@ public void FramebufferDrawBuffersEXT(uint framebuffer, uint n, uint* bufs) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void FramebufferDrawBuffersEXT(uint framebuffer, uint n, Ref<uint> bufs) =>
-            T.FramebufferDrawBuffersEXT(framebuffer, n, bufs);
+        public void FramebufferDrawBufferEXT(uint framebuffer, DrawBufferMode bufs) =>
+            T.FramebufferDrawBufferEXT(framebuffer, bufs);
 
         [NativeName("glFramebufferDrawBuffersEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
@@ -156900,8 +156891,8 @@ public void FramebufferDrawBuffersEXT(uint framebuffer, uint n, Ref<uint> bufs)
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void FramebufferDrawBuffersEXT(uint framebuffer, uint bufs) =>
-            T.FramebufferDrawBuffersEXT(framebuffer, bufs);
+        public void FramebufferDrawBuffersEXT(uint framebuffer, uint n, uint* bufs) =>
+            T.FramebufferDrawBuffersEXT(framebuffer, n, bufs);
 
         [NativeName("glFramebufferDrawBuffersEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
@@ -156910,7 +156901,7 @@ public void FramebufferDrawBuffersEXT(uint framebuffer, uint bufs) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void FramebufferDrawBuffersEXT(uint framebuffer, uint n, Ref<GLEnum> bufs) =>
+        public void FramebufferDrawBuffersEXT(uint framebuffer, uint n, Ref<uint> bufs) =>
             T.FramebufferDrawBuffersEXT(framebuffer, n, bufs);
 
         [NativeName("glFramebufferDrawBuffersEXT")]
@@ -156920,8 +156911,8 @@ public void FramebufferDrawBuffersEXT(uint framebuffer, uint n, Ref<GLEnum> bufs
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void FramebufferDrawBuffersEXT(uint framebuffer, GLEnum bufs) =>
-            T.FramebufferDrawBuffersEXT(framebuffer, bufs);
+        public void FramebufferDrawBuffersEXT(uint framebuffer, uint n, Ref<GLEnum> bufs) =>
+            T.FramebufferDrawBuffersEXT(framebuffer, n, bufs);
 
         [NativeName("glFramebufferDrawBuffersEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
@@ -156933,16 +156924,6 @@ public void FramebufferDrawBuffersEXT(uint framebuffer, GLEnum bufs) =>
         public void FramebufferDrawBuffersEXT(uint framebuffer, uint n, Ref<DrawBufferMode> bufs) =>
             T.FramebufferDrawBuffersEXT(framebuffer, n, bufs);
 
-        [NativeName("glFramebufferDrawBuffersEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
-        [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
-        [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void FramebufferDrawBuffersEXT(uint framebuffer, DrawBufferMode bufs) =>
-            T.FramebufferDrawBuffersEXT(framebuffer, bufs);
-
         [NativeName("glFramebufferFetchBarrierEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_shader_framebuffer_fetch_non_coherent"])]
         [SupportedApiProfile("glcore", ["GL_EXT_shader_framebuffer_fetch_non_coherent"])]
@@ -158850,6 +158831,14 @@ public void FrustumxOES(int l, int r, int b, int t, int n, int f) =>
         )]
         public uint GenBuffer() => T.GenBuffer();
 
+        [NativeName("glGenBuffersARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenBuffersARB")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public uint GenBufferARB() => T.GenBufferARB();
+
         [NativeName("glGenBuffers")]
         [SupportedApiProfile(
             "gl",
@@ -158972,14 +158961,6 @@ public void FrustumxOES(int l, int r, int b, int t, int n, int f) =>
         )]
         public void GenBuffersARB(uint n, Ref<uint> buffers) => T.GenBuffersARB(n, buffers);
 
-        [NativeName("glGenBuffersARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenBuffersARB")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public uint GenBuffersARB() => T.GenBuffersARB();
-
         [NativeName("glGenerateMipmap")]
         [SupportedApiProfile(
             "gl",
@@ -159178,7 +159159,17 @@ Constant<uint, GLEnum, TextureTarget> target
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void GenFencesAPPLE(uint n, uint* fences) => T.GenFencesAPPLE(n, fences);
+        public uint GenFenceAPPLE() => T.GenFenceAPPLE();
+
+        [NativeName("glGenFencesNV")]
+        [SupportedApiProfile("gl", ["GL_NV_fence"])]
+        [SupportedApiProfile("gles2", ["GL_NV_fence"])]
+        [SupportedApiProfile("gles1", ["GL_NV_fence"])]
+        [NativeFunction("opengl", EntryPoint = "glGenFencesNV")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public uint GenFenceNV() => T.GenFenceNV();
 
         [NativeName("glGenFencesAPPLE")]
         [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
@@ -159186,7 +159177,7 @@ Constant<uint, GLEnum, TextureTarget> target
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void GenFencesAPPLE(uint n, Ref<uint> fences) => T.GenFencesAPPLE(n, fences);
+        public void GenFencesAPPLE(uint n, uint* fences) => T.GenFencesAPPLE(n, fences);
 
         [NativeName("glGenFencesAPPLE")]
         [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
@@ -159194,7 +159185,7 @@ Constant<uint, GLEnum, TextureTarget> target
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public uint GenFencesAPPLE() => T.GenFencesAPPLE();
+        public void GenFencesAPPLE(uint n, Ref<uint> fences) => T.GenFencesAPPLE(n, fences);
 
         [NativeName("glGenFencesNV")]
         [SupportedApiProfile("gl", ["GL_NV_fence"])]
@@ -159216,16 +159207,6 @@ Constant<uint, GLEnum, TextureTarget> target
         )]
         public void GenFencesNV(uint n, Ref<uint> fences) => T.GenFencesNV(n, fences);
 
-        [NativeName("glGenFencesNV")]
-        [SupportedApiProfile("gl", ["GL_NV_fence"])]
-        [SupportedApiProfile("gles2", ["GL_NV_fence"])]
-        [SupportedApiProfile("gles1", ["GL_NV_fence"])]
-        [NativeFunction("opengl", EntryPoint = "glGenFencesNV")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public uint GenFencesNV() => T.GenFencesNV();
-
         [NativeName("glGenFragmentShadersATI")]
         [SupportedApiProfile("gl", ["GL_ATI_fragment_shader"])]
         [NativeFunction("opengl", EntryPoint = "glGenFragmentShadersATI")]
@@ -159282,6 +159263,22 @@ Constant<uint, GLEnum, TextureTarget> target
         )]
         public uint GenFramebuffer() => T.GenFramebuffer();
 
+        [NativeName("glGenFramebuffersEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenFramebuffersEXT")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public uint GenFramebufferEXT() => T.GenFramebufferEXT();
+
+        [NativeName("glGenFramebuffersOES")]
+        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public uint GenFramebufferOES() => T.GenFramebufferOES();
+
         [NativeName("glGenFramebuffers")]
         [SupportedApiProfile(
             "gl",
@@ -159398,14 +159395,6 @@ public void GenFramebuffersEXT(uint n, uint* framebuffers) =>
         public void GenFramebuffersEXT(uint n, Ref<uint> framebuffers) =>
             T.GenFramebuffersEXT(n, framebuffers);
 
-        [NativeName("glGenFramebuffersEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenFramebuffersEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public uint GenFramebuffersEXT() => T.GenFramebuffersEXT();
-
         [NativeName("glGenFramebuffersOES")]
         [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
         [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")]
@@ -159424,14 +159413,6 @@ public void GenFramebuffersOES(uint n, uint* framebuffers) =>
         public void GenFramebuffersOES(uint n, Ref<uint> framebuffers) =>
             T.GenFramebuffersOES(n, framebuffers);
 
-        [NativeName("glGenFramebuffersOES")]
-        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public uint GenFramebuffersOES() => T.GenFramebuffersOES();
-
         [NativeName("glGenLists")]
         [SupportedApiProfile(
             "gl",
@@ -159470,8 +159451,7 @@ public void GenFramebuffersOES(uint n, Ref<uint> framebuffers) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void GenNamesAMD(uint identifier, uint num, uint* names) =>
-            T.GenNamesAMD(identifier, num, names);
+        public uint GenNameAMD(uint identifier) => T.GenNameAMD(identifier);
 
         [NativeName("glGenNamesAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
@@ -159479,7 +159459,7 @@ public void GenNamesAMD(uint identifier, uint num, uint* names) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void GenNamesAMD(uint identifier, uint num, Ref<uint> names) =>
+        public void GenNamesAMD(uint identifier, uint num, uint* names) =>
             T.GenNamesAMD(identifier, num, names);
 
         [NativeName("glGenNamesAMD")]
@@ -159488,7 +159468,8 @@ public void GenNamesAMD(uint identifier, uint num, Ref<uint> names) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public uint GenNamesAMD(uint identifier) => T.GenNamesAMD(identifier);
+        public void GenNamesAMD(uint identifier, uint num, Ref<uint> names) =>
+            T.GenNamesAMD(identifier, num, names);
 
         [NativeName("glGenOcclusionQueriesNV")]
         [SupportedApiProfile("gl", ["GL_NV_occlusion_query"])]
@@ -159512,7 +159493,7 @@ public void GenNamesAMD(uint identifier, uint num, Ref<uint> names) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public uint GenOcclusionQueriesNV() => T.GenOcclusionQueriesNV();
+        public uint GenOcclusionQueryNV() => T.GenOcclusionQueryNV();
 
         [NativeName("glGenPathsNV")]
         [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
@@ -159532,7 +159513,7 @@ public void GenNamesAMD(uint identifier, uint num, Ref<uint> names) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void GenPerfMonitorsAMD(uint n, uint* monitors) => T.GenPerfMonitorsAMD(n, monitors);
+        public uint GenPerfMonitorAMD() => T.GenPerfMonitorAMD();
 
         [NativeName("glGenPerfMonitorsAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
@@ -159542,8 +159523,7 @@ public void GenNamesAMD(uint identifier, uint num, Ref<uint> names) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void GenPerfMonitorsAMD(uint n, Ref<uint> monitors) =>
-            T.GenPerfMonitorsAMD(n, monitors);
+        public void GenPerfMonitorsAMD(uint n, uint* monitors) => T.GenPerfMonitorsAMD(n, monitors);
 
         [NativeName("glGenPerfMonitorsAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
@@ -159553,7 +159533,8 @@ public void GenPerfMonitorsAMD(uint n, Ref<uint> monitors) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public uint GenPerfMonitorsAMD() => T.GenPerfMonitorsAMD();
+        public void GenPerfMonitorsAMD(uint n, Ref<uint> monitors) =>
+            T.GenPerfMonitorsAMD(n, monitors);
 
         [NativeName("glGenProgramPipelines")]
         [SupportedApiProfile(
@@ -159588,6 +159569,14 @@ public void GenPerfMonitorsAMD(uint n, Ref<uint> monitors) =>
         )]
         public uint GenProgramPipeline() => T.GenProgramPipeline();
 
+        [NativeName("glGenProgramPipelinesEXT")]
+        [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])]
+        [NativeFunction("opengl", EntryPoint = "glGenProgramPipelinesEXT")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public uint GenProgramPipelineEXT() => T.GenProgramPipelineEXT();
+
         [NativeName("glGenProgramPipelines")]
         [SupportedApiProfile(
             "gl",
@@ -159674,14 +159663,6 @@ public void GenProgramPipelinesEXT(uint n, uint* pipelines) =>
         public void GenProgramPipelinesEXT(uint n, Ref<uint> pipelines) =>
             T.GenProgramPipelinesEXT(n, pipelines);
 
-        [NativeName("glGenProgramPipelinesEXT")]
-        [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])]
-        [NativeFunction("opengl", EntryPoint = "glGenProgramPipelinesEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public uint GenProgramPipelinesEXT() => T.GenProgramPipelinesEXT();
-
         [NativeName("glGenProgramsARB")]
         [SupportedApiProfile("gl", ["GL_ARB_fragment_program", "GL_ARB_vertex_program"])]
         [NativeFunction("opengl", EntryPoint = "glGenProgramsARB")]
@@ -159840,14 +159821,6 @@ public void GenProgramPipelinesEXT(uint n, Ref<uint> pipelines) =>
         )]
         public void GenQueriesARB(uint n, Ref<uint> ids) => T.GenQueriesARB(n, ids);
 
-        [NativeName("glGenQueriesARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
-        [NativeFunction("opengl", EntryPoint = "glGenQueriesARB")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public uint GenQueriesARB() => T.GenQueriesARB();
-
         [NativeName("glGenQueriesEXT")]
         [SupportedApiProfile(
             "gles2",
@@ -159870,17 +159843,6 @@ public void GenProgramPipelinesEXT(uint n, Ref<uint> pipelines) =>
         )]
         public void GenQueriesEXT(uint n, Ref<uint> ids) => T.GenQueriesEXT(n, ids);
 
-        [NativeName("glGenQueriesEXT")]
-        [SupportedApiProfile(
-            "gles2",
-            ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
-        )]
-        [NativeFunction("opengl", EntryPoint = "glGenQueriesEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public uint GenQueriesEXT() => T.GenQueriesEXT();
-
         [NativeName("glGenQueries")]
         [SupportedApiProfile(
             "gl",
@@ -159928,6 +159890,25 @@ public void GenProgramPipelinesEXT(uint n, Ref<uint> pipelines) =>
         )]
         public uint GenQuery() => T.GenQuery();
 
+        [NativeName("glGenQueriesARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
+        [NativeFunction("opengl", EntryPoint = "glGenQueriesARB")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public uint GenQueryARB() => T.GenQueryARB();
+
+        [NativeName("glGenQueriesEXT")]
+        [SupportedApiProfile(
+            "gles2",
+            ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
+        )]
+        [NativeFunction("opengl", EntryPoint = "glGenQueriesEXT")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public uint GenQueryEXT() => T.GenQueryEXT();
+
         [NativeName("glGenQueryResourceTagNV")]
         [SupportedApiProfile("gl", ["GL_NV_query_resource_tag"])]
         [NativeFunction("opengl", EntryPoint = "glGenQueryResourceTagNV")]
@@ -160002,6 +159983,22 @@ public void GenQueryResourceTagNV(uint n, Ref<int> tagIds) =>
         )]
         public uint GenRenderbuffer() => T.GenRenderbuffer();
 
+        [NativeName("glGenRenderbuffersEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersEXT")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public uint GenRenderbufferEXT() => T.GenRenderbufferEXT();
+
+        [NativeName("glGenRenderbuffersOES")]
+        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public uint GenRenderbufferOES() => T.GenRenderbufferOES();
+
         [NativeName("glGenRenderbuffers")]
         [SupportedApiProfile(
             "gl",
@@ -160118,14 +160115,6 @@ public void GenRenderbuffersEXT(uint n, uint* renderbuffers) =>
         public void GenRenderbuffersEXT(uint n, Ref<uint> renderbuffers) =>
             T.GenRenderbuffersEXT(n, renderbuffers);
 
-        [NativeName("glGenRenderbuffersEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public uint GenRenderbuffersEXT() => T.GenRenderbuffersEXT();
-
         [NativeName("glGenRenderbuffersOES")]
         [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
         [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")]
@@ -160144,13 +160133,52 @@ public void GenRenderbuffersOES(uint n, uint* renderbuffers) =>
         public void GenRenderbuffersOES(uint n, Ref<uint> renderbuffers) =>
             T.GenRenderbuffersOES(n, renderbuffers);
 
-        [NativeName("glGenRenderbuffersOES")]
-        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")]
+        [NativeName("glGenSamplers")]
+        [SupportedApiProfile(
+            "gl",
+            [
+                "GL_ARB_sampler_objects",
+                "GL_VERSION_3_3",
+                "GL_VERSION_4_0",
+                "GL_VERSION_4_1",
+                "GL_VERSION_4_2",
+                "GL_VERSION_4_3",
+                "GL_VERSION_4_4",
+                "GL_VERSION_4_5",
+                "GL_VERSION_4_6",
+            ],
+            MinVersion = "3.3"
+        )]
+        [SupportedApiProfile(
+            "glcore",
+            [
+                "GL_ARB_sampler_objects",
+                "GL_VERSION_3_3",
+                "GL_VERSION_4_0",
+                "GL_VERSION_4_1",
+                "GL_VERSION_4_2",
+                "GL_VERSION_4_3",
+                "GL_VERSION_4_4",
+                "GL_VERSION_4_5",
+                "GL_VERSION_4_6",
+            ],
+            MinVersion = "3.3"
+        )]
+        [SupportedApiProfile(
+            "gles2",
+            [
+                "GL_ES_VERSION_3_0",
+                "GL_ES_VERSION_3_1",
+                "GL_ES_VERSION_3_2",
+                "GL_MESA_sampler_objects",
+            ],
+            MinVersion = "3.0"
+        )]
+        [NativeFunction("opengl", EntryPoint = "glGenSamplers")]
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public uint GenRenderbuffersOES() => T.GenRenderbuffersOES();
+        public uint GenSampler() => T.GenSampler();
 
         [NativeName("glGenSamplers")]
         [SupportedApiProfile(
@@ -160197,54 +160225,7 @@ public void GenRenderbuffersOES(uint n, Ref<uint> renderbuffers) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public uint GenSampler() => T.GenSampler();
-
-        [NativeName("glGenSamplers")]
-        [SupportedApiProfile(
-            "gl",
-            [
-                "GL_ARB_sampler_objects",
-                "GL_VERSION_3_3",
-                "GL_VERSION_4_0",
-                "GL_VERSION_4_1",
-                "GL_VERSION_4_2",
-                "GL_VERSION_4_3",
-                "GL_VERSION_4_4",
-                "GL_VERSION_4_5",
-                "GL_VERSION_4_6",
-            ],
-            MinVersion = "3.3"
-        )]
-        [SupportedApiProfile(
-            "glcore",
-            [
-                "GL_ARB_sampler_objects",
-                "GL_VERSION_3_3",
-                "GL_VERSION_4_0",
-                "GL_VERSION_4_1",
-                "GL_VERSION_4_2",
-                "GL_VERSION_4_3",
-                "GL_VERSION_4_4",
-                "GL_VERSION_4_5",
-                "GL_VERSION_4_6",
-            ],
-            MinVersion = "3.3"
-        )]
-        [SupportedApiProfile(
-            "gles2",
-            [
-                "GL_ES_VERSION_3_0",
-                "GL_ES_VERSION_3_1",
-                "GL_ES_VERSION_3_2",
-                "GL_MESA_sampler_objects",
-            ],
-            MinVersion = "3.0"
-        )]
-        [NativeFunction("opengl", EntryPoint = "glGenSamplers")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void GenSamplers(uint count, uint* samplers) => T.GenSamplers(count, samplers);
+        public void GenSamplers(uint count, uint* samplers) => T.GenSamplers(count, samplers);
 
         [NativeName("glGenSamplers")]
         [SupportedApiProfile(
@@ -160300,7 +160281,7 @@ public void GenRenderbuffersOES(uint n, Ref<uint> renderbuffers) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void GenSemaphoresEXT(uint n, uint* semaphores) => T.GenSemaphoresEXT(n, semaphores);
+        public uint GenSemaphoreEXT() => T.GenSemaphoreEXT();
 
         [NativeName("glGenSemaphoresEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
@@ -160309,8 +160290,7 @@ public void GenRenderbuffersOES(uint n, Ref<uint> renderbuffers) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void GenSemaphoresEXT(uint n, Ref<uint> semaphores) =>
-            T.GenSemaphoresEXT(n, semaphores);
+        public void GenSemaphoresEXT(uint n, uint* semaphores) => T.GenSemaphoresEXT(n, semaphores);
 
         [NativeName("glGenSemaphoresEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
@@ -160319,7 +160299,8 @@ public void GenSemaphoresEXT(uint n, Ref<uint> semaphores) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public uint GenSemaphoresEXT() => T.GenSemaphoresEXT();
+        public void GenSemaphoresEXT(uint n, Ref<uint> semaphores) =>
+            T.GenSemaphoresEXT(n, semaphores);
 
         [NativeName("glGenSymbolsEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])]
@@ -160404,6 +160385,14 @@ uint components
         )]
         public uint GenTexture() => T.GenTexture();
 
+        [NativeName("glGenTexturesEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_texture_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenTexturesEXT")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public uint GenTextureEXT() => T.GenTextureEXT();
+
         [NativeName("glGenTextures")]
         [SupportedApiProfile(
             "gl",
@@ -160542,14 +160531,6 @@ uint components
         )]
         public void GenTexturesEXT(uint n, Ref<uint> textures) => T.GenTexturesEXT(n, textures);
 
-        [NativeName("glGenTexturesEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_texture_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenTexturesEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public uint GenTexturesEXT() => T.GenTexturesEXT();
-
         [NativeName("glGenTransformFeedbacks")]
         [SupportedApiProfile(
             "gl",
@@ -160585,6 +160566,14 @@ uint components
         )]
         public uint GenTransformFeedback() => T.GenTransformFeedback();
 
+        [NativeName("glGenTransformFeedbacksNV")]
+        [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])]
+        [NativeFunction("opengl", EntryPoint = "glGenTransformFeedbacksNV")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public uint GenTransformFeedbackNV() => T.GenTransformFeedbackNV();
+
         [NativeName("glGenTransformFeedbacks")]
         [SupportedApiProfile(
             "gl",
@@ -160672,14 +160661,6 @@ uint components
         public void GenTransformFeedbacksNV(uint n, Ref<uint> ids) =>
             T.GenTransformFeedbacksNV(n, ids);
 
-        [NativeName("glGenTransformFeedbacksNV")]
-        [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])]
-        [NativeFunction("opengl", EntryPoint = "glGenTransformFeedbacksNV")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public uint GenTransformFeedbacksNV() => T.GenTransformFeedbacksNV();
-
         [NativeName("glGenVertexArrays")]
         [SupportedApiProfile(
             "gl",
@@ -160723,6 +160704,23 @@ public void GenTransformFeedbacksNV(uint n, Ref<uint> ids) =>
         )]
         public uint GenVertexArray() => T.GenVertexArray();
 
+        [NativeName("glGenVertexArraysAPPLE")]
+        [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenVertexArraysAPPLE")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public uint GenVertexArrayAPPLE() => T.GenVertexArrayAPPLE();
+
+        [NativeName("glGenVertexArraysOES")]
+        [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
+        [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenVertexArraysOES")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public uint GenVertexArrayOES() => T.GenVertexArrayOES();
+
         [NativeName("glGenVertexArrays")]
         [SupportedApiProfile(
             "gl",
@@ -160826,14 +160824,6 @@ public void GenTransformFeedbacksNV(uint n, Ref<uint> ids) =>
         public void GenVertexArraysAPPLE(uint n, Ref<uint> arrays) =>
             T.GenVertexArraysAPPLE(n, arrays);
 
-        [NativeName("glGenVertexArraysAPPLE")]
-        [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenVertexArraysAPPLE")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public uint GenVertexArraysAPPLE() => T.GenVertexArraysAPPLE();
-
         [NativeName("glGenVertexArraysOES")]
         [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
         [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
@@ -160852,15 +160842,6 @@ public void GenVertexArraysAPPLE(uint n, Ref<uint> arrays) =>
         )]
         public void GenVertexArraysOES(uint n, Ref<uint> arrays) => T.GenVertexArraysOES(n, arrays);
 
-        [NativeName("glGenVertexArraysOES")]
-        [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
-        [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenVertexArraysOES")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public uint GenVertexArraysOES() => T.GenVertexArraysOES();
-
         [NativeName("glGenVertexShadersEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])]
         [NativeFunction("opengl", EntryPoint = "glGenVertexShadersEXT")]
@@ -162912,6 +162893,15 @@ public int GetArrayObjectivATI(
             Constant<uint, GLEnum, ArrayObjectPNameATI> pname
         ) => T.GetArrayObjectivATI(array, pname);
 
+        [NativeName("glGetAttachedObjectsARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_shader_objects"])]
+        [NativeFunction("opengl", EntryPoint = "glGetAttachedObjectsARB")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public uint GetAttachedObjectARB(uint containerObj, Ref<uint> count) =>
+            T.GetAttachedObjectARB(containerObj, count);
+
         [NativeName("glGetAttachedObjectsARB")]
         [SupportedApiProfile("gl", ["GL_ARB_shader_objects"])]
         [NativeFunction("opengl", EntryPoint = "glGetAttachedObjectsARB")]
@@ -162938,15 +162928,6 @@ public void GetAttachedObjectsARB(
             Ref<uint> obj
         ) => T.GetAttachedObjectsARB(containerObj, maxCount, count, obj);
 
-        [NativeName("glGetAttachedObjectsARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_shader_objects"])]
-        [NativeFunction("opengl", EntryPoint = "glGetAttachedObjectsARB")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public uint GetAttachedObjectsARB(uint containerObj, Ref<uint> count) =>
-            T.GetAttachedObjectsARB(containerObj, count);
-
         [NativeName("glGetAttachedShaders")]
         [SupportedApiProfile(
             "gl",
@@ -166569,6 +166550,15 @@ public void GetFragmentMaterialSGIX(
             Ref<int> @params
         ) => T.GetFragmentMaterialSGIX(face, pname, @params);
 
+        [NativeName("glGetFragmentShadingRatesEXT")]
+        [SupportedApiProfile("gles2", ["GL_EXT_fragment_shading_rate"])]
+        [NativeFunction("opengl", EntryPoint = "glGetFragmentShadingRatesEXT")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public uint GetFragmentShadingRateEXT(uint samples, Ref<uint> count) =>
+            T.GetFragmentShadingRateEXT(samples, count);
+
         [NativeName("glGetFragmentShadingRatesEXT")]
         [SupportedApiProfile("gles2", ["GL_EXT_fragment_shading_rate"])]
         [NativeFunction("opengl", EntryPoint = "glGetFragmentShadingRatesEXT")]
@@ -166595,15 +166585,6 @@ public void GetFragmentShadingRatesEXT(
             Ref<uint> shadingRates
         ) => T.GetFragmentShadingRatesEXT(samples, maxCount, count, shadingRates);
 
-        [NativeName("glGetFragmentShadingRatesEXT")]
-        [SupportedApiProfile("gles2", ["GL_EXT_fragment_shading_rate"])]
-        [NativeFunction("opengl", EntryPoint = "glGetFragmentShadingRatesEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public uint GetFragmentShadingRatesEXT(uint samples, Ref<uint> count) =>
-            T.GetFragmentShadingRatesEXT(samples, count);
-
         [NativeName("glGetFragmentShadingRatesEXT")]
         [SupportedApiProfile("gles2", ["GL_EXT_fragment_shading_rate"])]
         [NativeFunction("opengl", EntryPoint = "glGetFragmentShadingRatesEXT")]
@@ -172147,8 +172128,7 @@ Ref<int> value
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void GetPathCommandsNV(uint path, byte* commands) =>
-            T.GetPathCommandsNV(path, commands);
+        public byte GetPathCommandNV() => T.GetPathCommandNV();
 
         [NativeName("glGetPathCommandsNV")]
         [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
@@ -172158,7 +172138,7 @@ public void GetPathCommandsNV(uint path, byte* commands) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void GetPathCommandsNV(uint path, Ref<byte> commands) =>
+        public void GetPathCommandsNV(uint path, byte* commands) =>
             T.GetPathCommandsNV(path, commands);
 
         [NativeName("glGetPathCommandsNV")]
@@ -172169,7 +172149,8 @@ public void GetPathCommandsNV(uint path, Ref<byte> commands) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public byte GetPathCommandsNV() => T.GetPathCommandsNV();
+        public void GetPathCommandsNV(uint path, Ref<byte> commands) =>
+            T.GetPathCommandsNV(path, commands);
 
         [NativeName("glGetPathCommandsNV")]
         [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
@@ -172190,7 +172171,7 @@ public void GetPathCommandsNV(uint path, Ref<PathCoordType> commands) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void GetPathCoordsNV(uint path, float* coords) => T.GetPathCoordsNV(path, coords);
+        public float GetPathCoordNV() => T.GetPathCoordNV();
 
         [NativeName("glGetPathCoordsNV")]
         [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
@@ -172200,8 +172181,7 @@ public void GetPathCommandsNV(uint path, Ref<PathCoordType> commands) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void GetPathCoordsNV(uint path, Ref<float> coords) =>
-            T.GetPathCoordsNV(path, coords);
+        public void GetPathCoordsNV(uint path, float* coords) => T.GetPathCoordsNV(path, coords);
 
         [NativeName("glGetPathCoordsNV")]
         [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
@@ -172211,7 +172191,8 @@ public void GetPathCoordsNV(uint path, Ref<float> coords) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public float GetPathCoordsNV() => T.GetPathCoordsNV();
+        public void GetPathCoordsNV(uint path, Ref<float> coords) =>
+            T.GetPathCoordsNV(path, coords);
 
         [NativeName("glGetPathDashArrayNV")]
         [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
@@ -172566,6 +172547,20 @@ Ref<ulong> rawCounterMaxValue
                 rawCounterMaxValue
             );
 
+        [NativeName("glGetPerfMonitorCountersAMD")]
+        [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
+        [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
+        [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
+        [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorCountersAMD")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public uint GetPerfMonitorCounterAMD(
+            uint group,
+            Ref<int> numCounters,
+            Ref<int> maxActiveCounters
+        ) => T.GetPerfMonitorCounterAMD(group, numCounters, maxActiveCounters);
+
         [NativeName("glGetPerfMonitorCounterDataAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
         [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
@@ -172606,12 +172601,12 @@ Ref<int> bytesWritten
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public int GetPerfMonitorCounterDataAMD(
+        public int GetPerfMonitorCounterDatumAMD(
             uint monitor,
             uint pname,
             uint dataSize,
             Ref<uint> data
-        ) => T.GetPerfMonitorCounterDataAMD(monitor, pname, dataSize, data);
+        ) => T.GetPerfMonitorCounterDatumAMD(monitor, pname, dataSize, data);
 
         [NativeName("glGetPerfMonitorCounterInfoAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
@@ -172685,20 +172680,6 @@ Ref<uint> counters
                 counters
             );
 
-        [NativeName("glGetPerfMonitorCountersAMD")]
-        [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
-        [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
-        [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
-        [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorCountersAMD")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public uint GetPerfMonitorCountersAMD(
-            uint group,
-            Ref<int> numCounters,
-            Ref<int> maxActiveCounters
-        ) => T.GetPerfMonitorCountersAMD(group, numCounters, maxActiveCounters);
-
         [NativeName("glGetPerfMonitorCounterStringAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
         [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
@@ -172750,8 +172731,8 @@ public sbyte GetPerfMonitorCounterStringAMD(uint group, uint counter, Ref<uint>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void GetPerfMonitorGroupsAMD(int* numGroups, uint groupsSize, uint* groups) =>
-            T.GetPerfMonitorGroupsAMD(numGroups, groupsSize, groups);
+        public uint GetPerfMonitorGroupAMD(Ref<int> numGroups) =>
+            T.GetPerfMonitorGroupAMD(numGroups);
 
         [NativeName("glGetPerfMonitorGroupsAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
@@ -172761,11 +172742,8 @@ public void GetPerfMonitorGroupsAMD(int* numGroups, uint groupsSize, uint* group
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void GetPerfMonitorGroupsAMD(
-            Ref<int> numGroups,
-            uint groupsSize,
-            Ref<uint> groups
-        ) => T.GetPerfMonitorGroupsAMD(numGroups, groupsSize, groups);
+        public void GetPerfMonitorGroupsAMD(int* numGroups, uint groupsSize, uint* groups) =>
+            T.GetPerfMonitorGroupsAMD(numGroups, groupsSize, groups);
 
         [NativeName("glGetPerfMonitorGroupsAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
@@ -172775,8 +172753,11 @@ Ref<uint> groups
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public uint GetPerfMonitorGroupsAMD(Ref<int> numGroups) =>
-            T.GetPerfMonitorGroupsAMD(numGroups);
+        public void GetPerfMonitorGroupsAMD(
+            Ref<int> numGroups,
+            uint groupsSize,
+            Ref<uint> groups
+        ) => T.GetPerfMonitorGroupsAMD(numGroups, groupsSize, groups);
 
         [NativeName("glGetPerfMonitorGroupStringAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
@@ -206047,13 +206028,12 @@ public void ProgramBinaryOES(uint program, uint binaryFormat, Ref binary, int le
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void ProgramBufferParametersNV(
-            uint target,
+        public void ProgramBufferParameterNV(
+            Constant<uint, GLEnum, ProgramTarget> target,
             uint bindingIndex,
             uint wordIndex,
-            uint count,
-            float* @params
-        ) => T.ProgramBufferParametersNV(target, bindingIndex, wordIndex, count, @params);
+            float @params
+        ) => T.ProgramBufferParameterNV(target, bindingIndex, wordIndex, @params);
 
         [NativeName("glProgramBufferParametersfvNV")]
         [SupportedApiProfile("gl", ["GL_NV_parameter_buffer_object"])]
@@ -206062,11 +206042,11 @@ public void ProgramBufferParametersNV(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
         public void ProgramBufferParametersNV(
-            Constant<uint, GLEnum, ProgramTarget> target,
+            uint target,
             uint bindingIndex,
             uint wordIndex,
             uint count,
-            Ref<float> @params
+            float* @params
         ) => T.ProgramBufferParametersNV(target, bindingIndex, wordIndex, count, @params);
 
         [NativeName("glProgramBufferParametersfvNV")]
@@ -206079,8 +206059,9 @@ public void ProgramBufferParametersNV(
             Constant<uint, GLEnum, ProgramTarget> target,
             uint bindingIndex,
             uint wordIndex,
-            float @params
-        ) => T.ProgramBufferParametersNV(target, bindingIndex, wordIndex, @params);
+            uint count,
+            Ref<float> @params
+        ) => T.ProgramBufferParametersNV(target, bindingIndex, wordIndex, count, @params);
 
         [NativeName("glProgramBufferParametersIivNV")]
         [SupportedApiProfile("gl", ["GL_NV_parameter_buffer_object"])]
@@ -207201,8 +207182,8 @@ public void ProgramSubroutineParametersNV(uint target, uint count, Ref<uint> @pa
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void ProgramSubroutineParametersNV(uint target, uint @params) =>
-            T.ProgramSubroutineParametersNV(target, @params);
+        public void ProgramSubroutineParameterNV(uint target, uint @params) =>
+            T.ProgramSubroutineParameterNV(target, @params);
 
         [NativeName("glProgramUniform1d")]
         [SupportedApiProfile(
@@ -220004,13 +219985,8 @@ int ptrstride
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void SelectPerfMonitorCountersAMD(
-            uint monitor,
-            uint enable,
-            uint group,
-            int numCounters,
-            uint* counterList
-        ) => T.SelectPerfMonitorCountersAMD(monitor, enable, group, numCounters, counterList);
+        public uint SelectPerfMonitorCounterAMD(uint monitor, MaybeBool<uint> enable, uint group) =>
+            T.SelectPerfMonitorCounterAMD(monitor, enable, group);
 
         [NativeName("glSelectPerfMonitorCountersAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
@@ -220022,10 +219998,10 @@ public void SelectPerfMonitorCountersAMD(
         )]
         public void SelectPerfMonitorCountersAMD(
             uint monitor,
-            MaybeBool<uint> enable,
+            uint enable,
             uint group,
             int numCounters,
-            Ref<uint> counterList
+            uint* counterList
         ) => T.SelectPerfMonitorCountersAMD(monitor, enable, group, numCounters, counterList);
 
         [NativeName("glSelectPerfMonitorCountersAMD")]
@@ -220036,11 +220012,13 @@ Ref<uint> counterList
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public uint SelectPerfMonitorCountersAMD(
+        public void SelectPerfMonitorCountersAMD(
             uint monitor,
             MaybeBool<uint> enable,
-            uint group
-        ) => T.SelectPerfMonitorCountersAMD(monitor, enable, group);
+            uint group,
+            int numCounters,
+            Ref<uint> counterList
+        ) => T.SelectPerfMonitorCountersAMD(monitor, enable, group, numCounters, counterList);
 
         [NativeName("glSemaphoreParameterivNV")]
         [SupportedApiProfile("gl", ["GL_NV_timeline_semaphore"])]
@@ -225881,18 +225859,6 @@ public void TexEstimateMotionQCOM(uint @ref, uint target, uint output) =>
         public void TexEstimateMotionRegionQCOM(uint @ref, uint target, uint output, uint mask) =>
             T.TexEstimateMotionRegionQCOM(@ref, target, output, mask);
 
-        [NativeName("glTexFilterFuncSGIS")]
-        [SupportedApiProfile("gl", ["GL_SGIS_texture_filter4"])]
-        [NativeFunction("opengl", EntryPoint = "glTexFilterFuncSGIS")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void TexFilterFuncSgiSGIS(
-            Constant<uint, GLEnum, TextureTarget> target,
-            Constant<uint, GLEnum, TextureFilterSGIS> filter,
-            float weights
-        ) => T.TexFilterFuncSgiSGIS(target, filter, weights);
-
         [NativeName("glTexFilterFuncSGIS")]
         [SupportedApiProfile("gl", ["GL_SGIS_texture_filter4"])]
         [NativeFunction("opengl", EntryPoint = "glTexFilterFuncSGIS")]
@@ -225915,37 +225881,49 @@ public void TexFilterFuncSGIS(
             Ref<float> weights
         ) => T.TexFilterFuncSGIS(target, filter, n, weights);
 
-        [NativeName("glTexGend")]
-        [SupportedApiProfile(
-            "gl",
-            [
-                "GL_VERSION_1_0",
-                "GL_VERSION_1_1",
-                "GL_VERSION_1_2",
-                "GL_VERSION_1_3",
-                "GL_VERSION_1_4",
-                "GL_VERSION_1_5",
-                "GL_VERSION_2_0",
-                "GL_VERSION_2_1",
-                "GL_VERSION_3_0",
-                "GL_VERSION_3_1",
-                "GL_VERSION_3_2",
-                "GL_VERSION_3_3",
-                "GL_VERSION_4_0",
-                "GL_VERSION_4_1",
-                "GL_VERSION_4_2",
-                "GL_VERSION_4_3",
-                "GL_VERSION_4_4",
-                "GL_VERSION_4_5",
-                "GL_VERSION_4_6",
-            ],
-            MinVersion = "1.0"
-        )]
-        [NativeFunction("opengl", EntryPoint = "glTexGend")]
+        [NativeName("glTexFilterFuncSGIS")]
+        [SupportedApiProfile("gl", ["GL_SGIS_texture_filter4"])]
+        [NativeFunction("opengl", EntryPoint = "glTexFilterFuncSGIS")]
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void TexGen(uint coord, uint pname, double param2) => T.TexGen(coord, pname, param2);
+        public void TexFilterFuncSGIS(
+            Constant<uint, GLEnum, TextureTarget> target,
+            Constant<uint, GLEnum, TextureFilterSGIS> filter,
+            float weights
+        ) => T.TexFilterFuncSGIS(target, filter, weights);
+
+        [NativeName("glTexGend")]
+        [SupportedApiProfile(
+            "gl",
+            [
+                "GL_VERSION_1_0",
+                "GL_VERSION_1_1",
+                "GL_VERSION_1_2",
+                "GL_VERSION_1_3",
+                "GL_VERSION_1_4",
+                "GL_VERSION_1_5",
+                "GL_VERSION_2_0",
+                "GL_VERSION_2_1",
+                "GL_VERSION_3_0",
+                "GL_VERSION_3_1",
+                "GL_VERSION_3_2",
+                "GL_VERSION_3_3",
+                "GL_VERSION_4_0",
+                "GL_VERSION_4_1",
+                "GL_VERSION_4_2",
+                "GL_VERSION_4_3",
+                "GL_VERSION_4_4",
+                "GL_VERSION_4_5",
+                "GL_VERSION_4_6",
+            ],
+            MinVersion = "1.0"
+        )]
+        [NativeFunction("opengl", EntryPoint = "glTexGend")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void TexGen(uint coord, uint pname, double param2) => T.TexGen(coord, pname, param2);
 
         [NativeName("glTexGend")]
         [SupportedApiProfile(
@@ -232981,6 +232959,54 @@ public void TransformFeedbackVarying(
             Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
         ) => T.TransformFeedbackVarying(program, varyings, bufferMode);
 
+        [NativeName("glTransformFeedbackVaryingsEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_transform_feedback"])]
+        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsEXT")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void TransformFeedbackVaryingEXT(
+            uint program,
+            Ref<sbyte> varyings,
+            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
+        ) => T.TransformFeedbackVaryingEXT(program, varyings, bufferMode);
+
+        [NativeName("glTransformFeedbackVaryingsNV")]
+        [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
+        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void TransformFeedbackVaryingNV(
+            uint program,
+            int locations,
+            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
+        ) => T.TransformFeedbackVaryingNV(program, locations, bufferMode);
+
+        [NativeName("glTransformFeedbackVaryingsNV")]
+        [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
+        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void TransformFeedbackVaryingNV(
+            uint program,
+            GLEnum locations,
+            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
+        ) => T.TransformFeedbackVaryingNV(program, locations, bufferMode);
+
+        [NativeName("glTransformFeedbackVaryingsNV")]
+        [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
+        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public void TransformFeedbackVaryingNV(
+            uint program,
+            TransformFeedbackTokenNV locations,
+            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
+        ) => T.TransformFeedbackVaryingNV(program, locations, bufferMode);
+
         [NativeName("glTransformFeedbackVaryings")]
         [SupportedApiProfile(
             "gl",
@@ -233099,18 +233125,6 @@ public void TransformFeedbackVaryingsEXT(
             Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
         ) => T.TransformFeedbackVaryingsEXT(program, count, varyings, bufferMode);
 
-        [NativeName("glTransformFeedbackVaryingsEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_transform_feedback"])]
-        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void TransformFeedbackVaryingsEXT(
-            uint program,
-            Ref<sbyte> varyings,
-            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
-        ) => T.TransformFeedbackVaryingsEXT(program, varyings, bufferMode);
-
         [NativeName("glTransformFeedbackVaryingsNV")]
         [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
         [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
@@ -233137,18 +233151,6 @@ public void TransformFeedbackVaryingsNV(
             Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
         ) => T.TransformFeedbackVaryingsNV(program, count, locations, bufferMode);
 
-        [NativeName("glTransformFeedbackVaryingsNV")]
-        [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
-        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void TransformFeedbackVaryingsNV(
-            uint program,
-            int locations,
-            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
-        ) => T.TransformFeedbackVaryingsNV(program, locations, bufferMode);
-
         [NativeName("glTransformFeedbackVaryingsNV")]
         [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
         [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
@@ -233162,18 +233164,6 @@ public void TransformFeedbackVaryingsNV(
             Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
         ) => T.TransformFeedbackVaryingsNV(program, count, locations, bufferMode);
 
-        [NativeName("glTransformFeedbackVaryingsNV")]
-        [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
-        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void TransformFeedbackVaryingsNV(
-            uint program,
-            GLEnum locations,
-            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
-        ) => T.TransformFeedbackVaryingsNV(program, locations, bufferMode);
-
         [NativeName("glTransformFeedbackVaryingsNV")]
         [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
         [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
@@ -233187,18 +233177,6 @@ public void TransformFeedbackVaryingsNV(
             Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
         ) => T.TransformFeedbackVaryingsNV(program, count, locations, bufferMode);
 
-        [NativeName("glTransformFeedbackVaryingsNV")]
-        [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
-        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public void TransformFeedbackVaryingsNV(
-            uint program,
-            TransformFeedbackTokenNV locations,
-            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
-        ) => T.TransformFeedbackVaryingsNV(program, locations, bufferMode);
-
         [NativeName("glTransformPathNV")]
         [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
         [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
@@ -238312,10 +238290,10 @@ Ref<uint> indices
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void UniformSubroutines(
+        public void UniformSubroutine(
             Constant<uint, GLEnum, ShaderType> shadertype,
             uint indices
-        ) => T.UniformSubroutines(shadertype, indices);
+        ) => T.UniformSubroutine(shadertype, indices);
 
         [NativeName("glUniformui64NV")]
         [SupportedApiProfile("gl", ["GL_NV_shader_buffer_load"])]
@@ -239176,8 +239154,7 @@ public void VdpauInitNV(Ref vdpDevice, Ref getProcAddress) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void VdpauMapSurfacesNV(uint numSurfaces, nint* surfaces) =>
-            T.VdpauMapSurfacesNV(numSurfaces, surfaces);
+        public void VdpauMapSurfaceNV(nint surfaces) => T.VdpauMapSurfaceNV(surfaces);
 
         [NativeName("glVDPAUMapSurfacesNV")]
         [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
@@ -239185,7 +239162,7 @@ public void VdpauMapSurfacesNV(uint numSurfaces, nint* surfaces) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void VdpauMapSurfacesNV(uint numSurfaces, Ref<nint> surfaces) =>
+        public void VdpauMapSurfacesNV(uint numSurfaces, nint* surfaces) =>
             T.VdpauMapSurfacesNV(numSurfaces, surfaces);
 
         [NativeName("glVDPAUMapSurfacesNV")]
@@ -239194,7 +239171,8 @@ public void VdpauMapSurfacesNV(uint numSurfaces, Ref<nint> surfaces) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void VdpauMapSurfacesNV(nint surfaces) => T.VdpauMapSurfacesNV(surfaces);
+        public void VdpauMapSurfacesNV(uint numSurfaces, Ref<nint> surfaces) =>
+            T.VdpauMapSurfacesNV(numSurfaces, surfaces);
 
         [NativeName("glVDPAURegisterOutputSurfaceNV")]
         [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
@@ -239305,8 +239283,7 @@ public void VdpauSurfaceAccessNV(nint surface, uint access) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void VdpauUnmapSurfacesNV(uint numSurface, nint* surfaces) =>
-            T.VdpauUnmapSurfacesNV(numSurface, surfaces);
+        public void VdpauUnmapSurfaceNV(nint surfaces) => T.VdpauUnmapSurfaceNV(surfaces);
 
         [NativeName("glVDPAUUnmapSurfacesNV")]
         [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
@@ -239314,7 +239291,7 @@ public void VdpauUnmapSurfacesNV(uint numSurface, nint* surfaces) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void VdpauUnmapSurfacesNV(uint numSurface, Ref<nint> surfaces) =>
+        public void VdpauUnmapSurfacesNV(uint numSurface, nint* surfaces) =>
             T.VdpauUnmapSurfacesNV(numSurface, surfaces);
 
         [NativeName("glVDPAUUnmapSurfacesNV")]
@@ -239323,7 +239300,8 @@ public void VdpauUnmapSurfacesNV(uint numSurface, Ref<nint> surfaces) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void VdpauUnmapSurfacesNV(nint surfaces) => T.VdpauUnmapSurfacesNV(surfaces);
+        public void VdpauUnmapSurfacesNV(uint numSurface, Ref<nint> surfaces) =>
+            T.VdpauUnmapSurfacesNV(numSurface, surfaces);
 
         [NativeName("glVDPAUUnregisterSurfaceNV")]
         [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
@@ -253272,8 +253250,7 @@ public void WindowPos4MESA(short x, short y, short z, short w) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void WindowRectanglesEXT(uint mode, uint count, int* box) =>
-            T.WindowRectanglesEXT(mode, count, box);
+        public void WindowRectangleEXT(uint mode, int box) => T.WindowRectangleEXT(mode, box);
 
         [NativeName("glWindowRectanglesEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_window_rectangles"])]
@@ -253283,7 +253260,7 @@ public void WindowRectanglesEXT(uint mode, uint count, int* box) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void WindowRectanglesEXT(uint mode, uint count, Ref<int> box) =>
+        public void WindowRectanglesEXT(uint mode, uint count, int* box) =>
             T.WindowRectanglesEXT(mode, count, box);
 
         [NativeName("glWindowRectanglesEXT")]
@@ -253294,7 +253271,8 @@ public void WindowRectanglesEXT(uint mode, uint count, Ref<int> box) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void WindowRectanglesEXT(uint mode, int box) => T.WindowRectanglesEXT(mode, box);
+        public void WindowRectanglesEXT(uint mode, uint count, Ref<int> box) =>
+            T.WindowRectanglesEXT(mode, count, box);
 
         [NativeName("glWriteMaskEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])]
@@ -272064,8 +272042,12 @@ public static void CreateBuffers(uint n, Ref<uint> buffers)
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void CreateCommandListsNV(uint n, uint* lists) =>
-            Underlying.Value!.CreateCommandListsNV(n, lists);
+        public static uint CreateCommandListNV()
+        {
+            uint lists = default;
+            CreateCommandListsNV(1, (uint*)&lists);
+            return lists;
+        }
 
         [NativeName("glCreateCommandListsNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
@@ -272074,13 +272056,8 @@ public static void CreateCommandListsNV(uint n, uint* lists) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void CreateCommandListsNV(uint n, Ref<uint> lists)
-        {
-            fixed (uint* __dsl_lists = lists)
-            {
-                CreateCommandListsNV(n, __dsl_lists);
-            }
-        }
+        public static void CreateCommandListsNV(uint n, uint* lists) =>
+            Underlying.Value!.CreateCommandListsNV(n, lists);
 
         [NativeName("glCreateCommandListsNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
@@ -272089,11 +272066,12 @@ public static void CreateCommandListsNV(uint n, Ref<uint> lists)
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static uint CreateCommandListsNV()
+        public static void CreateCommandListsNV(uint n, Ref<uint> lists)
         {
-            uint lists = default;
-            CreateCommandListsNV(1, (uint*)&lists);
-            return lists;
+            fixed (uint* __dsl_lists = lists)
+            {
+                CreateCommandListsNV(n, __dsl_lists);
+            }
         }
 
         [NativeName("glCreateFramebuffers")]
@@ -272166,8 +272144,12 @@ public static void CreateFramebuffers(uint n, Ref<uint> framebuffers)
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void CreateMemoryObjectsEXT(uint n, uint* memoryObjects) =>
-            Underlying.Value!.CreateMemoryObjectsEXT(n, memoryObjects);
+        public static uint CreateMemoryObjectEXT()
+        {
+            uint memoryObjects = default;
+            CreateMemoryObjectsEXT(1, (uint*)&memoryObjects);
+            return memoryObjects;
+        }
 
         [NativeName("glCreateMemoryObjectsEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
@@ -272176,13 +272158,8 @@ public static void CreateMemoryObjectsEXT(uint n, uint* memoryObjects) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void CreateMemoryObjectsEXT(uint n, Ref<uint> memoryObjects)
-        {
-            fixed (uint* __dsl_memoryObjects = memoryObjects)
-            {
-                CreateMemoryObjectsEXT(n, __dsl_memoryObjects);
-            }
-        }
+        public static void CreateMemoryObjectsEXT(uint n, uint* memoryObjects) =>
+            Underlying.Value!.CreateMemoryObjectsEXT(n, memoryObjects);
 
         [NativeName("glCreateMemoryObjectsEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
@@ -272191,11 +272168,12 @@ public static void CreateMemoryObjectsEXT(uint n, Ref<uint> memoryObjects)
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static uint CreateMemoryObjectsEXT()
+        public static void CreateMemoryObjectsEXT(uint n, Ref<uint> memoryObjects)
         {
-            uint memoryObjects = default;
-            CreateMemoryObjectsEXT(1, (uint*)&memoryObjects);
-            return memoryObjects;
+            fixed (uint* __dsl_memoryObjects = memoryObjects)
+            {
+                CreateMemoryObjectsEXT(n, __dsl_memoryObjects);
+            }
         }
 
         [NativeName("glCreatePerfQueryINTEL")]
@@ -272569,8 +272547,12 @@ public static void CreateSamplers(uint n, Ref<uint> samplers)
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void CreateSemaphoresNV(uint n, uint* semaphores) =>
-            Underlying.Value!.CreateSemaphoresNV(n, semaphores);
+        public static uint CreateSemaphoreNV()
+        {
+            uint semaphores = default;
+            CreateSemaphoresNV(1, (uint*)&semaphores);
+            return semaphores;
+        }
 
         [NativeName("glCreateSemaphoresNV")]
         [SupportedApiProfile("gl", ["GL_NV_timeline_semaphore"])]
@@ -272579,13 +272561,8 @@ public static void CreateSemaphoresNV(uint n, uint* semaphores) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void CreateSemaphoresNV(uint n, Ref<uint> semaphores)
-        {
-            fixed (uint* __dsl_semaphores = semaphores)
-            {
-                CreateSemaphoresNV(n, __dsl_semaphores);
-            }
-        }
+        public static void CreateSemaphoresNV(uint n, uint* semaphores) =>
+            Underlying.Value!.CreateSemaphoresNV(n, semaphores);
 
         [NativeName("glCreateSemaphoresNV")]
         [SupportedApiProfile("gl", ["GL_NV_timeline_semaphore"])]
@@ -272594,11 +272571,12 @@ public static void CreateSemaphoresNV(uint n, Ref<uint> semaphores)
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static uint CreateSemaphoresNV()
+        public static void CreateSemaphoresNV(uint n, Ref<uint> semaphores)
         {
-            uint semaphores = default;
-            CreateSemaphoresNV(1, (uint*)&semaphores);
-            return semaphores;
+            fixed (uint* __dsl_semaphores = semaphores)
+            {
+                CreateSemaphoresNV(n, __dsl_semaphores);
+            }
         }
 
         [NativeName("glCreateShader")]
@@ -272859,8 +272837,12 @@ Ref2D<sbyte> strings
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void CreateStatesNV(uint n, uint* states) =>
-            Underlying.Value!.CreateStatesNV(n, states);
+        public static uint CreateStateNV()
+        {
+            uint states = default;
+            CreateStatesNV(1, (uint*)&states);
+            return states;
+        }
 
         [NativeName("glCreateStatesNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
@@ -272869,13 +272851,8 @@ public static void CreateStatesNV(uint n, uint* states) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void CreateStatesNV(uint n, Ref<uint> states)
-        {
-            fixed (uint* __dsl_states = states)
-            {
-                CreateStatesNV(n, __dsl_states);
-            }
-        }
+        public static void CreateStatesNV(uint n, uint* states) =>
+            Underlying.Value!.CreateStatesNV(n, states);
 
         [NativeName("glCreateStatesNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
@@ -272884,11 +272861,12 @@ public static void CreateStatesNV(uint n, Ref<uint> states)
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static uint CreateStatesNV()
+        public static void CreateStatesNV(uint n, Ref<uint> states)
         {
-            uint states = default;
-            CreateStatesNV(1, (uint*)&states);
-            return states;
+            fixed (uint* __dsl_states = states)
+            {
+                CreateStatesNV(n, __dsl_states);
+            }
         }
 
         [NativeName("glCreateSyncFromCLeventARB")]
@@ -274206,6 +274184,15 @@ public static void DeleteAsyncMarkersSGIX(uint marker, uint range) =>
         )]
         public static void DeleteBuffer(uint buffers) => Underlying.Value!.DeleteBuffer(buffers);
 
+        [NativeName("glDeleteBuffersARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteBuffersARB")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void DeleteBufferARB(uint buffers) =>
+            Underlying.Value!.DeleteBufferARB(buffers);
+
         [NativeName("glDeleteBuffers")]
         [SupportedApiProfile(
             "gl",
@@ -274342,14 +274329,15 @@ public static void DeleteBuffersARB(uint n, Ref<uint> buffers)
             }
         }
 
-        [NativeName("glDeleteBuffersARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteBuffersARB")]
+        [NativeName("glDeleteCommandListsNV")]
+        [SupportedApiProfile("gl", ["GL_NV_command_list"])]
+        [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteCommandListsNV")]
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void DeleteBuffersARB(uint buffers) =>
-            Underlying.Value!.DeleteBuffersARB(buffers);
+        public static void DeleteCommandListNV(uint lists) =>
+            Underlying.Value!.DeleteCommandListNV(lists);
 
         [NativeName("glDeleteCommandListsNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
@@ -274376,15 +274364,24 @@ public static void DeleteCommandListsNV(uint n, Ref<uint> lists)
             }
         }
 
-        [NativeName("glDeleteCommandListsNV")]
-        [SupportedApiProfile("gl", ["GL_NV_command_list"])]
-        [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteCommandListsNV")]
+        [NativeName("glDeleteFencesAPPLE")]
+        [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteFencesAPPLE")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void DeleteFenceAPPLE(uint fences) =>
+            Underlying.Value!.DeleteFenceAPPLE(fences);
+
+        [NativeName("glDeleteFencesNV")]
+        [SupportedApiProfile("gl", ["GL_NV_fence"])]
+        [SupportedApiProfile("gles2", ["GL_NV_fence"])]
+        [SupportedApiProfile("gles1", ["GL_NV_fence"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteFencesNV")]
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void DeleteCommandListsNV(uint lists) =>
-            Underlying.Value!.DeleteCommandListsNV(lists);
+        public static void DeleteFenceNV(uint fences) => Underlying.Value!.DeleteFenceNV(fences);
 
         [NativeName("glDeleteFencesAPPLE")]
         [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
@@ -274409,15 +274406,6 @@ public static void DeleteFencesAPPLE(uint n, Ref<uint> fences)
             }
         }
 
-        [NativeName("glDeleteFencesAPPLE")]
-        [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteFencesAPPLE")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void DeleteFencesAPPLE(uint fences) =>
-            Underlying.Value!.DeleteFencesAPPLE(fences);
-
         [NativeName("glDeleteFencesNV")]
         [SupportedApiProfile("gl", ["GL_NV_fence"])]
         [SupportedApiProfile("gles2", ["GL_NV_fence"])]
@@ -274445,16 +274433,6 @@ public static void DeleteFencesNV(uint n, Ref<uint> fences)
             }
         }
 
-        [NativeName("glDeleteFencesNV")]
-        [SupportedApiProfile("gl", ["GL_NV_fence"])]
-        [SupportedApiProfile("gles2", ["GL_NV_fence"])]
-        [SupportedApiProfile("gles1", ["GL_NV_fence"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteFencesNV")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void DeleteFencesNV(uint fences) => Underlying.Value!.DeleteFencesNV(fences);
-
         [NativeName("glDeleteFragmentShaderATI")]
         [SupportedApiProfile("gl", ["GL_ATI_fragment_shader"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteFragmentShaderATI")]
@@ -274513,6 +274491,24 @@ public static void DeleteFragmentShaderATI(uint id) =>
         public static void DeleteFramebuffer(uint framebuffers) =>
             Underlying.Value!.DeleteFramebuffer(framebuffers);
 
+        [NativeName("glDeleteFramebuffersEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersEXT")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void DeleteFramebufferEXT(uint framebuffers) =>
+            Underlying.Value!.DeleteFramebufferEXT(framebuffers);
+
+        [NativeName("glDeleteFramebuffersOES")]
+        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void DeleteFramebufferOES(uint framebuffers) =>
+            Underlying.Value!.DeleteFramebufferOES(framebuffers);
+
         [NativeName("glDeleteFramebuffers")]
         [SupportedApiProfile(
             "gl",
@@ -274639,15 +274635,6 @@ public static void DeleteFramebuffersEXT(uint n, Ref<uint> framebuffers)
             }
         }
 
-        [NativeName("glDeleteFramebuffersEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void DeleteFramebuffersEXT(uint framebuffers) =>
-            Underlying.Value!.DeleteFramebuffersEXT(framebuffers);
-
         [NativeName("glDeleteFramebuffersOES")]
         [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")]
@@ -274671,15 +274658,6 @@ public static void DeleteFramebuffersOES(uint n, Ref<uint> framebuffers)
             }
         }
 
-        [NativeName("glDeleteFramebuffersOES")]
-        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void DeleteFramebuffersOES(uint framebuffers) =>
-            Underlying.Value!.DeleteFramebuffersOES(framebuffers);
-
         [NativeName("glDeleteLists")]
         [SupportedApiProfile(
             "gl",
@@ -274713,6 +274691,16 @@ public static void DeleteFramebuffersOES(uint framebuffers) =>
         public static void DeleteLists(uint list, uint range) =>
             Underlying.Value!.DeleteLists(list, range);
 
+        [NativeName("glDeleteMemoryObjectsEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
+        [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteMemoryObjectsEXT")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void DeleteMemoryObjectEXT(uint memoryObjects) =>
+            Underlying.Value!.DeleteMemoryObjectEXT(memoryObjects);
+
         [NativeName("glDeleteMemoryObjectsEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
         [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])]
@@ -274738,15 +274726,14 @@ public static void DeleteMemoryObjectsEXT(uint n, Ref<uint> memoryObjects)
             }
         }
 
-        [NativeName("glDeleteMemoryObjectsEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
-        [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteMemoryObjectsEXT")]
+        [NativeName("glDeleteNamesAMD")]
+        [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteNamesAMD")]
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void DeleteMemoryObjectsEXT(uint memoryObjects) =>
-            Underlying.Value!.DeleteMemoryObjectsEXT(memoryObjects);
+        public static void DeleteNameAMD(uint identifier, uint names) =>
+            Underlying.Value!.DeleteNameAMD(identifier, names);
 
         [NativeName("glDeleteNamedStringARB")]
         [SupportedApiProfile("gl", ["GL_ARB_shading_language_include"])]
@@ -274806,15 +274793,6 @@ public static void DeleteNamesAMD(uint identifier, uint num, Ref<uint> names)
             }
         }
 
-        [NativeName("glDeleteNamesAMD")]
-        [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteNamesAMD")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void DeleteNamesAMD(uint identifier, uint names) =>
-            Underlying.Value!.DeleteNamesAMD(identifier, names);
-
         [NativeName("glDeleteObjectARB")]
         [SupportedApiProfile("gl", ["GL_ARB_shader_objects"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteObjectARB")]
@@ -274852,8 +274830,8 @@ public static void DeleteOcclusionQueriesNV(uint n, Ref<uint> ids)
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void DeleteOcclusionQueriesNV(uint ids) =>
-            Underlying.Value!.DeleteOcclusionQueriesNV(ids);
+        public static void DeleteOcclusionQueryNV(uint ids) =>
+            Underlying.Value!.DeleteOcclusionQueryNV(ids);
 
         [NativeName("glDeletePathsNV")]
         [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
@@ -274874,8 +274852,12 @@ public static void DeletePathNV(uint path, uint range) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void DeletePerfMonitorsAMD(uint n, uint* monitors) =>
-            Underlying.Value!.DeletePerfMonitorsAMD(n, monitors);
+        public static uint DeletePerfMonitorAMD()
+        {
+            uint monitors = default;
+            DeletePerfMonitorsAMD(1, (uint*)&monitors);
+            return monitors;
+        }
 
         [NativeName("glDeletePerfMonitorsAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
@@ -274885,13 +274867,8 @@ public static void DeletePerfMonitorsAMD(uint n, uint* monitors) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void DeletePerfMonitorsAMD(uint n, Ref<uint> monitors)
-        {
-            fixed (uint* __dsl_monitors = monitors)
-            {
-                DeletePerfMonitorsAMD(n, __dsl_monitors);
-            }
-        }
+        public static void DeletePerfMonitorsAMD(uint n, uint* monitors) =>
+            Underlying.Value!.DeletePerfMonitorsAMD(n, monitors);
 
         [NativeName("glDeletePerfMonitorsAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
@@ -274901,11 +274878,12 @@ public static void DeletePerfMonitorsAMD(uint n, Ref<uint> monitors)
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static uint DeletePerfMonitorsAMD()
+        public static void DeletePerfMonitorsAMD(uint n, Ref<uint> monitors)
         {
-            uint monitors = default;
-            DeletePerfMonitorsAMD(1, (uint*)&monitors);
-            return monitors;
+            fixed (uint* __dsl_monitors = monitors)
+            {
+                DeletePerfMonitorsAMD(n, __dsl_monitors);
+            }
         }
 
         [NativeName("glDeletePerfQueryINTEL")]
@@ -275003,6 +274981,15 @@ public static void DeletePerfQueryINTEL(uint queryHandle) =>
         public static void DeleteProgramPipeline(uint pipelines) =>
             Underlying.Value!.DeleteProgramPipeline(pipelines);
 
+        [NativeName("glDeleteProgramPipelinesEXT")]
+        [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteProgramPipelinesEXT")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void DeleteProgramPipelineEXT(uint pipelines) =>
+            Underlying.Value!.DeleteProgramPipelineEXT(pipelines);
+
         [NativeName("glDeleteProgramPipelines")]
         [SupportedApiProfile(
             "gl",
@@ -275099,15 +275086,6 @@ public static void DeleteProgramPipelinesEXT(uint n, Ref<uint> pipelines)
             }
         }
 
-        [NativeName("glDeleteProgramPipelinesEXT")]
-        [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteProgramPipelinesEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void DeleteProgramPipelinesEXT(uint pipelines) =>
-            Underlying.Value!.DeleteProgramPipelinesEXT(pipelines);
-
         [NativeName("glDeleteProgramsARB")]
         [SupportedApiProfile("gl", ["GL_ARB_fragment_program", "GL_ARB_vertex_program"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteProgramsARB")]
@@ -275296,14 +275274,6 @@ public static void DeleteQueriesARB(uint n, Ref<uint> ids)
             }
         }
 
-        [NativeName("glDeleteQueriesARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteQueriesARB")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void DeleteQueriesARB(uint ids) => Underlying.Value!.DeleteQueriesARB(ids);
-
         [NativeName("glDeleteQueriesEXT")]
         [SupportedApiProfile(
             "gles2",
@@ -275333,17 +275303,6 @@ public static void DeleteQueriesEXT(uint n, Ref<uint> ids)
             }
         }
 
-        [NativeName("glDeleteQueriesEXT")]
-        [SupportedApiProfile(
-            "gles2",
-            ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
-        )]
-        [NativeFunction("opengl", EntryPoint = "glDeleteQueriesEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void DeleteQueriesEXT(uint ids) => Underlying.Value!.DeleteQueriesEXT(ids);
-
         [NativeName("glDeleteQueries")]
         [SupportedApiProfile(
             "gl",
@@ -275391,6 +275350,25 @@ public static void DeleteQueriesEXT(uint n, Ref<uint> ids)
         )]
         public static void DeleteQuery(uint ids) => Underlying.Value!.DeleteQuery(ids);
 
+        [NativeName("glDeleteQueriesARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteQueriesARB")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void DeleteQueryARB(uint ids) => Underlying.Value!.DeleteQueryARB(ids);
+
+        [NativeName("glDeleteQueriesEXT")]
+        [SupportedApiProfile(
+            "gles2",
+            ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
+        )]
+        [NativeFunction("opengl", EntryPoint = "glDeleteQueriesEXT")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void DeleteQueryEXT(uint ids) => Underlying.Value!.DeleteQueryEXT(ids);
+
         [NativeName("glDeleteQueryResourceTagNV")]
         [SupportedApiProfile("gl", ["GL_NV_query_resource_tag"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteQueryResourceTagNV")]
@@ -275472,6 +275450,24 @@ public static void DeleteQueryResourceTagNV(int tagIds) =>
         public static void DeleteRenderbuffer(uint renderbuffers) =>
             Underlying.Value!.DeleteRenderbuffer(renderbuffers);
 
+        [NativeName("glDeleteRenderbuffersEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersEXT")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void DeleteRenderbufferEXT(uint renderbuffers) =>
+            Underlying.Value!.DeleteRenderbufferEXT(renderbuffers);
+
+        [NativeName("glDeleteRenderbuffersOES")]
+        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void DeleteRenderbufferOES(uint renderbuffers) =>
+            Underlying.Value!.DeleteRenderbufferOES(renderbuffers);
+
         [NativeName("glDeleteRenderbuffers")]
         [SupportedApiProfile(
             "gl",
@@ -275598,15 +275594,6 @@ public static void DeleteRenderbuffersEXT(uint n, Ref<uint> renderbuffers)
             }
         }
 
-        [NativeName("glDeleteRenderbuffersEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void DeleteRenderbuffersEXT(uint renderbuffers) =>
-            Underlying.Value!.DeleteRenderbuffersEXT(renderbuffers);
-
         [NativeName("glDeleteRenderbuffersOES")]
         [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")]
@@ -275630,15 +275617,6 @@ public static void DeleteRenderbuffersOES(uint n, Ref<uint> renderbuffers)
             }
         }
 
-        [NativeName("glDeleteRenderbuffersOES")]
-        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void DeleteRenderbuffersOES(uint renderbuffers) =>
-            Underlying.Value!.DeleteRenderbuffersOES(renderbuffers);
-
         [NativeName("glDeleteSamplers")]
         [SupportedApiProfile(
             "gl",
@@ -275788,6 +275766,16 @@ public static void DeleteSamplers(uint count, Ref<uint> samplers)
             }
         }
 
+        [NativeName("glDeleteSemaphoresEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
+        [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteSemaphoresEXT")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void DeleteSemaphoreEXT(uint semaphores) =>
+            Underlying.Value!.DeleteSemaphoreEXT(semaphores);
+
         [NativeName("glDeleteSemaphoresEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
         [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])]
@@ -275813,16 +275801,6 @@ public static void DeleteSemaphoresEXT(uint n, Ref<uint> semaphores)
             }
         }
 
-        [NativeName("glDeleteSemaphoresEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
-        [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteSemaphoresEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void DeleteSemaphoresEXT(uint semaphores) =>
-            Underlying.Value!.DeleteSemaphoresEXT(semaphores);
-
         [NativeName("glDeleteShader")]
         [SupportedApiProfile(
             "gl",
@@ -275873,6 +275851,15 @@ public static void DeleteSemaphoresEXT(uint semaphores) =>
         )]
         public static void DeleteShader(uint shader) => Underlying.Value!.DeleteShader(shader);
 
+        [NativeName("glDeleteStatesNV")]
+        [SupportedApiProfile("gl", ["GL_NV_command_list"])]
+        [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteStatesNV")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void DeleteStateNV(uint states) => Underlying.Value!.DeleteStateNV(states);
+
         [NativeName("glDeleteStatesNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
         [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
@@ -275898,15 +275885,6 @@ public static void DeleteStatesNV(uint n, Ref<uint> states)
             }
         }
 
-        [NativeName("glDeleteStatesNV")]
-        [SupportedApiProfile("gl", ["GL_NV_command_list"])]
-        [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteStatesNV")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void DeleteStatesNV(uint states) => Underlying.Value!.DeleteStatesNV(states);
-
         [NativeName("glDeleteSync")]
         [SupportedApiProfile(
             "gl",
@@ -276077,67 +276055,76 @@ public static void DeleteSyncAPPLE(Ref<Sync> sync)
         public static void DeleteTexture(uint textures) =>
             Underlying.Value!.DeleteTexture(textures);
 
-        [NativeName("glDeleteTextures")]
-        [SupportedApiProfile(
-            "gl",
-            [
-                "GL_VERSION_1_1",
-                "GL_VERSION_1_2",
-                "GL_VERSION_1_3",
-                "GL_VERSION_1_4",
-                "GL_VERSION_1_5",
-                "GL_VERSION_2_0",
-                "GL_VERSION_2_1",
-                "GL_VERSION_3_0",
-                "GL_VERSION_3_1",
-                "GL_VERSION_3_2",
-                "GL_VERSION_3_3",
-                "GL_VERSION_4_0",
-                "GL_VERSION_4_1",
-                "GL_VERSION_4_2",
-                "GL_VERSION_4_3",
-                "GL_VERSION_4_4",
-                "GL_VERSION_4_5",
-                "GL_VERSION_4_6",
-            ],
-            MinVersion = "1.1"
-        )]
-        [SupportedApiProfile(
-            "glcore",
-            [
-                "GL_VERSION_1_1",
-                "GL_VERSION_1_2",
-                "GL_VERSION_1_3",
-                "GL_VERSION_1_4",
-                "GL_VERSION_1_5",
-                "GL_VERSION_2_0",
-                "GL_VERSION_2_1",
-                "GL_VERSION_3_0",
-                "GL_VERSION_3_1",
-                "GL_VERSION_3_2",
-                "GL_VERSION_3_3",
-                "GL_VERSION_4_0",
-                "GL_VERSION_4_1",
-                "GL_VERSION_4_2",
-                "GL_VERSION_4_3",
-                "GL_VERSION_4_4",
-                "GL_VERSION_4_5",
-                "GL_VERSION_4_6",
-            ],
-            MinVersion = "1.1"
-        )]
-        [SupportedApiProfile(
-            "gles2",
-            ["GL_ES_VERSION_2_0", "GL_ES_VERSION_3_0", "GL_ES_VERSION_3_1", "GL_ES_VERSION_3_2"],
-            MinVersion = "2.0"
-        )]
-        [SupportedApiProfile("gles1", ["GL_VERSION_ES_CM_1_0"], MinVersion = "1.0")]
-        [NativeFunction("opengl", EntryPoint = "glDeleteTextures")]
+        [NativeName("glDeleteTexturesEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_texture_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteTexturesEXT")]
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void DeleteTextures(uint n, uint* textures) =>
-            Underlying.Value!.DeleteTextures(n, textures);
+        public static void DeleteTextureEXT(uint textures) =>
+            Underlying.Value!.DeleteTextureEXT(textures);
+
+        [NativeName("glDeleteTextures")]
+        [SupportedApiProfile(
+            "gl",
+            [
+                "GL_VERSION_1_1",
+                "GL_VERSION_1_2",
+                "GL_VERSION_1_3",
+                "GL_VERSION_1_4",
+                "GL_VERSION_1_5",
+                "GL_VERSION_2_0",
+                "GL_VERSION_2_1",
+                "GL_VERSION_3_0",
+                "GL_VERSION_3_1",
+                "GL_VERSION_3_2",
+                "GL_VERSION_3_3",
+                "GL_VERSION_4_0",
+                "GL_VERSION_4_1",
+                "GL_VERSION_4_2",
+                "GL_VERSION_4_3",
+                "GL_VERSION_4_4",
+                "GL_VERSION_4_5",
+                "GL_VERSION_4_6",
+            ],
+            MinVersion = "1.1"
+        )]
+        [SupportedApiProfile(
+            "glcore",
+            [
+                "GL_VERSION_1_1",
+                "GL_VERSION_1_2",
+                "GL_VERSION_1_3",
+                "GL_VERSION_1_4",
+                "GL_VERSION_1_5",
+                "GL_VERSION_2_0",
+                "GL_VERSION_2_1",
+                "GL_VERSION_3_0",
+                "GL_VERSION_3_1",
+                "GL_VERSION_3_2",
+                "GL_VERSION_3_3",
+                "GL_VERSION_4_0",
+                "GL_VERSION_4_1",
+                "GL_VERSION_4_2",
+                "GL_VERSION_4_3",
+                "GL_VERSION_4_4",
+                "GL_VERSION_4_5",
+                "GL_VERSION_4_6",
+            ],
+            MinVersion = "1.1"
+        )]
+        [SupportedApiProfile(
+            "gles2",
+            ["GL_ES_VERSION_2_0", "GL_ES_VERSION_3_0", "GL_ES_VERSION_3_1", "GL_ES_VERSION_3_2"],
+            MinVersion = "2.0"
+        )]
+        [SupportedApiProfile("gles1", ["GL_VERSION_ES_CM_1_0"], MinVersion = "1.0")]
+        [NativeFunction("opengl", EntryPoint = "glDeleteTextures")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void DeleteTextures(uint n, uint* textures) =>
+            Underlying.Value!.DeleteTextures(n, textures);
 
         [NativeName("glDeleteTextures")]
         [SupportedApiProfile(
@@ -276229,15 +276216,6 @@ public static void DeleteTexturesEXT(uint n, Ref<uint> textures)
             }
         }
 
-        [NativeName("glDeleteTexturesEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_texture_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteTexturesEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void DeleteTexturesEXT(uint textures) =>
-            Underlying.Value!.DeleteTexturesEXT(textures);
-
         [NativeName("glDeleteTransformFeedbacks")]
         [SupportedApiProfile(
             "gl",
@@ -276274,6 +276252,15 @@ public static void DeleteTexturesEXT(uint textures) =>
         public static void DeleteTransformFeedback(uint ids) =>
             Underlying.Value!.DeleteTransformFeedback(ids);
 
+        [NativeName("glDeleteTransformFeedbacksNV")]
+        [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteTransformFeedbacksNV")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void DeleteTransformFeedbackNV(uint ids) =>
+            Underlying.Value!.DeleteTransformFeedbackNV(ids);
+
         [NativeName("glDeleteTransformFeedbacks")]
         [SupportedApiProfile(
             "gl",
@@ -276374,15 +276361,6 @@ public static void DeleteTransformFeedbacksNV(uint n, Ref<uint> ids)
             }
         }
 
-        [NativeName("glDeleteTransformFeedbacksNV")]
-        [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteTransformFeedbacksNV")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void DeleteTransformFeedbacksNV(uint ids) =>
-            Underlying.Value!.DeleteTransformFeedbacksNV(ids);
-
         [NativeName("glDeleteVertexArrays")]
         [SupportedApiProfile(
             "gl",
@@ -276427,6 +276405,25 @@ public static void DeleteTransformFeedbacksNV(uint ids) =>
         public static void DeleteVertexArray(uint arrays) =>
             Underlying.Value!.DeleteVertexArray(arrays);
 
+        [NativeName("glDeleteVertexArraysAPPLE")]
+        [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysAPPLE")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void DeleteVertexArrayAPPLE(uint arrays) =>
+            Underlying.Value!.DeleteVertexArrayAPPLE(arrays);
+
+        [NativeName("glDeleteVertexArraysOES")]
+        [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
+        [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void DeleteVertexArrayOES(uint arrays) =>
+            Underlying.Value!.DeleteVertexArrayOES(arrays);
+
         [NativeName("glDeleteVertexArrays")]
         [SupportedApiProfile(
             "gl",
@@ -276543,15 +276540,6 @@ public static void DeleteVertexArraysAPPLE(uint n, Ref<uint> arrays)
             }
         }
 
-        [NativeName("glDeleteVertexArraysAPPLE")]
-        [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysAPPLE")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void DeleteVertexArraysAPPLE(uint arrays) =>
-            Underlying.Value!.DeleteVertexArraysAPPLE(arrays);
-
         [NativeName("glDeleteVertexArraysOES")]
         [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
         [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
@@ -276577,16 +276565,6 @@ public static void DeleteVertexArraysOES(uint n, Ref<uint> arrays)
             }
         }
 
-        [NativeName("glDeleteVertexArraysOES")]
-        [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
-        [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void DeleteVertexArraysOES(uint arrays) =>
-            Underlying.Value!.DeleteVertexArraysOES(arrays);
-
         [NativeName("glDeleteVertexShaderEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteVertexShaderEXT")]
@@ -278816,6 +278794,72 @@ public static void DrawBuffer(Constant<uint, GLEnum, DrawBufferMode> buf) =>
         )]
         public static void DrawBuffer(DrawBufferMode bufs) => Underlying.Value!.DrawBuffer(bufs);
 
+        [NativeName("glDrawBuffersARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void DrawBufferARB(uint bufs) => Underlying.Value!.DrawBufferARB(bufs);
+
+        [NativeName("glDrawBuffersARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void DrawBufferARB(GLEnum bufs) => Underlying.Value!.DrawBufferARB(bufs);
+
+        [NativeName("glDrawBuffersARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void DrawBufferARB(DrawBufferMode bufs) =>
+            Underlying.Value!.DrawBufferARB(bufs);
+
+        [NativeName("glDrawBuffersATI")]
+        [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void DrawBufferATI(uint bufs) => Underlying.Value!.DrawBufferATI(bufs);
+
+        [NativeName("glDrawBuffersATI")]
+        [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void DrawBufferATI(GLEnum bufs) => Underlying.Value!.DrawBufferATI(bufs);
+
+        [NativeName("glDrawBuffersATI")]
+        [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void DrawBufferATI(DrawBufferMode bufs) =>
+            Underlying.Value!.DrawBufferATI(bufs);
+
+        [NativeName("glDrawBuffersEXT")]
+        [SupportedApiProfile("gles2", ["GL_EXT_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersEXT")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void DrawBufferEXT(uint bufs) => Underlying.Value!.DrawBufferEXT(bufs);
+
+        [NativeName("glDrawBuffersNV")]
+        [SupportedApiProfile("gles2", ["GL_NV_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersNV")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void DrawBufferNV(uint bufs) => Underlying.Value!.DrawBufferNV(bufs);
+
         [NativeName("glDrawBuffers")]
         [SupportedApiProfile(
             "gl",
@@ -279038,14 +279082,6 @@ public static void DrawBuffersARB(uint n, Ref<uint> bufs)
             }
         }
 
-        [NativeName("glDrawBuffersARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void DrawBuffersARB(uint bufs) => Underlying.Value!.DrawBuffersARB(bufs);
-
         [NativeName("glDrawBuffersARB")]
         [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
         [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
@@ -279060,14 +279096,6 @@ public static void DrawBuffersARB(uint n, Ref<GLEnum> bufs)
             }
         }
 
-        [NativeName("glDrawBuffersARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void DrawBuffersARB(GLEnum bufs) => Underlying.Value!.DrawBuffersARB(bufs);
-
         [NativeName("glDrawBuffersARB")]
         [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
         [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
@@ -279082,15 +279110,6 @@ public static void DrawBuffersARB(uint n, Ref<DrawBufferMode> bufs)
             }
         }
 
-        [NativeName("glDrawBuffersARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void DrawBuffersARB(DrawBufferMode bufs) =>
-            Underlying.Value!.DrawBuffersARB(bufs);
-
         [NativeName("glDrawBuffersATI")]
         [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
         [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
@@ -279114,14 +279133,6 @@ public static void DrawBuffersATI(uint n, Ref<uint> bufs)
             }
         }
 
-        [NativeName("glDrawBuffersATI")]
-        [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void DrawBuffersATI(uint bufs) => Underlying.Value!.DrawBuffersATI(bufs);
-
         [NativeName("glDrawBuffersATI")]
         [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
         [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
@@ -279136,14 +279147,6 @@ public static void DrawBuffersATI(uint n, Ref<GLEnum> bufs)
             }
         }
 
-        [NativeName("glDrawBuffersATI")]
-        [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void DrawBuffersATI(GLEnum bufs) => Underlying.Value!.DrawBuffersATI(bufs);
-
         [NativeName("glDrawBuffersATI")]
         [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
         [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
@@ -279158,15 +279161,6 @@ public static void DrawBuffersATI(uint n, Ref<DrawBufferMode> bufs)
             }
         }
 
-        [NativeName("glDrawBuffersATI")]
-        [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void DrawBuffersATI(DrawBufferMode bufs) =>
-            Underlying.Value!.DrawBuffersATI(bufs);
-
         [NativeName("glDrawBuffersEXT")]
         [SupportedApiProfile("gles2", ["GL_EXT_draw_buffers"])]
         [NativeFunction("opengl", EntryPoint = "glDrawBuffersEXT")]
@@ -279190,14 +279184,6 @@ public static void DrawBuffersEXT(uint n, Ref<uint> bufs)
             }
         }
 
-        [NativeName("glDrawBuffersEXT")]
-        [SupportedApiProfile("gles2", ["GL_EXT_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void DrawBuffersEXT(uint bufs) => Underlying.Value!.DrawBuffersEXT(bufs);
-
         [NativeName("glDrawBuffersIndexedEXT")]
         [SupportedApiProfile("gles2", ["GL_EXT_multiview_draw_buffers"])]
         [NativeFunction("opengl", EntryPoint = "glDrawBuffersIndexedEXT")]
@@ -279245,14 +279231,6 @@ public static void DrawBuffersNV(uint n, Ref<uint> bufs)
             }
         }
 
-        [NativeName("glDrawBuffersNV")]
-        [SupportedApiProfile("gles2", ["GL_NV_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersNV")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void DrawBuffersNV(uint bufs) => Underlying.Value!.DrawBuffersNV(bufs);
-
         [NativeName("glDrawCommandsAddressNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
         [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
@@ -283981,6 +283959,23 @@ public static void ExtGetBufferPointerQCOM(uint target, Ref2D @params)
             }
         }
 
+        [NativeName("glExtGetBuffersQCOM")]
+        [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
+        [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
+        [NativeFunction("opengl", EntryPoint = "glExtGetBuffersQCOM")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static uint ExtGetBufferQCOM(Ref<int> numBuffers)
+        {
+            fixed (int* __dsl_numBuffers = numBuffers)
+            {
+                uint buffers = default;
+                ExtGetBuffersQCOM((uint*)&buffers, 1, __dsl_numBuffers);
+                return buffers;
+            }
+        }
+
         [NativeName("glExtGetBuffersQCOM")]
         [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
         [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
@@ -284007,20 +284002,20 @@ public static void ExtGetBuffersQCOM(Ref<uint> buffers, int maxBuffers, Ref<int>
             }
         }
 
-        [NativeName("glExtGetBuffersQCOM")]
+        [NativeName("glExtGetFramebuffersQCOM")]
         [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
         [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
-        [NativeFunction("opengl", EntryPoint = "glExtGetBuffersQCOM")]
+        [NativeFunction("opengl", EntryPoint = "glExtGetFramebuffersQCOM")]
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static uint ExtGetBuffersQCOM(Ref<int> numBuffers)
+        public static uint ExtGetFramebufferQCOM(Ref<int> numFramebuffers)
         {
-            fixed (int* __dsl_numBuffers = numBuffers)
+            fixed (int* __dsl_numFramebuffers = numFramebuffers)
             {
-                uint buffers = default;
-                ExtGetBuffersQCOM((uint*)&buffers, 1, __dsl_numBuffers);
-                return buffers;
+                uint framebuffers = default;
+                ExtGetFramebuffersQCOM((uint*)&framebuffers, 1, __dsl_numFramebuffers);
+                return framebuffers;
             }
         }
 
@@ -284062,23 +284057,6 @@ Ref<int> numFramebuffers
             }
         }
 
-        [NativeName("glExtGetFramebuffersQCOM")]
-        [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
-        [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
-        [NativeFunction("opengl", EntryPoint = "glExtGetFramebuffersQCOM")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static uint ExtGetFramebuffersQCOM(Ref<int> numFramebuffers)
-        {
-            fixed (int* __dsl_numFramebuffers = numFramebuffers)
-            {
-                uint framebuffers = default;
-                ExtGetFramebuffersQCOM((uint*)&framebuffers, 1, __dsl_numFramebuffers);
-                return framebuffers;
-            }
-        }
-
         [NativeName("glExtGetProgramBinarySourceQCOM")]
         [SupportedApiProfile("gles2", ["GL_QCOM_extended_get2"])]
         [SupportedApiProfile("gles1", ["GL_QCOM_extended_get2"])]
@@ -284166,6 +284144,23 @@ public static uint ExtGetProgramQCOM(Ref<int> numPrograms)
             }
         }
 
+        [NativeName("glExtGetRenderbuffersQCOM")]
+        [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
+        [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
+        [NativeFunction("opengl", EntryPoint = "glExtGetRenderbuffersQCOM")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static uint ExtGetRenderbufferQCOM(Ref<int> numRenderbuffers)
+        {
+            fixed (int* __dsl_numRenderbuffers = numRenderbuffers)
+            {
+                uint renderbuffers = default;
+                ExtGetRenderbuffersQCOM((uint*)&renderbuffers, 1, __dsl_numRenderbuffers);
+                return renderbuffers;
+            }
+        }
+
         [NativeName("glExtGetRenderbuffersQCOM")]
         [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
         [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
@@ -284208,20 +284203,20 @@ Ref<int> numRenderbuffers
             }
         }
 
-        [NativeName("glExtGetRenderbuffersQCOM")]
-        [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
-        [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
-        [NativeFunction("opengl", EntryPoint = "glExtGetRenderbuffersQCOM")]
+        [NativeName("glExtGetShadersQCOM")]
+        [SupportedApiProfile("gles2", ["GL_QCOM_extended_get2"])]
+        [SupportedApiProfile("gles1", ["GL_QCOM_extended_get2"])]
+        [NativeFunction("opengl", EntryPoint = "glExtGetShadersQCOM")]
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static uint ExtGetRenderbuffersQCOM(Ref<int> numRenderbuffers)
+        public static uint ExtGetShaderQCOM(Ref<int> numShaders)
         {
-            fixed (int* __dsl_numRenderbuffers = numRenderbuffers)
+            fixed (int* __dsl_numShaders = numShaders)
             {
-                uint renderbuffers = default;
-                ExtGetRenderbuffersQCOM((uint*)&renderbuffers, 1, __dsl_numRenderbuffers);
-                return renderbuffers;
+                uint shaders = default;
+                ExtGetShadersQCOM((uint*)&shaders, 1, __dsl_numShaders);
+                return shaders;
             }
         }
 
@@ -284251,23 +284246,6 @@ public static void ExtGetShadersQCOM(Ref<uint> shaders, int maxShaders, Ref<int>
             }
         }
 
-        [NativeName("glExtGetShadersQCOM")]
-        [SupportedApiProfile("gles2", ["GL_QCOM_extended_get2"])]
-        [SupportedApiProfile("gles1", ["GL_QCOM_extended_get2"])]
-        [NativeFunction("opengl", EntryPoint = "glExtGetShadersQCOM")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static uint ExtGetShadersQCOM(Ref<int> numShaders)
-        {
-            fixed (int* __dsl_numShaders = numShaders)
-            {
-                uint shaders = default;
-                ExtGetShadersQCOM((uint*)&shaders, 1, __dsl_numShaders);
-                return shaders;
-            }
-        }
-
         [NativeName("glExtGetTexLevelParameterivQCOM")]
         [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
         [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
@@ -286359,8 +286337,8 @@ Constant<uint, GLEnum, DrawBufferMode> mode
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void FramebufferDrawBuffersEXT(uint framebuffer, uint n, uint* bufs) =>
-            Underlying.Value!.FramebufferDrawBuffersEXT(framebuffer, n, bufs);
+        public static void FramebufferDrawBufferEXT(uint framebuffer, GLEnum bufs) =>
+            Underlying.Value!.FramebufferDrawBufferEXT(framebuffer, bufs);
 
         [NativeName("glFramebufferDrawBuffersEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
@@ -286369,13 +286347,8 @@ public static void FramebufferDrawBuffersEXT(uint framebuffer, uint n, uint* buf
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void FramebufferDrawBuffersEXT(uint framebuffer, uint n, Ref<uint> bufs)
-        {
-            fixed (uint* __dsl_bufs = bufs)
-            {
-                FramebufferDrawBuffersEXT(framebuffer, n, __dsl_bufs);
-            }
-        }
+        public static void FramebufferDrawBufferEXT(uint framebuffer, DrawBufferMode bufs) =>
+            Underlying.Value!.FramebufferDrawBufferEXT(framebuffer, bufs);
 
         [NativeName("glFramebufferDrawBuffersEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
@@ -286384,8 +286357,8 @@ public static void FramebufferDrawBuffersEXT(uint framebuffer, uint n, Ref<uint>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void FramebufferDrawBuffersEXT(uint framebuffer, uint bufs) =>
-            Underlying.Value!.FramebufferDrawBuffersEXT(framebuffer, bufs);
+        public static void FramebufferDrawBuffersEXT(uint framebuffer, uint n, uint* bufs) =>
+            Underlying.Value!.FramebufferDrawBuffersEXT(framebuffer, n, bufs);
 
         [NativeName("glFramebufferDrawBuffersEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
@@ -286394,11 +286367,11 @@ public static void FramebufferDrawBuffersEXT(uint framebuffer, uint bufs) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void FramebufferDrawBuffersEXT(uint framebuffer, uint n, Ref<GLEnum> bufs)
+        public static void FramebufferDrawBuffersEXT(uint framebuffer, uint n, Ref<uint> bufs)
         {
-            fixed (GLEnum* __dsl_bufs = bufs)
+            fixed (uint* __dsl_bufs = bufs)
             {
-                FramebufferDrawBuffersEXT(framebuffer, n, (uint*)__dsl_bufs);
+                FramebufferDrawBuffersEXT(framebuffer, n, __dsl_bufs);
             }
         }
 
@@ -286409,8 +286382,13 @@ public static void FramebufferDrawBuffersEXT(uint framebuffer, uint n, Ref<GLEnu
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void FramebufferDrawBuffersEXT(uint framebuffer, GLEnum bufs) =>
-            Underlying.Value!.FramebufferDrawBuffersEXT(framebuffer, bufs);
+        public static void FramebufferDrawBuffersEXT(uint framebuffer, uint n, Ref<GLEnum> bufs)
+        {
+            fixed (GLEnum* __dsl_bufs = bufs)
+            {
+                FramebufferDrawBuffersEXT(framebuffer, n, (uint*)__dsl_bufs);
+            }
+        }
 
         [NativeName("glFramebufferDrawBuffersEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
@@ -286431,16 +286409,6 @@ Ref<DrawBufferMode> bufs
             }
         }
 
-        [NativeName("glFramebufferDrawBuffersEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
-        [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
-        [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void FramebufferDrawBuffersEXT(uint framebuffer, DrawBufferMode bufs) =>
-            Underlying.Value!.FramebufferDrawBuffersEXT(framebuffer, bufs);
-
         [NativeName("glFramebufferFetchBarrierEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_shader_framebuffer_fetch_non_coherent"])]
         [SupportedApiProfile("glcore", ["GL_EXT_shader_framebuffer_fetch_non_coherent"])]
@@ -288541,6 +288509,19 @@ public static uint GenBuffer()
             return buffers;
         }
 
+        [NativeName("glGenBuffersARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenBuffersARB")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static uint GenBufferARB()
+        {
+            uint buffers = default;
+            GenBuffersARB(1, (uint*)&buffers);
+            return buffers;
+        }
+
         [NativeName("glGenBuffers")]
         [SupportedApiProfile(
             "gl",
@@ -288677,19 +288658,6 @@ public static void GenBuffersARB(uint n, Ref<uint> buffers)
             }
         }
 
-        [NativeName("glGenBuffersARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenBuffersARB")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static uint GenBuffersARB()
-        {
-            uint buffers = default;
-            GenBuffersARB(1, (uint*)&buffers);
-            return buffers;
-        }
-
         [NativeName("glGenerateMipmap")]
         [SupportedApiProfile(
             "gl",
@@ -288891,8 +288859,27 @@ Constant<uint, GLEnum, TextureTarget> target
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void GenFencesAPPLE(uint n, uint* fences) =>
-            Underlying.Value!.GenFencesAPPLE(n, fences);
+        public static uint GenFenceAPPLE()
+        {
+            uint fences = default;
+            GenFencesAPPLE(1, (uint*)&fences);
+            return fences;
+        }
+
+        [NativeName("glGenFencesNV")]
+        [SupportedApiProfile("gl", ["GL_NV_fence"])]
+        [SupportedApiProfile("gles2", ["GL_NV_fence"])]
+        [SupportedApiProfile("gles1", ["GL_NV_fence"])]
+        [NativeFunction("opengl", EntryPoint = "glGenFencesNV")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static uint GenFenceNV()
+        {
+            uint fences = default;
+            GenFencesNV(1, (uint*)&fences);
+            return fences;
+        }
 
         [NativeName("glGenFencesAPPLE")]
         [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
@@ -288900,13 +288887,8 @@ public static void GenFencesAPPLE(uint n, uint* fences) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void GenFencesAPPLE(uint n, Ref<uint> fences)
-        {
-            fixed (uint* __dsl_fences = fences)
-            {
-                GenFencesAPPLE(n, __dsl_fences);
-            }
-        }
+        public static void GenFencesAPPLE(uint n, uint* fences) =>
+            Underlying.Value!.GenFencesAPPLE(n, fences);
 
         [NativeName("glGenFencesAPPLE")]
         [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
@@ -288914,11 +288896,12 @@ public static void GenFencesAPPLE(uint n, Ref<uint> fences)
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static uint GenFencesAPPLE()
+        public static void GenFencesAPPLE(uint n, Ref<uint> fences)
         {
-            uint fences = default;
-            GenFencesAPPLE(1, (uint*)&fences);
-            return fences;
+            fixed (uint* __dsl_fences = fences)
+            {
+                GenFencesAPPLE(n, __dsl_fences);
+            }
         }
 
         [NativeName("glGenFencesNV")]
@@ -288948,21 +288931,6 @@ public static void GenFencesNV(uint n, Ref<uint> fences)
             }
         }
 
-        [NativeName("glGenFencesNV")]
-        [SupportedApiProfile("gl", ["GL_NV_fence"])]
-        [SupportedApiProfile("gles2", ["GL_NV_fence"])]
-        [SupportedApiProfile("gles1", ["GL_NV_fence"])]
-        [NativeFunction("opengl", EntryPoint = "glGenFencesNV")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static uint GenFencesNV()
-        {
-            uint fences = default;
-            GenFencesNV(1, (uint*)&fences);
-            return fences;
-        }
-
         [NativeName("glGenFragmentShadersATI")]
         [SupportedApiProfile("gl", ["GL_ATI_fragment_shader"])]
         [NativeFunction("opengl", EntryPoint = "glGenFragmentShadersATI")]
@@ -289025,6 +288993,32 @@ public static uint GenFramebuffer()
             return framebuffers;
         }
 
+        [NativeName("glGenFramebuffersEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenFramebuffersEXT")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static uint GenFramebufferEXT()
+        {
+            uint framebuffers = default;
+            GenFramebuffersEXT(1, (uint*)&framebuffers);
+            return framebuffers;
+        }
+
+        [NativeName("glGenFramebuffersOES")]
+        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static uint GenFramebufferOES()
+        {
+            uint framebuffers = default;
+            GenFramebuffersOES(1, (uint*)&framebuffers);
+            return framebuffers;
+        }
+
         [NativeName("glGenFramebuffers")]
         [SupportedApiProfile(
             "gl",
@@ -289151,19 +289145,6 @@ public static void GenFramebuffersEXT(uint n, Ref<uint> framebuffers)
             }
         }
 
-        [NativeName("glGenFramebuffersEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenFramebuffersEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static uint GenFramebuffersEXT()
-        {
-            uint framebuffers = default;
-            GenFramebuffersEXT(1, (uint*)&framebuffers);
-            return framebuffers;
-        }
-
         [NativeName("glGenFramebuffersOES")]
         [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
         [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")]
@@ -289187,19 +289168,6 @@ public static void GenFramebuffersOES(uint n, Ref<uint> framebuffers)
             }
         }
 
-        [NativeName("glGenFramebuffersOES")]
-        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static uint GenFramebuffersOES()
-        {
-            uint framebuffers = default;
-            GenFramebuffersOES(1, (uint*)&framebuffers);
-            return framebuffers;
-        }
-
         [NativeName("glGenLists")]
         [SupportedApiProfile(
             "gl",
@@ -289238,8 +289206,12 @@ public static uint GenFramebuffersOES()
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void GenNamesAMD(uint identifier, uint num, uint* names) =>
-            Underlying.Value!.GenNamesAMD(identifier, num, names);
+        public static uint GenNameAMD(uint identifier)
+        {
+            uint names = default;
+            GenNamesAMD(identifier, 1, (uint*)&names);
+            return names;
+        }
 
         [NativeName("glGenNamesAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
@@ -289247,13 +289219,8 @@ public static void GenNamesAMD(uint identifier, uint num, uint* names) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void GenNamesAMD(uint identifier, uint num, Ref<uint> names)
-        {
-            fixed (uint* __dsl_names = names)
-            {
-                GenNamesAMD(identifier, num, __dsl_names);
-            }
-        }
+        public static void GenNamesAMD(uint identifier, uint num, uint* names) =>
+            Underlying.Value!.GenNamesAMD(identifier, num, names);
 
         [NativeName("glGenNamesAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
@@ -289261,11 +289228,12 @@ public static void GenNamesAMD(uint identifier, uint num, Ref<uint> names)
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static uint GenNamesAMD(uint identifier)
+        public static void GenNamesAMD(uint identifier, uint num, Ref<uint> names)
         {
-            uint names = default;
-            GenNamesAMD(identifier, 1, (uint*)&names);
-            return names;
+            fixed (uint* __dsl_names = names)
+            {
+                GenNamesAMD(identifier, num, __dsl_names);
+            }
         }
 
         [NativeName("glGenOcclusionQueriesNV")]
@@ -289297,7 +289265,7 @@ public static void GenOcclusionQueriesNV(uint n, Ref<uint> ids)
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static uint GenOcclusionQueriesNV()
+        public static uint GenOcclusionQueryNV()
         {
             uint ids = default;
             GenOcclusionQueriesNV(1, (uint*)&ids);
@@ -289322,8 +289290,12 @@ public static uint GenOcclusionQueriesNV()
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void GenPerfMonitorsAMD(uint n, uint* monitors) =>
-            Underlying.Value!.GenPerfMonitorsAMD(n, monitors);
+        public static uint GenPerfMonitorAMD()
+        {
+            uint monitors = default;
+            GenPerfMonitorsAMD(1, (uint*)&monitors);
+            return monitors;
+        }
 
         [NativeName("glGenPerfMonitorsAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
@@ -289333,13 +289305,8 @@ public static void GenPerfMonitorsAMD(uint n, uint* monitors) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void GenPerfMonitorsAMD(uint n, Ref<uint> monitors)
-        {
-            fixed (uint* __dsl_monitors = monitors)
-            {
-                GenPerfMonitorsAMD(n, __dsl_monitors);
-            }
-        }
+        public static void GenPerfMonitorsAMD(uint n, uint* monitors) =>
+            Underlying.Value!.GenPerfMonitorsAMD(n, monitors);
 
         [NativeName("glGenPerfMonitorsAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
@@ -289349,11 +289316,12 @@ public static void GenPerfMonitorsAMD(uint n, Ref<uint> monitors)
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static uint GenPerfMonitorsAMD()
+        public static void GenPerfMonitorsAMD(uint n, Ref<uint> monitors)
         {
-            uint monitors = default;
-            GenPerfMonitorsAMD(1, (uint*)&monitors);
-            return monitors;
+            fixed (uint* __dsl_monitors = monitors)
+            {
+                GenPerfMonitorsAMD(n, __dsl_monitors);
+            }
         }
 
         [NativeName("glGenProgramPipelines")]
@@ -289394,6 +289362,19 @@ public static uint GenProgramPipeline()
             return pipelines;
         }
 
+        [NativeName("glGenProgramPipelinesEXT")]
+        [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])]
+        [NativeFunction("opengl", EntryPoint = "glGenProgramPipelinesEXT")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static uint GenProgramPipelineEXT()
+        {
+            uint pipelines = default;
+            GenProgramPipelinesEXT(1, (uint*)&pipelines);
+            return pipelines;
+        }
+
         [NativeName("glGenProgramPipelines")]
         [SupportedApiProfile(
             "gl",
@@ -289490,19 +289471,6 @@ public static void GenProgramPipelinesEXT(uint n, Ref<uint> pipelines)
             }
         }
 
-        [NativeName("glGenProgramPipelinesEXT")]
-        [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])]
-        [NativeFunction("opengl", EntryPoint = "glGenProgramPipelinesEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static uint GenProgramPipelinesEXT()
-        {
-            uint pipelines = default;
-            GenProgramPipelinesEXT(1, (uint*)&pipelines);
-            return pipelines;
-        }
-
         [NativeName("glGenProgramsARB")]
         [SupportedApiProfile("gl", ["GL_ARB_fragment_program", "GL_ARB_vertex_program"])]
         [NativeFunction("opengl", EntryPoint = "glGenProgramsARB")]
@@ -289698,19 +289666,6 @@ public static void GenQueriesARB(uint n, Ref<uint> ids)
             }
         }
 
-        [NativeName("glGenQueriesARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
-        [NativeFunction("opengl", EntryPoint = "glGenQueriesARB")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static uint GenQueriesARB()
-        {
-            uint ids = default;
-            GenQueriesARB(1, (uint*)&ids);
-            return ids;
-        }
-
         [NativeName("glGenQueriesEXT")]
         [SupportedApiProfile(
             "gles2",
@@ -289740,22 +289695,6 @@ public static void GenQueriesEXT(uint n, Ref<uint> ids)
             }
         }
 
-        [NativeName("glGenQueriesEXT")]
-        [SupportedApiProfile(
-            "gles2",
-            ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
-        )]
-        [NativeFunction("opengl", EntryPoint = "glGenQueriesEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static uint GenQueriesEXT()
-        {
-            uint ids = default;
-            GenQueriesEXT(1, (uint*)&ids);
-            return ids;
-        }
-
         [NativeName("glGenQueries")]
         [SupportedApiProfile(
             "gl",
@@ -289808,6 +289747,35 @@ public static uint GenQuery()
             return ids;
         }
 
+        [NativeName("glGenQueriesARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
+        [NativeFunction("opengl", EntryPoint = "glGenQueriesARB")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static uint GenQueryARB()
+        {
+            uint ids = default;
+            GenQueriesARB(1, (uint*)&ids);
+            return ids;
+        }
+
+        [NativeName("glGenQueriesEXT")]
+        [SupportedApiProfile(
+            "gles2",
+            ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
+        )]
+        [NativeFunction("opengl", EntryPoint = "glGenQueriesEXT")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static uint GenQueryEXT()
+        {
+            uint ids = default;
+            GenQueriesEXT(1, (uint*)&ids);
+            return ids;
+        }
+
         [NativeName("glGenQueryResourceTagNV")]
         [SupportedApiProfile("gl", ["GL_NV_query_resource_tag"])]
         [NativeFunction("opengl", EntryPoint = "glGenQueryResourceTagNV")]
@@ -289897,6 +289865,32 @@ public static uint GenRenderbuffer()
             return renderbuffers;
         }
 
+        [NativeName("glGenRenderbuffersEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersEXT")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static uint GenRenderbufferEXT()
+        {
+            uint renderbuffers = default;
+            GenRenderbuffersEXT(1, (uint*)&renderbuffers);
+            return renderbuffers;
+        }
+
+        [NativeName("glGenRenderbuffersOES")]
+        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static uint GenRenderbufferOES()
+        {
+            uint renderbuffers = default;
+            GenRenderbuffersOES(1, (uint*)&renderbuffers);
+            return renderbuffers;
+        }
+
         [NativeName("glGenRenderbuffers")]
         [SupportedApiProfile(
             "gl",
@@ -290023,19 +290017,6 @@ public static void GenRenderbuffersEXT(uint n, Ref<uint> renderbuffers)
             }
         }
 
-        [NativeName("glGenRenderbuffersEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static uint GenRenderbuffersEXT()
-        {
-            uint renderbuffers = default;
-            GenRenderbuffersEXT(1, (uint*)&renderbuffers);
-            return renderbuffers;
-        }
-
         [NativeName("glGenRenderbuffersOES")]
         [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
         [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")]
@@ -290059,19 +290040,6 @@ public static void GenRenderbuffersOES(uint n, Ref<uint> renderbuffers)
             }
         }
 
-        [NativeName("glGenRenderbuffersOES")]
-        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static uint GenRenderbuffersOES()
-        {
-            uint renderbuffers = default;
-            GenRenderbuffersOES(1, (uint*)&renderbuffers);
-            return renderbuffers;
-        }
-
         [NativeName("glGenSamplers")]
         [SupportedApiProfile(
             "gl",
@@ -290232,8 +290200,12 @@ public static void GenSamplers(uint count, Ref<uint> samplers)
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void GenSemaphoresEXT(uint n, uint* semaphores) =>
-            Underlying.Value!.GenSemaphoresEXT(n, semaphores);
+        public static uint GenSemaphoreEXT()
+        {
+            uint semaphores = default;
+            GenSemaphoresEXT(1, (uint*)&semaphores);
+            return semaphores;
+        }
 
         [NativeName("glGenSemaphoresEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
@@ -290242,13 +290214,8 @@ public static void GenSemaphoresEXT(uint n, uint* semaphores) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void GenSemaphoresEXT(uint n, Ref<uint> semaphores)
-        {
-            fixed (uint* __dsl_semaphores = semaphores)
-            {
-                GenSemaphoresEXT(n, __dsl_semaphores);
-            }
-        }
+        public static void GenSemaphoresEXT(uint n, uint* semaphores) =>
+            Underlying.Value!.GenSemaphoresEXT(n, semaphores);
 
         [NativeName("glGenSemaphoresEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
@@ -290257,11 +290224,12 @@ public static void GenSemaphoresEXT(uint n, Ref<uint> semaphores)
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static uint GenSemaphoresEXT()
+        public static void GenSemaphoresEXT(uint n, Ref<uint> semaphores)
         {
-            uint semaphores = default;
-            GenSemaphoresEXT(1, (uint*)&semaphores);
-            return semaphores;
+            fixed (uint* __dsl_semaphores = semaphores)
+            {
+                GenSemaphoresEXT(n, __dsl_semaphores);
+            }
         }
 
         [NativeName("glGenSymbolsEXT")]
@@ -290356,6 +290324,19 @@ public static uint GenTexture()
             return textures;
         }
 
+        [NativeName("glGenTexturesEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_texture_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenTexturesEXT")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static uint GenTextureEXT()
+        {
+            uint textures = default;
+            GenTexturesEXT(1, (uint*)&textures);
+            return textures;
+        }
+
         [NativeName("glGenTextures")]
         [SupportedApiProfile(
             "gl",
@@ -290508,19 +290489,6 @@ public static void GenTexturesEXT(uint n, Ref<uint> textures)
             }
         }
 
-        [NativeName("glGenTexturesEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_texture_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenTexturesEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static uint GenTexturesEXT()
-        {
-            uint textures = default;
-            GenTexturesEXT(1, (uint*)&textures);
-            return textures;
-        }
-
         [NativeName("glGenTransformFeedbacks")]
         [SupportedApiProfile(
             "gl",
@@ -290561,6 +290529,19 @@ public static uint GenTransformFeedback()
             return ids;
         }
 
+        [NativeName("glGenTransformFeedbacksNV")]
+        [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])]
+        [NativeFunction("opengl", EntryPoint = "glGenTransformFeedbacksNV")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static uint GenTransformFeedbackNV()
+        {
+            uint ids = default;
+            GenTransformFeedbacksNV(1, (uint*)&ids);
+            return ids;
+        }
+
         [NativeName("glGenTransformFeedbacks")]
         [SupportedApiProfile(
             "gl",
@@ -290661,19 +290642,6 @@ public static void GenTransformFeedbacksNV(uint n, Ref<uint> ids)
             }
         }
 
-        [NativeName("glGenTransformFeedbacksNV")]
-        [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])]
-        [NativeFunction("opengl", EntryPoint = "glGenTransformFeedbacksNV")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static uint GenTransformFeedbacksNV()
-        {
-            uint ids = default;
-            GenTransformFeedbacksNV(1, (uint*)&ids);
-            return ids;
-        }
-
         [NativeName("glGenVertexArrays")]
         [SupportedApiProfile(
             "gl",
@@ -290722,6 +290690,33 @@ public static uint GenVertexArray()
             return arrays;
         }
 
+        [NativeName("glGenVertexArraysAPPLE")]
+        [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenVertexArraysAPPLE")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static uint GenVertexArrayAPPLE()
+        {
+            uint arrays = default;
+            GenVertexArraysAPPLE(1, (uint*)&arrays);
+            return arrays;
+        }
+
+        [NativeName("glGenVertexArraysOES")]
+        [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
+        [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenVertexArraysOES")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static uint GenVertexArrayOES()
+        {
+            uint arrays = default;
+            GenVertexArraysOES(1, (uint*)&arrays);
+            return arrays;
+        }
+
         [NativeName("glGenVertexArrays")]
         [SupportedApiProfile(
             "gl",
@@ -290838,19 +290833,6 @@ public static void GenVertexArraysAPPLE(uint n, Ref<uint> arrays)
             }
         }
 
-        [NativeName("glGenVertexArraysAPPLE")]
-        [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenVertexArraysAPPLE")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static uint GenVertexArraysAPPLE()
-        {
-            uint arrays = default;
-            GenVertexArraysAPPLE(1, (uint*)&arrays);
-            return arrays;
-        }
-
         [NativeName("glGenVertexArraysOES")]
         [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
         [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
@@ -290876,20 +290858,6 @@ public static void GenVertexArraysOES(uint n, Ref<uint> arrays)
             }
         }
 
-        [NativeName("glGenVertexArraysOES")]
-        [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
-        [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenVertexArraysOES")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static uint GenVertexArraysOES()
-        {
-            uint arrays = default;
-            GenVertexArraysOES(1, (uint*)&arrays);
-            return arrays;
-        }
-
         [NativeName("glGenVertexShadersEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])]
         [NativeFunction("opengl", EntryPoint = "glGenVertexShadersEXT")]
@@ -293609,6 +293577,22 @@ Constant<uint, GLEnum, ArrayObjectPNameATI> pname
             return @params;
         }
 
+        [NativeName("glGetAttachedObjectsARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_shader_objects"])]
+        [NativeFunction("opengl", EntryPoint = "glGetAttachedObjectsARB")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static uint GetAttachedObjectARB(uint containerObj, Ref<uint> count)
+        {
+            fixed (uint* __dsl_count = count)
+            {
+                uint obj = default;
+                GetAttachedObjectsARB(containerObj, 1, __dsl_count, (uint*)&obj);
+                return obj;
+            }
+        }
+
         [NativeName("glGetAttachedObjectsARB")]
         [SupportedApiProfile("gl", ["GL_ARB_shader_objects"])]
         [NativeFunction("opengl", EntryPoint = "glGetAttachedObjectsARB")]
@@ -293642,22 +293626,6 @@ Ref<uint> obj
             }
         }
 
-        [NativeName("glGetAttachedObjectsARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_shader_objects"])]
-        [NativeFunction("opengl", EntryPoint = "glGetAttachedObjectsARB")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static uint GetAttachedObjectsARB(uint containerObj, Ref<uint> count)
-        {
-            fixed (uint* __dsl_count = count)
-            {
-                uint obj = default;
-                GetAttachedObjectsARB(containerObj, 1, __dsl_count, (uint*)&obj);
-                return obj;
-            }
-        }
-
         [NativeName("glGetAttachedShaders")]
         [SupportedApiProfile(
             "gl",
@@ -297980,6 +297948,22 @@ Ref<int> @params
             }
         }
 
+        [NativeName("glGetFragmentShadingRatesEXT")]
+        [SupportedApiProfile("gles2", ["GL_EXT_fragment_shading_rate"])]
+        [NativeFunction("opengl", EntryPoint = "glGetFragmentShadingRatesEXT")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static uint GetFragmentShadingRateEXT(uint samples, Ref<uint> count)
+        {
+            fixed (uint* __dsl_count = count)
+            {
+                uint shadingRates = default;
+                GetFragmentShadingRatesEXT(samples, 1, __dsl_count, (uint*)&shadingRates);
+                return shadingRates;
+            }
+        }
+
         [NativeName("glGetFragmentShadingRatesEXT")]
         [SupportedApiProfile("gles2", ["GL_EXT_fragment_shading_rate"])]
         [NativeFunction("opengl", EntryPoint = "glGetFragmentShadingRatesEXT")]
@@ -298013,22 +297997,6 @@ Ref<uint> shadingRates
             }
         }
 
-        [NativeName("glGetFragmentShadingRatesEXT")]
-        [SupportedApiProfile("gles2", ["GL_EXT_fragment_shading_rate"])]
-        [NativeFunction("opengl", EntryPoint = "glGetFragmentShadingRatesEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static uint GetFragmentShadingRatesEXT(uint samples, Ref<uint> count)
-        {
-            fixed (uint* __dsl_count = count)
-            {
-                uint shadingRates = default;
-                GetFragmentShadingRatesEXT(samples, 1, __dsl_count, (uint*)&shadingRates);
-                return shadingRates;
-            }
-        }
-
         [NativeName("glGetFragmentShadingRatesEXT")]
         [SupportedApiProfile("gles2", ["GL_EXT_fragment_shading_rate"])]
         [NativeFunction("opengl", EntryPoint = "glGetFragmentShadingRatesEXT")]
@@ -305095,8 +305063,12 @@ Ref<int> value
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void GetPathCommandsNV(uint path, byte* commands) =>
-            Underlying.Value!.GetPathCommandsNV(path, commands);
+        public static byte GetPathCommandNV()
+        {
+            byte commands = default;
+            GetPathCommandsNV(1, (byte*)&commands);
+            return commands;
+        }
 
         [NativeName("glGetPathCommandsNV")]
         [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
@@ -305106,13 +305078,8 @@ public static void GetPathCommandsNV(uint path, byte* commands) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void GetPathCommandsNV(uint path, Ref<byte> commands)
-        {
-            fixed (byte* __dsl_commands = commands)
-            {
-                GetPathCommandsNV(path, __dsl_commands);
-            }
-        }
+        public static void GetPathCommandsNV(uint path, byte* commands) =>
+            Underlying.Value!.GetPathCommandsNV(path, commands);
 
         [NativeName("glGetPathCommandsNV")]
         [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
@@ -305122,11 +305089,12 @@ public static void GetPathCommandsNV(uint path, Ref<byte> commands)
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static byte GetPathCommandsNV()
+        public static void GetPathCommandsNV(uint path, Ref<byte> commands)
         {
-            byte commands = default;
-            GetPathCommandsNV(1, (byte*)&commands);
-            return commands;
+            fixed (byte* __dsl_commands = commands)
+            {
+                GetPathCommandsNV(path, __dsl_commands);
+            }
         }
 
         [NativeName("glGetPathCommandsNV")]
@@ -305153,8 +305121,12 @@ public static void GetPathCommandsNV(uint path, Ref<PathCoordType> commands)
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void GetPathCoordsNV(uint path, float* coords) =>
-            Underlying.Value!.GetPathCoordsNV(path, coords);
+        public static float GetPathCoordNV()
+        {
+            float coords = default;
+            GetPathCoordsNV(1, (float*)&coords);
+            return coords;
+        }
 
         [NativeName("glGetPathCoordsNV")]
         [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
@@ -305164,13 +305136,8 @@ public static void GetPathCoordsNV(uint path, float* coords) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void GetPathCoordsNV(uint path, Ref<float> coords)
-        {
-            fixed (float* __dsl_coords = coords)
-            {
-                GetPathCoordsNV(path, __dsl_coords);
-            }
-        }
+        public static void GetPathCoordsNV(uint path, float* coords) =>
+            Underlying.Value!.GetPathCoordsNV(path, coords);
 
         [NativeName("glGetPathCoordsNV")]
         [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
@@ -305180,11 +305147,12 @@ public static void GetPathCoordsNV(uint path, Ref<float> coords)
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static float GetPathCoordsNV()
+        public static void GetPathCoordsNV(uint path, Ref<float> coords)
         {
-            float coords = default;
-            GetPathCoordsNV(1, (float*)&coords);
-            return coords;
+            fixed (float* __dsl_coords = coords)
+            {
+                GetPathCoordsNV(path, __dsl_coords);
+            }
         }
 
         [NativeName("glGetPathDashArrayNV")]
@@ -305616,6 +305584,35 @@ Ref<ulong> rawCounterMaxValue
             }
         }
 
+        [NativeName("glGetPerfMonitorCountersAMD")]
+        [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
+        [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
+        [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
+        [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorCountersAMD")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static uint GetPerfMonitorCounterAMD(
+            uint group,
+            Ref<int> numCounters,
+            Ref<int> maxActiveCounters
+        )
+        {
+            fixed (int* __dsl_maxActiveCounters = maxActiveCounters)
+            fixed (int* __dsl_numCounters = numCounters)
+            {
+                uint counters = default;
+                GetPerfMonitorCountersAMD(
+                    group,
+                    __dsl_numCounters,
+                    __dsl_maxActiveCounters,
+                    1,
+                    (uint*)&counters
+                );
+                return counters;
+            }
+        }
+
         [NativeName("glGetPerfMonitorCounterDataAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
         [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
@@ -305676,7 +305673,7 @@ Ref<int> bytesWritten
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static int GetPerfMonitorCounterDataAMD(
+        public static int GetPerfMonitorCounterDatumAMD(
             uint monitor,
             uint pname,
             uint dataSize,
@@ -305786,35 +305783,6 @@ Ref<uint> counters
             }
         }
 
-        [NativeName("glGetPerfMonitorCountersAMD")]
-        [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
-        [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
-        [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
-        [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorCountersAMD")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static uint GetPerfMonitorCountersAMD(
-            uint group,
-            Ref<int> numCounters,
-            Ref<int> maxActiveCounters
-        )
-        {
-            fixed (int* __dsl_maxActiveCounters = maxActiveCounters)
-            fixed (int* __dsl_numCounters = numCounters)
-            {
-                uint counters = default;
-                GetPerfMonitorCountersAMD(
-                    group,
-                    __dsl_numCounters,
-                    __dsl_maxActiveCounters,
-                    1,
-                    (uint*)&counters
-                );
-                return counters;
-            }
-        }
-
         [NativeName("glGetPerfMonitorCounterStringAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
         [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
@@ -305903,8 +305871,15 @@ Ref<uint> length
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void GetPerfMonitorGroupsAMD(int* numGroups, uint groupsSize, uint* groups) =>
-            Underlying.Value!.GetPerfMonitorGroupsAMD(numGroups, groupsSize, groups);
+        public static uint GetPerfMonitorGroupAMD(Ref<int> numGroups)
+        {
+            fixed (int* __dsl_numGroups = numGroups)
+            {
+                uint groups = default;
+                GetPerfMonitorGroupsAMD(__dsl_numGroups, 1, (uint*)&groups);
+                return groups;
+            }
+        }
 
         [NativeName("glGetPerfMonitorGroupsAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
@@ -305914,18 +305889,8 @@ public static void GetPerfMonitorGroupsAMD(int* numGroups, uint groupsSize, uint
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void GetPerfMonitorGroupsAMD(
-            Ref<int> numGroups,
-            uint groupsSize,
-            Ref<uint> groups
-        )
-        {
-            fixed (uint* __dsl_groups = groups)
-            fixed (int* __dsl_numGroups = numGroups)
-            {
-                GetPerfMonitorGroupsAMD(__dsl_numGroups, groupsSize, __dsl_groups);
-            }
-        }
+        public static void GetPerfMonitorGroupsAMD(int* numGroups, uint groupsSize, uint* groups) =>
+            Underlying.Value!.GetPerfMonitorGroupsAMD(numGroups, groupsSize, groups);
 
         [NativeName("glGetPerfMonitorGroupsAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
@@ -305935,13 +305900,16 @@ Ref<uint> groups
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static uint GetPerfMonitorGroupsAMD(Ref<int> numGroups)
+        public static void GetPerfMonitorGroupsAMD(
+            Ref<int> numGroups,
+            uint groupsSize,
+            Ref<uint> groups
+        )
         {
+            fixed (uint* __dsl_groups = groups)
             fixed (int* __dsl_numGroups = numGroups)
             {
-                uint groups = default;
-                GetPerfMonitorGroupsAMD(__dsl_numGroups, 1, (uint*)&groups);
-                return groups;
+                GetPerfMonitorGroupsAMD(__dsl_numGroups, groupsSize, __dsl_groups);
             }
         }
 
@@ -344090,6 +344058,19 @@ public static void ProgramBinaryOES(uint program, uint binaryFormat, Ref binary,
             }
         }
 
+        [NativeName("glProgramBufferParametersfvNV")]
+        [SupportedApiProfile("gl", ["GL_NV_parameter_buffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glProgramBufferParametersfvNV")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void ProgramBufferParameterNV(
+            Constant<uint, GLEnum, ProgramTarget> target,
+            uint bindingIndex,
+            uint wordIndex,
+            float @params
+        ) => Underlying.Value!.ProgramBufferParameterNV(target, bindingIndex, wordIndex, @params);
+
         [NativeName("glProgramBufferParametersfvNV")]
         [SupportedApiProfile("gl", ["GL_NV_parameter_buffer_object"])]
         [NativeFunction("opengl", EntryPoint = "glProgramBufferParametersfvNV")]
@@ -344137,19 +344118,6 @@ Ref<float> @params
             }
         }
 
-        [NativeName("glProgramBufferParametersfvNV")]
-        [SupportedApiProfile("gl", ["GL_NV_parameter_buffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glProgramBufferParametersfvNV")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void ProgramBufferParametersNV(
-            Constant<uint, GLEnum, ProgramTarget> target,
-            uint bindingIndex,
-            uint wordIndex,
-            float @params
-        ) => Underlying.Value!.ProgramBufferParametersNV(target, bindingIndex, wordIndex, @params);
-
         [NativeName("glProgramBufferParametersIivNV")]
         [SupportedApiProfile("gl", ["GL_NV_parameter_buffer_object"])]
         [NativeFunction("opengl", EntryPoint = "glProgramBufferParametersIivNV")]
@@ -345500,8 +345468,8 @@ public static void ProgramSubroutineParametersNV(uint target, uint count, Ref<ui
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void ProgramSubroutineParametersNV(uint target, uint @params) =>
-            Underlying.Value!.ProgramSubroutineParametersNV(target, @params);
+        public static void ProgramSubroutineParameterNV(uint target, uint @params) =>
+            Underlying.Value!.ProgramSubroutineParameterNV(target, @params);
 
         [NativeName("glProgramUniform1d")]
         [SupportedApiProfile(
@@ -360338,6 +360306,25 @@ public static uint SelectBuffer()
             return buffer;
         }
 
+        [NativeName("glSelectPerfMonitorCountersAMD")]
+        [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
+        [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
+        [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
+        [NativeFunction("opengl", EntryPoint = "glSelectPerfMonitorCountersAMD")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static uint SelectPerfMonitorCounterAMD(
+            uint monitor,
+            MaybeBool<uint> enable,
+            uint group
+        )
+        {
+            uint counterList = default;
+            SelectPerfMonitorCountersAMD(monitor, (uint)enable, group, 1, (uint*)&counterList);
+            return counterList;
+        }
+
         [NativeName("glSelectPerfMonitorCountersAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
         [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
@@ -360389,25 +360376,6 @@ Ref<uint> counterList
             }
         }
 
-        [NativeName("glSelectPerfMonitorCountersAMD")]
-        [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
-        [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
-        [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
-        [NativeFunction("opengl", EntryPoint = "glSelectPerfMonitorCountersAMD")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static uint SelectPerfMonitorCountersAMD(
-            uint monitor,
-            MaybeBool<uint> enable,
-            uint group
-        )
-        {
-            uint counterList = default;
-            SelectPerfMonitorCountersAMD(monitor, (uint)enable, group, 1, (uint*)&counterList);
-            return counterList;
-        }
-
         [NativeName("glSemaphoreParameterivNV")]
         [SupportedApiProfile("gl", ["GL_NV_timeline_semaphore"])]
         [SupportedApiProfile("gles2", ["GL_NV_timeline_semaphore"])]
@@ -366986,18 +366954,6 @@ public static void TexEstimateMotionRegionQCOM(
             uint mask
         ) => Underlying.Value!.TexEstimateMotionRegionQCOM(@ref, target, output, mask);
 
-        [NativeName("glTexFilterFuncSGIS")]
-        [SupportedApiProfile("gl", ["GL_SGIS_texture_filter4"])]
-        [NativeFunction("opengl", EntryPoint = "glTexFilterFuncSGIS")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void TexFilterFuncSgiSGIS(
-            Constant<uint, GLEnum, TextureTarget> target,
-            Constant<uint, GLEnum, TextureFilterSGIS> filter,
-            float weights
-        ) => Underlying.Value!.TexFilterFuncSgiSGIS(target, filter, weights);
-
         [NativeName("glTexFilterFuncSGIS")]
         [SupportedApiProfile("gl", ["GL_SGIS_texture_filter4"])]
         [NativeFunction("opengl", EntryPoint = "glTexFilterFuncSGIS")]
@@ -367026,38 +366982,50 @@ Ref<float> weights
             }
         }
 
-        [NativeName("glTexGend")]
-        [SupportedApiProfile(
-            "gl",
-            [
-                "GL_VERSION_1_0",
-                "GL_VERSION_1_1",
-                "GL_VERSION_1_2",
-                "GL_VERSION_1_3",
-                "GL_VERSION_1_4",
-                "GL_VERSION_1_5",
-                "GL_VERSION_2_0",
-                "GL_VERSION_2_1",
-                "GL_VERSION_3_0",
-                "GL_VERSION_3_1",
-                "GL_VERSION_3_2",
-                "GL_VERSION_3_3",
-                "GL_VERSION_4_0",
-                "GL_VERSION_4_1",
-                "GL_VERSION_4_2",
-                "GL_VERSION_4_3",
-                "GL_VERSION_4_4",
-                "GL_VERSION_4_5",
-                "GL_VERSION_4_6",
-            ],
-            MinVersion = "1.0"
-        )]
-        [NativeFunction("opengl", EntryPoint = "glTexGend")]
+        [NativeName("glTexFilterFuncSGIS")]
+        [SupportedApiProfile("gl", ["GL_SGIS_texture_filter4"])]
+        [NativeFunction("opengl", EntryPoint = "glTexFilterFuncSGIS")]
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void TexGen(uint coord, uint pname, double param2) =>
-            Underlying.Value!.TexGen(coord, pname, param2);
+        public static void TexFilterFuncSGIS(
+            Constant<uint, GLEnum, TextureTarget> target,
+            Constant<uint, GLEnum, TextureFilterSGIS> filter,
+            float weights
+        ) => Underlying.Value!.TexFilterFuncSGIS(target, filter, weights);
+
+        [NativeName("glTexGend")]
+        [SupportedApiProfile(
+            "gl",
+            [
+                "GL_VERSION_1_0",
+                "GL_VERSION_1_1",
+                "GL_VERSION_1_2",
+                "GL_VERSION_1_3",
+                "GL_VERSION_1_4",
+                "GL_VERSION_1_5",
+                "GL_VERSION_2_0",
+                "GL_VERSION_2_1",
+                "GL_VERSION_3_0",
+                "GL_VERSION_3_1",
+                "GL_VERSION_3_2",
+                "GL_VERSION_3_3",
+                "GL_VERSION_4_0",
+                "GL_VERSION_4_1",
+                "GL_VERSION_4_2",
+                "GL_VERSION_4_3",
+                "GL_VERSION_4_4",
+                "GL_VERSION_4_5",
+                "GL_VERSION_4_6",
+            ],
+            MinVersion = "1.0"
+        )]
+        [NativeFunction("opengl", EntryPoint = "glTexGend")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void TexGen(uint coord, uint pname, double param2) =>
+            Underlying.Value!.TexGen(coord, pname, param2);
 
         [NativeName("glTexGend")]
         [SupportedApiProfile(
@@ -374725,6 +374693,65 @@ Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
             }
         }
 
+        [NativeName("glTransformFeedbackVaryingsEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_transform_feedback"])]
+        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsEXT")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void TransformFeedbackVaryingEXT(
+            uint program,
+            Ref<sbyte> varyings,
+            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
+        )
+        {
+            fixed (sbyte* __dsl_varyings = varyings)
+            {
+                TransformFeedbackVaryingsEXT(
+                    program,
+                    1,
+                    (sbyte**)&__dsl_varyings,
+                    (uint)bufferMode
+                );
+            }
+        }
+
+        [NativeName("glTransformFeedbackVaryingsNV")]
+        [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
+        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void TransformFeedbackVaryingNV(
+            uint program,
+            int locations,
+            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
+        ) => Underlying.Value!.TransformFeedbackVaryingNV(program, locations, bufferMode);
+
+        [NativeName("glTransformFeedbackVaryingsNV")]
+        [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
+        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void TransformFeedbackVaryingNV(
+            uint program,
+            GLEnum locations,
+            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
+        ) => Underlying.Value!.TransformFeedbackVaryingNV(program, locations, bufferMode);
+
+        [NativeName("glTransformFeedbackVaryingsNV")]
+        [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
+        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void TransformFeedbackVaryingNV(
+            uint program,
+            TransformFeedbackTokenNV locations,
+            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
+        ) => Underlying.Value!.TransformFeedbackVaryingNV(program, locations, bufferMode);
+
         [NativeName("glTransformFeedbackVaryings")]
         [SupportedApiProfile(
             "gl",
@@ -374855,29 +374882,6 @@ Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
             }
         }
 
-        [NativeName("glTransformFeedbackVaryingsEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_transform_feedback"])]
-        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsEXT")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void TransformFeedbackVaryingsEXT(
-            uint program,
-            Ref<sbyte> varyings,
-            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
-        )
-        {
-            fixed (sbyte* __dsl_varyings = varyings)
-            {
-                TransformFeedbackVaryingsEXT(
-                    program,
-                    1,
-                    (sbyte**)&__dsl_varyings,
-                    (uint)bufferMode
-                );
-            }
-        }
-
         [NativeName("glTransformFeedbackVaryingsNV")]
         [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
         [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
@@ -374910,18 +374914,6 @@ Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
             }
         }
 
-        [NativeName("glTransformFeedbackVaryingsNV")]
-        [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
-        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void TransformFeedbackVaryingsNV(
-            uint program,
-            int locations,
-            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
-        ) => Underlying.Value!.TransformFeedbackVaryingsNV(program, locations, bufferMode);
-
         [NativeName("glTransformFeedbackVaryingsNV")]
         [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
         [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
@@ -374946,18 +374938,6 @@ Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
             }
         }
 
-        [NativeName("glTransformFeedbackVaryingsNV")]
-        [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
-        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void TransformFeedbackVaryingsNV(
-            uint program,
-            GLEnum locations,
-            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
-        ) => Underlying.Value!.TransformFeedbackVaryingsNV(program, locations, bufferMode);
-
         [NativeName("glTransformFeedbackVaryingsNV")]
         [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
         [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
@@ -374982,18 +374962,6 @@ Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
             }
         }
 
-        [NativeName("glTransformFeedbackVaryingsNV")]
-        [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
-        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void TransformFeedbackVaryingsNV(
-            uint program,
-            TransformFeedbackTokenNV locations,
-            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
-        ) => Underlying.Value!.TransformFeedbackVaryingsNV(program, locations, bufferMode);
-
         [NativeName("glTransformPathNV")]
         [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
         [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
@@ -380636,10 +380604,10 @@ Ref<uint> indices
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void UniformSubroutines(
+        public static void UniformSubroutine(
             Constant<uint, GLEnum, ShaderType> shadertype,
             uint indices
-        ) => Underlying.Value!.UniformSubroutines(shadertype, indices);
+        ) => Underlying.Value!.UniformSubroutine(shadertype, indices);
 
         [NativeName("glUniformui64NV")]
         [SupportedApiProfile("gl", ["GL_NV_shader_buffer_load"])]
@@ -381600,6 +381568,15 @@ public static MaybeBool<uint> VdpauIsSurfaceNV(nint surface) =>
         public static uint VdpauIsSurfaceRawNV(nint surface) =>
             Underlying.Value!.VdpauIsSurfaceRawNV(surface);
 
+        [NativeName("glVDPAUMapSurfacesNV")]
+        [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
+        [NativeFunction("opengl", EntryPoint = "glVDPAUMapSurfacesNV")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void VdpauMapSurfaceNV(nint surfaces) =>
+            Underlying.Value!.VdpauMapSurfaceNV(surfaces);
+
         [NativeName("glVDPAUMapSurfacesNV")]
         [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
         [NativeFunction("opengl", EntryPoint = "glVDPAUMapSurfacesNV")]
@@ -381623,15 +381600,6 @@ public static void VdpauMapSurfacesNV(uint numSurfaces, Ref<nint> surfaces)
             }
         }
 
-        [NativeName("glVDPAUMapSurfacesNV")]
-        [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
-        [NativeFunction("opengl", EntryPoint = "glVDPAUMapSurfacesNV")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void VdpauMapSurfacesNV(nint surfaces) =>
-            Underlying.Value!.VdpauMapSurfacesNV(surfaces);
-
         [NativeName("glVDPAURegisterOutputSurfaceNV")]
         [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
         [NativeFunction("opengl", EntryPoint = "glVDPAURegisterOutputSurfaceNV")]
@@ -381777,6 +381745,15 @@ MaybeBool<uint> isFrameStructure
         public static void VdpauSurfaceAccessNV(nint surface, uint access) =>
             Underlying.Value!.VdpauSurfaceAccessNV(surface, access);
 
+        [NativeName("glVDPAUUnmapSurfacesNV")]
+        [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
+        [NativeFunction("opengl", EntryPoint = "glVDPAUUnmapSurfacesNV")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void VdpauUnmapSurfaceNV(nint surfaces) =>
+            Underlying.Value!.VdpauUnmapSurfaceNV(surfaces);
+
         [NativeName("glVDPAUUnmapSurfacesNV")]
         [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
         [NativeFunction("opengl", EntryPoint = "glVDPAUUnmapSurfacesNV")]
@@ -381800,15 +381777,6 @@ public static void VdpauUnmapSurfacesNV(uint numSurface, Ref<nint> surfaces)
             }
         }
 
-        [NativeName("glVDPAUUnmapSurfacesNV")]
-        [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
-        [NativeFunction("opengl", EntryPoint = "glVDPAUUnmapSurfacesNV")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void VdpauUnmapSurfacesNV(nint surfaces) =>
-            Underlying.Value!.VdpauUnmapSurfacesNV(surfaces);
-
         [NativeName("glVDPAUUnregisterSurfaceNV")]
         [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
         [NativeFunction("opengl", EntryPoint = "glVDPAUUnregisterSurfaceNV")]
@@ -397731,8 +397699,8 @@ public static void WindowPos4MESA(Ref<short> v)
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void WindowRectanglesEXT(uint mode, uint count, int* box) =>
-            Underlying.Value!.WindowRectanglesEXT(mode, count, box);
+        public static void WindowRectangleEXT(uint mode, int box) =>
+            Underlying.Value!.WindowRectangleEXT(mode, box);
 
         [NativeName("glWindowRectanglesEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_window_rectangles"])]
@@ -397742,13 +397710,8 @@ public static void WindowRectanglesEXT(uint mode, uint count, int* box) =>
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void WindowRectanglesEXT(uint mode, uint count, Ref<int> box)
-        {
-            fixed (int* __dsl_box = box)
-            {
-                WindowRectanglesEXT(mode, count, __dsl_box);
-            }
-        }
+        public static void WindowRectanglesEXT(uint mode, uint count, int* box) =>
+            Underlying.Value!.WindowRectanglesEXT(mode, count, box);
 
         [NativeName("glWindowRectanglesEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_window_rectangles"])]
@@ -397758,8 +397721,13 @@ public static void WindowRectanglesEXT(uint mode, uint count, Ref<int> box)
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void WindowRectanglesEXT(uint mode, int box) =>
-            Underlying.Value!.WindowRectanglesEXT(mode, box);
+        public static void WindowRectanglesEXT(uint mode, uint count, Ref<int> box)
+        {
+            fixed (int* __dsl_box = box)
+            {
+                WindowRectanglesEXT(mode, count, __dsl_box);
+            }
+        }
 
         [NativeName("glWriteMaskEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])]
@@ -433120,6 +433088,25 @@ void IGL.CreateBuffers(uint n, Ref<uint> buffers)
     public static void CreateBuffers(uint n, Ref<uint> buffers) =>
         ThisThread.CreateBuffers(n, buffers);
 
+    [NativeName("glCreateCommandListsNV")]
+    [SupportedApiProfile("gl", ["GL_NV_command_list"])]
+    [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
+    [NativeFunction("opengl", EntryPoint = "glCreateCommandListsNV")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IGL.CreateCommandListNV()
+    {
+        uint lists = default;
+        ((IGL)this).CreateCommandListsNV(1, (uint*)&lists);
+        return lists;
+    }
+
+    [NativeName("glCreateCommandListsNV")]
+    [SupportedApiProfile("gl", ["GL_NV_command_list"])]
+    [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
+    [NativeFunction("opengl", EntryPoint = "glCreateCommandListsNV")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint CreateCommandListNV() => ThisThread.CreateCommandListNV();
+
     [NativeName("glCreateCommandListsNV")]
     [SupportedApiProfile("gl", ["GL_NV_command_list"])]
     [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
@@ -433163,25 +433150,6 @@ void IGL.CreateCommandListsNV(uint n, Ref<uint> lists)
     public static void CreateCommandListsNV(uint n, Ref<uint> lists) =>
         ThisThread.CreateCommandListsNV(n, lists);
 
-    [NativeName("glCreateCommandListsNV")]
-    [SupportedApiProfile("gl", ["GL_NV_command_list"])]
-    [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
-    [NativeFunction("opengl", EntryPoint = "glCreateCommandListsNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.CreateCommandListsNV()
-    {
-        uint lists = default;
-        ((IGL)this).CreateCommandListsNV(1, (uint*)&lists);
-        return lists;
-    }
-
-    [NativeName("glCreateCommandListsNV")]
-    [SupportedApiProfile("gl", ["GL_NV_command_list"])]
-    [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
-    [NativeFunction("opengl", EntryPoint = "glCreateCommandListsNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint CreateCommandListsNV() => ThisThread.CreateCommandListsNV();
-
     [NativeName("glCreateFramebuffers")]
     [SupportedApiProfile(
         "gl",
@@ -433292,6 +433260,25 @@ void IGL.CreateFramebuffers(uint n, Ref<uint> framebuffers)
     public static void CreateFramebuffers(uint n, Ref<uint> framebuffers) =>
         ThisThread.CreateFramebuffers(n, framebuffers);
 
+    [NativeName("glCreateMemoryObjectsEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
+    [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])]
+    [NativeFunction("opengl", EntryPoint = "glCreateMemoryObjectsEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IGL.CreateMemoryObjectEXT()
+    {
+        uint memoryObjects = default;
+        ((IGL)this).CreateMemoryObjectsEXT(1, (uint*)&memoryObjects);
+        return memoryObjects;
+    }
+
+    [NativeName("glCreateMemoryObjectsEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
+    [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])]
+    [NativeFunction("opengl", EntryPoint = "glCreateMemoryObjectsEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint CreateMemoryObjectEXT() => ThisThread.CreateMemoryObjectEXT();
+
     [NativeName("glCreateMemoryObjectsEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
     [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])]
@@ -433335,25 +433322,6 @@ void IGL.CreateMemoryObjectsEXT(uint n, Ref<uint> memoryObjects)
     public static void CreateMemoryObjectsEXT(uint n, Ref<uint> memoryObjects) =>
         ThisThread.CreateMemoryObjectsEXT(n, memoryObjects);
 
-    [NativeName("glCreateMemoryObjectsEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
-    [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])]
-    [NativeFunction("opengl", EntryPoint = "glCreateMemoryObjectsEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.CreateMemoryObjectsEXT()
-    {
-        uint memoryObjects = default;
-        ((IGL)this).CreateMemoryObjectsEXT(1, (uint*)&memoryObjects);
-        return memoryObjects;
-    }
-
-    [NativeName("glCreateMemoryObjectsEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
-    [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])]
-    [NativeFunction("opengl", EntryPoint = "glCreateMemoryObjectsEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint CreateMemoryObjectsEXT() => ThisThread.CreateMemoryObjectsEXT();
-
     [NativeName("glCreatePerfQueryINTEL")]
     [SupportedApiProfile("gl", ["GL_INTEL_performance_query"])]
     [SupportedApiProfile("glcore", ["GL_INTEL_performance_query"])]
@@ -434007,6 +433975,25 @@ void IGL.CreateSamplers(uint n, Ref<uint> samplers)
     public static void CreateSamplers(uint n, Ref<uint> samplers) =>
         ThisThread.CreateSamplers(n, samplers);
 
+    [NativeName("glCreateSemaphoresNV")]
+    [SupportedApiProfile("gl", ["GL_NV_timeline_semaphore"])]
+    [SupportedApiProfile("gles2", ["GL_NV_timeline_semaphore"])]
+    [NativeFunction("opengl", EntryPoint = "glCreateSemaphoresNV")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IGL.CreateSemaphoreNV()
+    {
+        uint semaphores = default;
+        ((IGL)this).CreateSemaphoresNV(1, (uint*)&semaphores);
+        return semaphores;
+    }
+
+    [NativeName("glCreateSemaphoresNV")]
+    [SupportedApiProfile("gl", ["GL_NV_timeline_semaphore"])]
+    [SupportedApiProfile("gles2", ["GL_NV_timeline_semaphore"])]
+    [NativeFunction("opengl", EntryPoint = "glCreateSemaphoresNV")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint CreateSemaphoreNV() => ThisThread.CreateSemaphoreNV();
+
     [NativeName("glCreateSemaphoresNV")]
     [SupportedApiProfile("gl", ["GL_NV_timeline_semaphore"])]
     [SupportedApiProfile("gles2", ["GL_NV_timeline_semaphore"])]
@@ -434050,25 +434037,6 @@ void IGL.CreateSemaphoresNV(uint n, Ref<uint> semaphores)
     public static void CreateSemaphoresNV(uint n, Ref<uint> semaphores) =>
         ThisThread.CreateSemaphoresNV(n, semaphores);
 
-    [NativeName("glCreateSemaphoresNV")]
-    [SupportedApiProfile("gl", ["GL_NV_timeline_semaphore"])]
-    [SupportedApiProfile("gles2", ["GL_NV_timeline_semaphore"])]
-    [NativeFunction("opengl", EntryPoint = "glCreateSemaphoresNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.CreateSemaphoresNV()
-    {
-        uint semaphores = default;
-        ((IGL)this).CreateSemaphoresNV(1, (uint*)&semaphores);
-        return semaphores;
-    }
-
-    [NativeName("glCreateSemaphoresNV")]
-    [SupportedApiProfile("gl", ["GL_NV_timeline_semaphore"])]
-    [SupportedApiProfile("gles2", ["GL_NV_timeline_semaphore"])]
-    [NativeFunction("opengl", EntryPoint = "glCreateSemaphoresNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint CreateSemaphoresNV() => ThisThread.CreateSemaphoresNV();
-
     [NativeName("glCreateShader")]
     [SupportedApiProfile(
         "gl",
@@ -434544,6 +434512,25 @@ public static uint CreateShaderProgramEXT(
         Ref2D<sbyte> strings
     ) => ThisThread.CreateShaderProgramEXT(type, count, strings);
 
+    [NativeName("glCreateStatesNV")]
+    [SupportedApiProfile("gl", ["GL_NV_command_list"])]
+    [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
+    [NativeFunction("opengl", EntryPoint = "glCreateStatesNV")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IGL.CreateStateNV()
+    {
+        uint states = default;
+        ((IGL)this).CreateStatesNV(1, (uint*)&states);
+        return states;
+    }
+
+    [NativeName("glCreateStatesNV")]
+    [SupportedApiProfile("gl", ["GL_NV_command_list"])]
+    [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
+    [NativeFunction("opengl", EntryPoint = "glCreateStatesNV")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint CreateStateNV() => ThisThread.CreateStateNV();
+
     [NativeName("glCreateStatesNV")]
     [SupportedApiProfile("gl", ["GL_NV_command_list"])]
     [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
@@ -434586,25 +434573,6 @@ void IGL.CreateStatesNV(uint n, Ref<uint> states)
     public static void CreateStatesNV(uint n, Ref<uint> states) =>
         ThisThread.CreateStatesNV(n, states);
 
-    [NativeName("glCreateStatesNV")]
-    [SupportedApiProfile("gl", ["GL_NV_command_list"])]
-    [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
-    [NativeFunction("opengl", EntryPoint = "glCreateStatesNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.CreateStatesNV()
-    {
-        uint states = default;
-        ((IGL)this).CreateStatesNV(1, (uint*)&states);
-        return states;
-    }
-
-    [NativeName("glCreateStatesNV")]
-    [SupportedApiProfile("gl", ["GL_NV_command_list"])]
-    [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
-    [NativeFunction("opengl", EntryPoint = "glCreateStatesNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint CreateStatesNV() => ThisThread.CreateStatesNV();
-
     [NativeName("glCreateSyncFromCLeventARB")]
     [SupportedApiProfile("gl", ["GL_ARB_cl_event"])]
     [SupportedApiProfile("glcore", ["GL_ARB_cl_event"])]
@@ -436936,6 +436904,18 @@ public static void DeleteAsyncMarkersSGIX(uint marker, uint range) =>
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static void DeleteBuffer(uint buffers) => ThisThread.DeleteBuffer(buffers);
 
+    [NativeName("glDeleteBuffersARB")]
+    [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteBuffersARB")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.DeleteBufferARB(uint buffers) => ((IGL)this).DeleteBuffersARB(1, (uint*)&buffers);
+
+    [NativeName("glDeleteBuffersARB")]
+    [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteBuffersARB")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void DeleteBufferARB(uint buffers) => ThisThread.DeleteBufferARB(buffers);
+
     [NativeName("glDeleteBuffers")]
     [SupportedApiProfile(
         "gl",
@@ -437193,17 +437173,19 @@ void IGL.DeleteBuffersARB(uint n, Ref<uint> buffers)
     public static void DeleteBuffersARB(uint n, Ref<uint> buffers) =>
         ThisThread.DeleteBuffersARB(n, buffers);
 
-    [NativeName("glDeleteBuffersARB")]
-    [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteBuffersARB")]
+    [NativeName("glDeleteCommandListsNV")]
+    [SupportedApiProfile("gl", ["GL_NV_command_list"])]
+    [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteCommandListsNV")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DeleteBuffersARB(uint buffers) => ((IGL)this).DeleteBuffersARB(1, (uint*)&buffers);
+    void IGL.DeleteCommandListNV(uint lists) => ((IGL)this).DeleteCommandListsNV(1, (uint*)&lists);
 
-    [NativeName("glDeleteBuffersARB")]
-    [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteBuffersARB")]
+    [NativeName("glDeleteCommandListsNV")]
+    [SupportedApiProfile("gl", ["GL_NV_command_list"])]
+    [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteCommandListsNV")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DeleteBuffersARB(uint buffers) => ThisThread.DeleteBuffersARB(buffers);
+    public static void DeleteCommandListNV(uint lists) => ThisThread.DeleteCommandListNV(lists);
 
     [NativeName("glDeleteCommandListsNV")]
     [SupportedApiProfile("gl", ["GL_NV_command_list"])]
@@ -437248,19 +437230,33 @@ void IGL.DeleteCommandListsNV(uint n, Ref<uint> lists)
     public static void DeleteCommandListsNV(uint n, Ref<uint> lists) =>
         ThisThread.DeleteCommandListsNV(n, lists);
 
-    [NativeName("glDeleteCommandListsNV")]
-    [SupportedApiProfile("gl", ["GL_NV_command_list"])]
-    [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteCommandListsNV")]
+    [NativeName("glDeleteFencesAPPLE")]
+    [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteFencesAPPLE")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DeleteCommandListsNV(uint lists) => ((IGL)this).DeleteCommandListsNV(1, (uint*)&lists);
+    void IGL.DeleteFenceAPPLE(uint fences) => ((IGL)this).DeleteFencesAPPLE(1, (uint*)&fences);
 
-    [NativeName("glDeleteCommandListsNV")]
-    [SupportedApiProfile("gl", ["GL_NV_command_list"])]
-    [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteCommandListsNV")]
+    [NativeName("glDeleteFencesAPPLE")]
+    [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteFencesAPPLE")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void DeleteFenceAPPLE(uint fences) => ThisThread.DeleteFenceAPPLE(fences);
+
+    [NativeName("glDeleteFencesNV")]
+    [SupportedApiProfile("gl", ["GL_NV_fence"])]
+    [SupportedApiProfile("gles2", ["GL_NV_fence"])]
+    [SupportedApiProfile("gles1", ["GL_NV_fence"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteFencesNV")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.DeleteFenceNV(uint fences) => ((IGL)this).DeleteFencesNV(1, (uint*)&fences);
+
+    [NativeName("glDeleteFencesNV")]
+    [SupportedApiProfile("gl", ["GL_NV_fence"])]
+    [SupportedApiProfile("gles2", ["GL_NV_fence"])]
+    [SupportedApiProfile("gles1", ["GL_NV_fence"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteFencesNV")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DeleteCommandListsNV(uint lists) => ThisThread.DeleteCommandListsNV(lists);
+    public static void DeleteFenceNV(uint fences) => ThisThread.DeleteFenceNV(fences);
 
     [NativeName("glDeleteFencesAPPLE")]
     [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
@@ -437301,18 +437297,6 @@ void IGL.DeleteFencesAPPLE(uint n, Ref<uint> fences)
     public static void DeleteFencesAPPLE(uint n, Ref<uint> fences) =>
         ThisThread.DeleteFencesAPPLE(n, fences);
 
-    [NativeName("glDeleteFencesAPPLE")]
-    [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteFencesAPPLE")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DeleteFencesAPPLE(uint fences) => ((IGL)this).DeleteFencesAPPLE(1, (uint*)&fences);
-
-    [NativeName("glDeleteFencesAPPLE")]
-    [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteFencesAPPLE")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DeleteFencesAPPLE(uint fences) => ThisThread.DeleteFencesAPPLE(fences);
-
     [NativeName("glDeleteFencesNV")]
     [SupportedApiProfile("gl", ["GL_NV_fence"])]
     [SupportedApiProfile("gles2", ["GL_NV_fence"])]
@@ -437359,22 +437343,6 @@ void IGL.DeleteFencesNV(uint n, Ref<uint> fences)
     public static void DeleteFencesNV(uint n, Ref<uint> fences) =>
         ThisThread.DeleteFencesNV(n, fences);
 
-    [NativeName("glDeleteFencesNV")]
-    [SupportedApiProfile("gl", ["GL_NV_fence"])]
-    [SupportedApiProfile("gles2", ["GL_NV_fence"])]
-    [SupportedApiProfile("gles1", ["GL_NV_fence"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteFencesNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DeleteFencesNV(uint fences) => ((IGL)this).DeleteFencesNV(1, (uint*)&fences);
-
-    [NativeName("glDeleteFencesNV")]
-    [SupportedApiProfile("gl", ["GL_NV_fence"])]
-    [SupportedApiProfile("gles2", ["GL_NV_fence"])]
-    [SupportedApiProfile("gles1", ["GL_NV_fence"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteFencesNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DeleteFencesNV(uint fences) => ThisThread.DeleteFencesNV(fences);
-
     [NativeName("glDeleteFragmentShaderATI")]
     [SupportedApiProfile("gl", ["GL_ATI_fragment_shader"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteFragmentShaderATI")]
@@ -437491,6 +437459,34 @@ void IGL.DeleteFramebuffer(uint framebuffers) =>
     public static void DeleteFramebuffer(uint framebuffers) =>
         ThisThread.DeleteFramebuffer(framebuffers);
 
+    [NativeName("glDeleteFramebuffersEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.DeleteFramebufferEXT(uint framebuffers) =>
+        ((IGL)this).DeleteFramebuffersEXT(1, (uint*)&framebuffers);
+
+    [NativeName("glDeleteFramebuffersEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void DeleteFramebufferEXT(uint framebuffers) =>
+        ThisThread.DeleteFramebufferEXT(framebuffers);
+
+    [NativeName("glDeleteFramebuffersOES")]
+    [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.DeleteFramebufferOES(uint framebuffers) =>
+        ((IGL)this).DeleteFramebuffersOES(1, (uint*)&framebuffers);
+
+    [NativeName("glDeleteFramebuffersOES")]
+    [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void DeleteFramebufferOES(uint framebuffers) =>
+        ThisThread.DeleteFramebufferOES(framebuffers);
+
     [NativeName("glDeleteFramebuffers")]
     [SupportedApiProfile(
         "gl",
@@ -437729,20 +437725,6 @@ void IGL.DeleteFramebuffersEXT(uint n, Ref<uint> framebuffers)
     public static void DeleteFramebuffersEXT(uint n, Ref<uint> framebuffers) =>
         ThisThread.DeleteFramebuffersEXT(n, framebuffers);
 
-    [NativeName("glDeleteFramebuffersEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DeleteFramebuffersEXT(uint framebuffers) =>
-        ((IGL)this).DeleteFramebuffersEXT(1, (uint*)&framebuffers);
-
-    [NativeName("glDeleteFramebuffersEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DeleteFramebuffersEXT(uint framebuffers) =>
-        ThisThread.DeleteFramebuffersEXT(framebuffers);
-
     [NativeName("glDeleteFramebuffersOES")]
     [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")]
@@ -437782,20 +437764,6 @@ void IGL.DeleteFramebuffersOES(uint n, Ref<uint> framebuffers)
     public static void DeleteFramebuffersOES(uint n, Ref<uint> framebuffers) =>
         ThisThread.DeleteFramebuffersOES(n, framebuffers);
 
-    [NativeName("glDeleteFramebuffersOES")]
-    [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DeleteFramebuffersOES(uint framebuffers) =>
-        ((IGL)this).DeleteFramebuffersOES(1, (uint*)&framebuffers);
-
-    [NativeName("glDeleteFramebuffersOES")]
-    [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DeleteFramebuffersOES(uint framebuffers) =>
-        ThisThread.DeleteFramebuffersOES(framebuffers);
-
     [NativeName("glDeleteLists")]
     [SupportedApiProfile(
         "gl",
@@ -437863,6 +437831,22 @@ _slots[470] is not null and var loadedFnPtr
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static void DeleteLists(uint list, uint range) => ThisThread.DeleteLists(list, range);
 
+    [NativeName("glDeleteMemoryObjectsEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
+    [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteMemoryObjectsEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.DeleteMemoryObjectEXT(uint memoryObjects) =>
+        ((IGL)this).DeleteMemoryObjectsEXT(1, (uint*)&memoryObjects);
+
+    [NativeName("glDeleteMemoryObjectsEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
+    [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteMemoryObjectsEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void DeleteMemoryObjectEXT(uint memoryObjects) =>
+        ThisThread.DeleteMemoryObjectEXT(memoryObjects);
+
     [NativeName("glDeleteMemoryObjectsEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
     [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])]
@@ -437906,21 +437890,19 @@ void IGL.DeleteMemoryObjectsEXT(uint n, Ref<uint> memoryObjects)
     public static void DeleteMemoryObjectsEXT(uint n, Ref<uint> memoryObjects) =>
         ThisThread.DeleteMemoryObjectsEXT(n, memoryObjects);
 
-    [NativeName("glDeleteMemoryObjectsEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
-    [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteMemoryObjectsEXT")]
+    [NativeName("glDeleteNamesAMD")]
+    [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteNamesAMD")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DeleteMemoryObjectsEXT(uint memoryObjects) =>
-        ((IGL)this).DeleteMemoryObjectsEXT(1, (uint*)&memoryObjects);
+    void IGL.DeleteNameAMD(uint identifier, uint names) =>
+        ((IGL)this).DeleteNamesAMD(identifier, 1, (uint*)&names);
 
-    [NativeName("glDeleteMemoryObjectsEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
-    [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteMemoryObjectsEXT")]
+    [NativeName("glDeleteNamesAMD")]
+    [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteNamesAMD")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DeleteMemoryObjectsEXT(uint memoryObjects) =>
-        ThisThread.DeleteMemoryObjectsEXT(memoryObjects);
+    public static void DeleteNameAMD(uint identifier, uint names) =>
+        ThisThread.DeleteNameAMD(identifier, names);
 
     [NativeName("glDeleteNamedStringARB")]
     [SupportedApiProfile("gl", ["GL_ARB_shading_language_include"])]
@@ -437930,9 +437912,9 @@ public static void DeleteMemoryObjectsEXT(uint memoryObjects) =>
     void IGL.DeleteNamedStringARB(int namelen, sbyte* name) =>
         (
             (delegate* unmanaged<int, sbyte*, void>)(
-                _slots[472] is not null and var loadedFnPtr
+                _slots[473] is not null and var loadedFnPtr
                     ? loadedFnPtr
-                    : _slots[472] = nativeContext.LoadFunction("glDeleteNamedStringARB", "opengl")
+                    : _slots[473] = nativeContext.LoadFunction("glDeleteNamedStringARB", "opengl")
             )
         )(namelen, name);
 
@@ -437986,9 +437968,9 @@ public static void DeleteNamedStringARB(int namelen, Ref<sbyte> name) =>
     void IGL.DeleteNamesAMD(uint identifier, uint num, uint* names) =>
         (
             (delegate* unmanaged<uint, uint, uint*, void>)(
-                _slots[473] is not null and var loadedFnPtr
+                _slots[472] is not null and var loadedFnPtr
                     ? loadedFnPtr
-                    : _slots[473] = nativeContext.LoadFunction("glDeleteNamesAMD", "opengl")
+                    : _slots[472] = nativeContext.LoadFunction("glDeleteNamesAMD", "opengl")
             )
         )(identifier, num, names);
 
@@ -438018,20 +438000,6 @@ void IGL.DeleteNamesAMD(uint identifier, uint num, Ref<uint> names)
     public static void DeleteNamesAMD(uint identifier, uint num, Ref<uint> names) =>
         ThisThread.DeleteNamesAMD(identifier, num, names);
 
-    [NativeName("glDeleteNamesAMD")]
-    [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteNamesAMD")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DeleteNamesAMD(uint identifier, uint names) =>
-        ((IGL)this).DeleteNamesAMD(identifier, 1, (uint*)&names);
-
-    [NativeName("glDeleteNamesAMD")]
-    [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteNamesAMD")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DeleteNamesAMD(uint identifier, uint names) =>
-        ThisThread.DeleteNamesAMD(identifier, names);
-
     [NativeName("glDeleteObjectARB")]
     [SupportedApiProfile("gl", ["GL_ARB_shader_objects"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteObjectARB")]
@@ -438097,15 +438065,14 @@ public static void DeleteOcclusionQueriesNV(uint n, Ref<uint> ids) =>
     [SupportedApiProfile("gl", ["GL_NV_occlusion_query"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteOcclusionQueriesNV")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DeleteOcclusionQueriesNV(uint ids) =>
+    void IGL.DeleteOcclusionQueryNV(uint ids) =>
         ((IGL)this).DeleteOcclusionQueriesNV(1, (uint*)&ids);
 
     [NativeName("glDeleteOcclusionQueriesNV")]
     [SupportedApiProfile("gl", ["GL_NV_occlusion_query"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteOcclusionQueriesNV")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DeleteOcclusionQueriesNV(uint ids) =>
-        ThisThread.DeleteOcclusionQueriesNV(ids);
+    public static void DeleteOcclusionQueryNV(uint ids) => ThisThread.DeleteOcclusionQueryNV(ids);
 
     [NativeName("glDeletePathsNV")]
     [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
@@ -438130,6 +438097,27 @@ _slots[476] is not null and var loadedFnPtr
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static void DeletePathNV(uint path, uint range) => ThisThread.DeletePathNV(path, range);
 
+    [NativeName("glDeletePerfMonitorsAMD")]
+    [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
+    [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
+    [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
+    [NativeFunction("opengl", EntryPoint = "glDeletePerfMonitorsAMD")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IGL.DeletePerfMonitorAMD()
+    {
+        uint monitors = default;
+        ((IGL)this).DeletePerfMonitorsAMD(1, (uint*)&monitors);
+        return monitors;
+    }
+
+    [NativeName("glDeletePerfMonitorsAMD")]
+    [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
+    [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
+    [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
+    [NativeFunction("opengl", EntryPoint = "glDeletePerfMonitorsAMD")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint DeletePerfMonitorAMD() => ThisThread.DeletePerfMonitorAMD();
+
     [NativeName("glDeletePerfMonitorsAMD")]
     [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
     [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
@@ -438177,27 +438165,6 @@ void IGL.DeletePerfMonitorsAMD(uint n, Ref<uint> monitors)
     public static void DeletePerfMonitorsAMD(uint n, Ref<uint> monitors) =>
         ThisThread.DeletePerfMonitorsAMD(n, monitors);
 
-    [NativeName("glDeletePerfMonitorsAMD")]
-    [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
-    [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
-    [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
-    [NativeFunction("opengl", EntryPoint = "glDeletePerfMonitorsAMD")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.DeletePerfMonitorsAMD()
-    {
-        uint monitors = default;
-        ((IGL)this).DeletePerfMonitorsAMD(1, (uint*)&monitors);
-        return monitors;
-    }
-
-    [NativeName("glDeletePerfMonitorsAMD")]
-    [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
-    [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
-    [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
-    [NativeFunction("opengl", EntryPoint = "glDeletePerfMonitorsAMD")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint DeletePerfMonitorsAMD() => ThisThread.DeletePerfMonitorsAMD();
-
     [NativeName("glDeletePerfQueryINTEL")]
     [SupportedApiProfile("gl", ["GL_INTEL_performance_query"])]
     [SupportedApiProfile("glcore", ["GL_INTEL_performance_query"])]
@@ -438389,6 +438356,20 @@ void IGL.DeleteProgramPipeline(uint pipelines) =>
     public static void DeleteProgramPipeline(uint pipelines) =>
         ThisThread.DeleteProgramPipeline(pipelines);
 
+    [NativeName("glDeleteProgramPipelinesEXT")]
+    [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteProgramPipelinesEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.DeleteProgramPipelineEXT(uint pipelines) =>
+        ((IGL)this).DeleteProgramPipelinesEXT(1, (uint*)&pipelines);
+
+    [NativeName("glDeleteProgramPipelinesEXT")]
+    [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteProgramPipelinesEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void DeleteProgramPipelineEXT(uint pipelines) =>
+        ThisThread.DeleteProgramPipelineEXT(pipelines);
+
     [NativeName("glDeleteProgramPipelines")]
     [SupportedApiProfile(
         "gl",
@@ -438570,20 +438551,6 @@ void IGL.DeleteProgramPipelinesEXT(uint n, Ref<uint> pipelines)
     public static void DeleteProgramPipelinesEXT(uint n, Ref<uint> pipelines) =>
         ThisThread.DeleteProgramPipelinesEXT(n, pipelines);
 
-    [NativeName("glDeleteProgramPipelinesEXT")]
-    [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteProgramPipelinesEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DeleteProgramPipelinesEXT(uint pipelines) =>
-        ((IGL)this).DeleteProgramPipelinesEXT(1, (uint*)&pipelines);
-
-    [NativeName("glDeleteProgramPipelinesEXT")]
-    [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteProgramPipelinesEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DeleteProgramPipelinesEXT(uint pipelines) =>
-        ThisThread.DeleteProgramPipelinesEXT(pipelines);
-
     [NativeName("glDeleteProgramsARB")]
     [SupportedApiProfile("gl", ["GL_ARB_fragment_program", "GL_ARB_vertex_program"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteProgramsARB")]
@@ -438917,18 +438884,6 @@ void IGL.DeleteQueriesARB(uint n, Ref<uint> ids)
     public static void DeleteQueriesARB(uint n, Ref<uint> ids) =>
         ThisThread.DeleteQueriesARB(n, ids);
 
-    [NativeName("glDeleteQueriesARB")]
-    [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteQueriesARB")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DeleteQueriesARB(uint ids) => ((IGL)this).DeleteQueriesARB(1, (uint*)&ids);
-
-    [NativeName("glDeleteQueriesARB")]
-    [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteQueriesARB")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DeleteQueriesARB(uint ids) => ThisThread.DeleteQueriesARB(ids);
-
     [NativeName("glDeleteQueriesEXT")]
     [SupportedApiProfile(
         "gles2",
@@ -438979,24 +438934,6 @@ void IGL.DeleteQueriesEXT(uint n, Ref<uint> ids)
     public static void DeleteQueriesEXT(uint n, Ref<uint> ids) =>
         ThisThread.DeleteQueriesEXT(n, ids);
 
-    [NativeName("glDeleteQueriesEXT")]
-    [SupportedApiProfile(
-        "gles2",
-        ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
-    )]
-    [NativeFunction("opengl", EntryPoint = "glDeleteQueriesEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DeleteQueriesEXT(uint ids) => ((IGL)this).DeleteQueriesEXT(1, (uint*)&ids);
-
-    [NativeName("glDeleteQueriesEXT")]
-    [SupportedApiProfile(
-        "gles2",
-        ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
-    )]
-    [NativeFunction("opengl", EntryPoint = "glDeleteQueriesEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DeleteQueriesEXT(uint ids) => ThisThread.DeleteQueriesEXT(ids);
-
     [NativeName("glDeleteQueries")]
     [SupportedApiProfile(
         "gl",
@@ -439087,6 +439024,36 @@ public static void DeleteQueriesEXT(uint n, Ref<uint> ids) =>
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static void DeleteQuery(uint ids) => ThisThread.DeleteQuery(ids);
 
+    [NativeName("glDeleteQueriesARB")]
+    [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteQueriesARB")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.DeleteQueryARB(uint ids) => ((IGL)this).DeleteQueriesARB(1, (uint*)&ids);
+
+    [NativeName("glDeleteQueriesARB")]
+    [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteQueriesARB")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void DeleteQueryARB(uint ids) => ThisThread.DeleteQueryARB(ids);
+
+    [NativeName("glDeleteQueriesEXT")]
+    [SupportedApiProfile(
+        "gles2",
+        ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
+    )]
+    [NativeFunction("opengl", EntryPoint = "glDeleteQueriesEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.DeleteQueryEXT(uint ids) => ((IGL)this).DeleteQueriesEXT(1, (uint*)&ids);
+
+    [NativeName("glDeleteQueriesEXT")]
+    [SupportedApiProfile(
+        "gles2",
+        ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
+    )]
+    [NativeFunction("opengl", EntryPoint = "glDeleteQueriesEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void DeleteQueryEXT(uint ids) => ThisThread.DeleteQueryEXT(ids);
+
     [NativeName("glDeleteQueryResourceTagNV")]
     [SupportedApiProfile("gl", ["GL_NV_query_resource_tag"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteQueryResourceTagNV")]
@@ -439237,6 +439204,34 @@ void IGL.DeleteRenderbuffer(uint renderbuffers) =>
     public static void DeleteRenderbuffer(uint renderbuffers) =>
         ThisThread.DeleteRenderbuffer(renderbuffers);
 
+    [NativeName("glDeleteRenderbuffersEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.DeleteRenderbufferEXT(uint renderbuffers) =>
+        ((IGL)this).DeleteRenderbuffersEXT(1, (uint*)&renderbuffers);
+
+    [NativeName("glDeleteRenderbuffersEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void DeleteRenderbufferEXT(uint renderbuffers) =>
+        ThisThread.DeleteRenderbufferEXT(renderbuffers);
+
+    [NativeName("glDeleteRenderbuffersOES")]
+    [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.DeleteRenderbufferOES(uint renderbuffers) =>
+        ((IGL)this).DeleteRenderbuffersOES(1, (uint*)&renderbuffers);
+
+    [NativeName("glDeleteRenderbuffersOES")]
+    [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void DeleteRenderbufferOES(uint renderbuffers) =>
+        ThisThread.DeleteRenderbufferOES(renderbuffers);
+
     [NativeName("glDeleteRenderbuffers")]
     [SupportedApiProfile(
         "gl",
@@ -439475,20 +439470,6 @@ void IGL.DeleteRenderbuffersEXT(uint n, Ref<uint> renderbuffers)
     public static void DeleteRenderbuffersEXT(uint n, Ref<uint> renderbuffers) =>
         ThisThread.DeleteRenderbuffersEXT(n, renderbuffers);
 
-    [NativeName("glDeleteRenderbuffersEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DeleteRenderbuffersEXT(uint renderbuffers) =>
-        ((IGL)this).DeleteRenderbuffersEXT(1, (uint*)&renderbuffers);
-
-    [NativeName("glDeleteRenderbuffersEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DeleteRenderbuffersEXT(uint renderbuffers) =>
-        ThisThread.DeleteRenderbuffersEXT(renderbuffers);
-
     [NativeName("glDeleteRenderbuffersOES")]
     [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")]
@@ -439528,20 +439509,6 @@ void IGL.DeleteRenderbuffersOES(uint n, Ref<uint> renderbuffers)
     public static void DeleteRenderbuffersOES(uint n, Ref<uint> renderbuffers) =>
         ThisThread.DeleteRenderbuffersOES(n, renderbuffers);
 
-    [NativeName("glDeleteRenderbuffersOES")]
-    [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DeleteRenderbuffersOES(uint renderbuffers) =>
-        ((IGL)this).DeleteRenderbuffersOES(1, (uint*)&renderbuffers);
-
-    [NativeName("glDeleteRenderbuffersOES")]
-    [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DeleteRenderbuffersOES(uint renderbuffers) =>
-        ThisThread.DeleteRenderbuffersOES(renderbuffers);
-
     [NativeName("glDeleteSamplers")]
     [SupportedApiProfile(
         "gl",
@@ -439797,6 +439764,22 @@ void IGL.DeleteSamplers(uint count, Ref<uint> samplers)
     public static void DeleteSamplers(uint count, Ref<uint> samplers) =>
         ThisThread.DeleteSamplers(count, samplers);
 
+    [NativeName("glDeleteSemaphoresEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
+    [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteSemaphoresEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.DeleteSemaphoreEXT(uint semaphores) =>
+        ((IGL)this).DeleteSemaphoresEXT(1, (uint*)&semaphores);
+
+    [NativeName("glDeleteSemaphoresEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
+    [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteSemaphoresEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void DeleteSemaphoreEXT(uint semaphores) =>
+        ThisThread.DeleteSemaphoreEXT(semaphores);
+
     [NativeName("glDeleteSemaphoresEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
     [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])]
@@ -439840,22 +439823,6 @@ void IGL.DeleteSemaphoresEXT(uint n, Ref<uint> semaphores)
     public static void DeleteSemaphoresEXT(uint n, Ref<uint> semaphores) =>
         ThisThread.DeleteSemaphoresEXT(n, semaphores);
 
-    [NativeName("glDeleteSemaphoresEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
-    [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteSemaphoresEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DeleteSemaphoresEXT(uint semaphores) =>
-        ((IGL)this).DeleteSemaphoresEXT(1, (uint*)&semaphores);
-
-    [NativeName("glDeleteSemaphoresEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
-    [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteSemaphoresEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DeleteSemaphoresEXT(uint semaphores) =>
-        ThisThread.DeleteSemaphoresEXT(semaphores);
-
     [NativeName("glDeleteShader")]
     [SupportedApiProfile(
         "gl",
@@ -439959,6 +439926,20 @@ _slots[493] is not null and var loadedFnPtr
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static void DeleteShader(uint shader) => ThisThread.DeleteShader(shader);
 
+    [NativeName("glDeleteStatesNV")]
+    [SupportedApiProfile("gl", ["GL_NV_command_list"])]
+    [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteStatesNV")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.DeleteStateNV(uint states) => ((IGL)this).DeleteStatesNV(1, (uint*)&states);
+
+    [NativeName("glDeleteStatesNV")]
+    [SupportedApiProfile("gl", ["GL_NV_command_list"])]
+    [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteStatesNV")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void DeleteStateNV(uint states) => ThisThread.DeleteStateNV(states);
+
     [NativeName("glDeleteStatesNV")]
     [SupportedApiProfile("gl", ["GL_NV_command_list"])]
     [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
@@ -440001,20 +439982,6 @@ void IGL.DeleteStatesNV(uint n, Ref<uint> states)
     public static void DeleteStatesNV(uint n, Ref<uint> states) =>
         ThisThread.DeleteStatesNV(n, states);
 
-    [NativeName("glDeleteStatesNV")]
-    [SupportedApiProfile("gl", ["GL_NV_command_list"])]
-    [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteStatesNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DeleteStatesNV(uint states) => ((IGL)this).DeleteStatesNV(1, (uint*)&states);
-
-    [NativeName("glDeleteStatesNV")]
-    [SupportedApiProfile("gl", ["GL_NV_command_list"])]
-    [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteStatesNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DeleteStatesNV(uint states) => ThisThread.DeleteStatesNV(states);
-
     [NativeName("glDeleteSync")]
     [SupportedApiProfile(
         "gl",
@@ -440335,6 +440302,18 @@ void IGL.DeleteSyncAPPLE(Ref<Sync> sync)
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static void DeleteTexture(uint textures) => ThisThread.DeleteTexture(textures);
 
+    [NativeName("glDeleteTexturesEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_texture_object"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteTexturesEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.DeleteTextureEXT(uint textures) => ((IGL)this).DeleteTexturesEXT(1, (uint*)&textures);
+
+    [NativeName("glDeleteTexturesEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_texture_object"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteTexturesEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void DeleteTextureEXT(uint textures) => ThisThread.DeleteTextureEXT(textures);
+
     [NativeName("glDeleteTextures")]
     [SupportedApiProfile(
         "gl",
@@ -440625,18 +440604,6 @@ void IGL.DeleteTexturesEXT(uint n, Ref<uint> textures)
     public static void DeleteTexturesEXT(uint n, Ref<uint> textures) =>
         ThisThread.DeleteTexturesEXT(n, textures);
 
-    [NativeName("glDeleteTexturesEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_texture_object"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteTexturesEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DeleteTexturesEXT(uint textures) => ((IGL)this).DeleteTexturesEXT(1, (uint*)&textures);
-
-    [NativeName("glDeleteTexturesEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_texture_object"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteTexturesEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DeleteTexturesEXT(uint textures) => ThisThread.DeleteTexturesEXT(textures);
-
     [NativeName("glDeleteTransformFeedbacks")]
     [SupportedApiProfile(
         "gl",
@@ -440704,82 +440671,96 @@ void IGL.DeleteTransformFeedback(uint ids) =>
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static void DeleteTransformFeedback(uint ids) => ThisThread.DeleteTransformFeedback(ids);
 
-    [NativeName("glDeleteTransformFeedbacks")]
-    [SupportedApiProfile(
-        "gl",
-        [
-            "GL_ARB_transform_feedback2",
-            "GL_VERSION_4_0",
-            "GL_VERSION_4_1",
-            "GL_VERSION_4_2",
-            "GL_VERSION_4_3",
-            "GL_VERSION_4_4",
-            "GL_VERSION_4_5",
-            "GL_VERSION_4_6",
-        ],
-        MinVersion = "4.0"
-    )]
-    [SupportedApiProfile(
-        "glcore",
-        [
-            "GL_ARB_transform_feedback2",
-            "GL_VERSION_4_0",
-            "GL_VERSION_4_1",
-            "GL_VERSION_4_2",
-            "GL_VERSION_4_3",
-            "GL_VERSION_4_4",
-            "GL_VERSION_4_5",
-            "GL_VERSION_4_6",
-        ],
-        MinVersion = "4.0"
-    )]
-    [NativeFunction("opengl", EntryPoint = "glDeleteTransformFeedbacks")]
+    [NativeName("glDeleteTransformFeedbacksNV")]
+    [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteTransformFeedbacksNV")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DeleteTransformFeedbacks(uint n, uint* ids) =>
-        (
-            (delegate* unmanaged<uint, uint*, void>)(
-                _slots[499] is not null and var loadedFnPtr
-                    ? loadedFnPtr
-                    : _slots[499] = nativeContext.LoadFunction(
-                        "glDeleteTransformFeedbacks",
-                        "opengl"
-                    )
-            )
-        )(n, ids);
+    void IGL.DeleteTransformFeedbackNV(uint ids) =>
+        ((IGL)this).DeleteTransformFeedbacksNV(1, (uint*)&ids);
 
-    [NativeName("glDeleteTransformFeedbacks")]
-    [SupportedApiProfile(
-        "gl",
-        [
-            "GL_ARB_transform_feedback2",
-            "GL_VERSION_4_0",
-            "GL_VERSION_4_1",
-            "GL_VERSION_4_2",
-            "GL_VERSION_4_3",
-            "GL_VERSION_4_4",
-            "GL_VERSION_4_5",
-            "GL_VERSION_4_6",
-        ],
-        MinVersion = "4.0"
-    )]
-    [SupportedApiProfile(
-        "glcore",
-        [
-            "GL_ARB_transform_feedback2",
-            "GL_VERSION_4_0",
-            "GL_VERSION_4_1",
-            "GL_VERSION_4_2",
-            "GL_VERSION_4_3",
-            "GL_VERSION_4_4",
-            "GL_VERSION_4_5",
-            "GL_VERSION_4_6",
-        ],
-        MinVersion = "4.0"
-    )]
-    [NativeFunction("opengl", EntryPoint = "glDeleteTransformFeedbacks")]
+    [NativeName("glDeleteTransformFeedbacksNV")]
+    [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteTransformFeedbacksNV")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DeleteTransformFeedbacks(uint n, uint* ids) =>
-        ThisThread.DeleteTransformFeedbacks(n, ids);
+    public static void DeleteTransformFeedbackNV(uint ids) =>
+        ThisThread.DeleteTransformFeedbackNV(ids);
+
+    [NativeName("glDeleteTransformFeedbacks")]
+    [SupportedApiProfile(
+        "gl",
+        [
+            "GL_ARB_transform_feedback2",
+            "GL_VERSION_4_0",
+            "GL_VERSION_4_1",
+            "GL_VERSION_4_2",
+            "GL_VERSION_4_3",
+            "GL_VERSION_4_4",
+            "GL_VERSION_4_5",
+            "GL_VERSION_4_6",
+        ],
+        MinVersion = "4.0"
+    )]
+    [SupportedApiProfile(
+        "glcore",
+        [
+            "GL_ARB_transform_feedback2",
+            "GL_VERSION_4_0",
+            "GL_VERSION_4_1",
+            "GL_VERSION_4_2",
+            "GL_VERSION_4_3",
+            "GL_VERSION_4_4",
+            "GL_VERSION_4_5",
+            "GL_VERSION_4_6",
+        ],
+        MinVersion = "4.0"
+    )]
+    [NativeFunction("opengl", EntryPoint = "glDeleteTransformFeedbacks")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.DeleteTransformFeedbacks(uint n, uint* ids) =>
+        (
+            (delegate* unmanaged<uint, uint*, void>)(
+                _slots[499] is not null and var loadedFnPtr
+                    ? loadedFnPtr
+                    : _slots[499] = nativeContext.LoadFunction(
+                        "glDeleteTransformFeedbacks",
+                        "opengl"
+                    )
+            )
+        )(n, ids);
+
+    [NativeName("glDeleteTransformFeedbacks")]
+    [SupportedApiProfile(
+        "gl",
+        [
+            "GL_ARB_transform_feedback2",
+            "GL_VERSION_4_0",
+            "GL_VERSION_4_1",
+            "GL_VERSION_4_2",
+            "GL_VERSION_4_3",
+            "GL_VERSION_4_4",
+            "GL_VERSION_4_5",
+            "GL_VERSION_4_6",
+        ],
+        MinVersion = "4.0"
+    )]
+    [SupportedApiProfile(
+        "glcore",
+        [
+            "GL_ARB_transform_feedback2",
+            "GL_VERSION_4_0",
+            "GL_VERSION_4_1",
+            "GL_VERSION_4_2",
+            "GL_VERSION_4_3",
+            "GL_VERSION_4_4",
+            "GL_VERSION_4_5",
+            "GL_VERSION_4_6",
+        ],
+        MinVersion = "4.0"
+    )]
+    [NativeFunction("opengl", EntryPoint = "glDeleteTransformFeedbacks")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void DeleteTransformFeedbacks(uint n, uint* ids) =>
+        ThisThread.DeleteTransformFeedbacks(n, ids);
 
     [NativeName("glDeleteTransformFeedbacks")]
     [SupportedApiProfile(
@@ -440896,20 +440877,6 @@ void IGL.DeleteTransformFeedbacksNV(uint n, Ref<uint> ids)
     public static void DeleteTransformFeedbacksNV(uint n, Ref<uint> ids) =>
         ThisThread.DeleteTransformFeedbacksNV(n, ids);
 
-    [NativeName("glDeleteTransformFeedbacksNV")]
-    [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteTransformFeedbacksNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DeleteTransformFeedbacksNV(uint ids) =>
-        ((IGL)this).DeleteTransformFeedbacksNV(1, (uint*)&ids);
-
-    [NativeName("glDeleteTransformFeedbacksNV")]
-    [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteTransformFeedbacksNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DeleteTransformFeedbacksNV(uint ids) =>
-        ThisThread.DeleteTransformFeedbacksNV(ids);
-
     [NativeName("glDeleteVertexArrays")]
     [SupportedApiProfile(
         "gl",
@@ -440992,6 +440959,35 @@ public static void DeleteTransformFeedbacksNV(uint ids) =>
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static void DeleteVertexArray(uint arrays) => ThisThread.DeleteVertexArray(arrays);
 
+    [NativeName("glDeleteVertexArraysAPPLE")]
+    [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysAPPLE")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.DeleteVertexArrayAPPLE(uint arrays) =>
+        ((IGL)this).DeleteVertexArraysAPPLE(1, (uint*)&arrays);
+
+    [NativeName("glDeleteVertexArraysAPPLE")]
+    [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysAPPLE")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void DeleteVertexArrayAPPLE(uint arrays) =>
+        ThisThread.DeleteVertexArrayAPPLE(arrays);
+
+    [NativeName("glDeleteVertexArraysOES")]
+    [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
+    [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.DeleteVertexArrayOES(uint arrays) =>
+        ((IGL)this).DeleteVertexArraysOES(1, (uint*)&arrays);
+
+    [NativeName("glDeleteVertexArraysOES")]
+    [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
+    [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void DeleteVertexArrayOES(uint arrays) => ThisThread.DeleteVertexArrayOES(arrays);
+
     [NativeName("glDeleteVertexArrays")]
     [SupportedApiProfile(
         "gl",
@@ -441213,20 +441209,6 @@ void IGL.DeleteVertexArraysAPPLE(uint n, Ref<uint> arrays)
     public static void DeleteVertexArraysAPPLE(uint n, Ref<uint> arrays) =>
         ThisThread.DeleteVertexArraysAPPLE(n, arrays);
 
-    [NativeName("glDeleteVertexArraysAPPLE")]
-    [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysAPPLE")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DeleteVertexArraysAPPLE(uint arrays) =>
-        ((IGL)this).DeleteVertexArraysAPPLE(1, (uint*)&arrays);
-
-    [NativeName("glDeleteVertexArraysAPPLE")]
-    [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysAPPLE")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DeleteVertexArraysAPPLE(uint arrays) =>
-        ThisThread.DeleteVertexArraysAPPLE(arrays);
-
     [NativeName("glDeleteVertexArraysOES")]
     [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
     [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
@@ -441270,22 +441252,6 @@ void IGL.DeleteVertexArraysOES(uint n, Ref<uint> arrays)
     public static void DeleteVertexArraysOES(uint n, Ref<uint> arrays) =>
         ThisThread.DeleteVertexArraysOES(n, arrays);
 
-    [NativeName("glDeleteVertexArraysOES")]
-    [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
-    [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DeleteVertexArraysOES(uint arrays) =>
-        ((IGL)this).DeleteVertexArraysOES(1, (uint*)&arrays);
-
-    [NativeName("glDeleteVertexArraysOES")]
-    [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
-    [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DeleteVertexArraysOES(uint arrays) =>
-        ThisThread.DeleteVertexArraysOES(arrays);
-
     [NativeName("glDeleteVertexShaderEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteVertexShaderEXT")]
@@ -445602,55 +445568,153 @@ void IGL.DrawBuffer(DrawBufferMode bufs) =>
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static void DrawBuffer(DrawBufferMode bufs) => ThisThread.DrawBuffer(bufs);
 
-    [NativeName("glDrawBuffers")]
-    [SupportedApiProfile(
-        "gl",
-        [
-            "GL_VERSION_2_0",
-            "GL_VERSION_2_1",
-            "GL_VERSION_3_0",
-            "GL_VERSION_3_1",
-            "GL_VERSION_3_2",
-            "GL_VERSION_3_3",
-            "GL_VERSION_4_0",
-            "GL_VERSION_4_1",
-            "GL_VERSION_4_2",
-            "GL_VERSION_4_3",
-            "GL_VERSION_4_4",
-            "GL_VERSION_4_5",
-            "GL_VERSION_4_6",
-        ],
-        MinVersion = "2.0"
-    )]
-    [SupportedApiProfile(
-        "glcore",
-        [
-            "GL_VERSION_2_0",
-            "GL_VERSION_2_1",
-            "GL_VERSION_3_0",
-            "GL_VERSION_3_1",
-            "GL_VERSION_3_2",
-            "GL_VERSION_3_3",
-            "GL_VERSION_4_0",
-            "GL_VERSION_4_1",
-            "GL_VERSION_4_2",
-            "GL_VERSION_4_3",
-            "GL_VERSION_4_4",
-            "GL_VERSION_4_5",
-            "GL_VERSION_4_6",
-        ],
-        MinVersion = "2.0"
-    )]
-    [NativeFunction("opengl", EntryPoint = "glDrawBuffers")]
+    [NativeName("glDrawBuffersARB")]
+    [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
+    [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DrawBuffers(uint n, uint* bufs) =>
-        (
-            (delegate* unmanaged<uint, uint*, void>)(
-                _slots[558] is not null and var loadedFnPtr
-                    ? loadedFnPtr
-                    : _slots[558] = nativeContext.LoadFunction("glDrawBuffers", "opengl")
-            )
-        )(n, bufs);
+    void IGL.DrawBufferARB(uint bufs) => ((IGL)this).DrawBuffersARB(1, (uint*)&bufs);
+
+    [NativeName("glDrawBuffersARB")]
+    [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
+    [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void DrawBufferARB(uint bufs) => ThisThread.DrawBufferARB(bufs);
+
+    [NativeName("glDrawBuffersARB")]
+    [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
+    [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.DrawBufferARB(GLEnum bufs) => ((IGL)this).DrawBuffersARB(1, (uint*)(GLEnum*)&bufs);
+
+    [NativeName("glDrawBuffersARB")]
+    [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
+    [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void DrawBufferARB(GLEnum bufs) => ThisThread.DrawBufferARB(bufs);
+
+    [NativeName("glDrawBuffersARB")]
+    [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
+    [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.DrawBufferARB(DrawBufferMode bufs) =>
+        ((IGL)this).DrawBuffersARB(1, (uint*)(DrawBufferMode*)&bufs);
+
+    [NativeName("glDrawBuffersARB")]
+    [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
+    [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void DrawBufferARB(DrawBufferMode bufs) => ThisThread.DrawBufferARB(bufs);
+
+    [NativeName("glDrawBuffersATI")]
+    [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
+    [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.DrawBufferATI(uint bufs) => ((IGL)this).DrawBuffersATI(1, (uint*)&bufs);
+
+    [NativeName("glDrawBuffersATI")]
+    [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
+    [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void DrawBufferATI(uint bufs) => ThisThread.DrawBufferATI(bufs);
+
+    [NativeName("glDrawBuffersATI")]
+    [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
+    [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.DrawBufferATI(GLEnum bufs) => ((IGL)this).DrawBuffersATI(1, (uint*)(GLEnum*)&bufs);
+
+    [NativeName("glDrawBuffersATI")]
+    [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
+    [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void DrawBufferATI(GLEnum bufs) => ThisThread.DrawBufferATI(bufs);
+
+    [NativeName("glDrawBuffersATI")]
+    [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
+    [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.DrawBufferATI(DrawBufferMode bufs) =>
+        ((IGL)this).DrawBuffersATI(1, (uint*)(DrawBufferMode*)&bufs);
+
+    [NativeName("glDrawBuffersATI")]
+    [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
+    [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void DrawBufferATI(DrawBufferMode bufs) => ThisThread.DrawBufferATI(bufs);
+
+    [NativeName("glDrawBuffersEXT")]
+    [SupportedApiProfile("gles2", ["GL_EXT_draw_buffers"])]
+    [NativeFunction("opengl", EntryPoint = "glDrawBuffersEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.DrawBufferEXT(uint bufs) => ((IGL)this).DrawBuffersEXT(1, (uint*)&bufs);
+
+    [NativeName("glDrawBuffersEXT")]
+    [SupportedApiProfile("gles2", ["GL_EXT_draw_buffers"])]
+    [NativeFunction("opengl", EntryPoint = "glDrawBuffersEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void DrawBufferEXT(uint bufs) => ThisThread.DrawBufferEXT(bufs);
+
+    [NativeName("glDrawBuffersNV")]
+    [SupportedApiProfile("gles2", ["GL_NV_draw_buffers"])]
+    [NativeFunction("opengl", EntryPoint = "glDrawBuffersNV")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.DrawBufferNV(uint bufs) => ((IGL)this).DrawBuffersNV(1, (uint*)&bufs);
+
+    [NativeName("glDrawBuffersNV")]
+    [SupportedApiProfile("gles2", ["GL_NV_draw_buffers"])]
+    [NativeFunction("opengl", EntryPoint = "glDrawBuffersNV")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void DrawBufferNV(uint bufs) => ThisThread.DrawBufferNV(bufs);
+
+    [NativeName("glDrawBuffers")]
+    [SupportedApiProfile(
+        "gl",
+        [
+            "GL_VERSION_2_0",
+            "GL_VERSION_2_1",
+            "GL_VERSION_3_0",
+            "GL_VERSION_3_1",
+            "GL_VERSION_3_2",
+            "GL_VERSION_3_3",
+            "GL_VERSION_4_0",
+            "GL_VERSION_4_1",
+            "GL_VERSION_4_2",
+            "GL_VERSION_4_3",
+            "GL_VERSION_4_4",
+            "GL_VERSION_4_5",
+            "GL_VERSION_4_6",
+        ],
+        MinVersion = "2.0"
+    )]
+    [SupportedApiProfile(
+        "glcore",
+        [
+            "GL_VERSION_2_0",
+            "GL_VERSION_2_1",
+            "GL_VERSION_3_0",
+            "GL_VERSION_3_1",
+            "GL_VERSION_3_2",
+            "GL_VERSION_3_3",
+            "GL_VERSION_4_0",
+            "GL_VERSION_4_1",
+            "GL_VERSION_4_2",
+            "GL_VERSION_4_3",
+            "GL_VERSION_4_4",
+            "GL_VERSION_4_5",
+            "GL_VERSION_4_6",
+        ],
+        MinVersion = "2.0"
+    )]
+    [NativeFunction("opengl", EntryPoint = "glDrawBuffers")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.DrawBuffers(uint n, uint* bufs) =>
+        (
+            (delegate* unmanaged<uint, uint*, void>)(
+                _slots[558] is not null and var loadedFnPtr
+                    ? loadedFnPtr
+                    : _slots[558] = nativeContext.LoadFunction("glDrawBuffers", "opengl")
+            )
+        )(n, bufs);
 
     [NativeName("glDrawBuffers")]
     [SupportedApiProfile(
@@ -446009,18 +446073,6 @@ void IGL.DrawBuffersARB(uint n, Ref<uint> bufs)
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static void DrawBuffersARB(uint n, Ref<uint> bufs) => ThisThread.DrawBuffersARB(n, bufs);
 
-    [NativeName("glDrawBuffersARB")]
-    [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
-    [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DrawBuffersARB(uint bufs) => ((IGL)this).DrawBuffersARB(1, (uint*)&bufs);
-
-    [NativeName("glDrawBuffersARB")]
-    [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
-    [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DrawBuffersARB(uint bufs) => ThisThread.DrawBuffersARB(bufs);
-
     [NativeName("glDrawBuffersARB")]
     [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
     [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
@@ -446040,18 +446092,6 @@ void IGL.DrawBuffersARB(uint n, Ref<GLEnum> bufs)
     public static void DrawBuffersARB(uint n, Ref<GLEnum> bufs) =>
         ThisThread.DrawBuffersARB(n, bufs);
 
-    [NativeName("glDrawBuffersARB")]
-    [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
-    [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DrawBuffersARB(GLEnum bufs) => ((IGL)this).DrawBuffersARB(1, (uint*)(GLEnum*)&bufs);
-
-    [NativeName("glDrawBuffersARB")]
-    [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
-    [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DrawBuffersARB(GLEnum bufs) => ThisThread.DrawBuffersARB(bufs);
-
     [NativeName("glDrawBuffersARB")]
     [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
     [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
@@ -446071,19 +446111,6 @@ void IGL.DrawBuffersARB(uint n, Ref<DrawBufferMode> bufs)
     public static void DrawBuffersARB(uint n, Ref<DrawBufferMode> bufs) =>
         ThisThread.DrawBuffersARB(n, bufs);
 
-    [NativeName("glDrawBuffersARB")]
-    [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
-    [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DrawBuffersARB(DrawBufferMode bufs) =>
-        ((IGL)this).DrawBuffersARB(1, (uint*)(DrawBufferMode*)&bufs);
-
-    [NativeName("glDrawBuffersARB")]
-    [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
-    [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DrawBuffersARB(DrawBufferMode bufs) => ThisThread.DrawBuffersARB(bufs);
-
     [NativeName("glDrawBuffersATI")]
     [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
     [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
@@ -446121,18 +446148,6 @@ void IGL.DrawBuffersATI(uint n, Ref<uint> bufs)
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static void DrawBuffersATI(uint n, Ref<uint> bufs) => ThisThread.DrawBuffersATI(n, bufs);
 
-    [NativeName("glDrawBuffersATI")]
-    [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
-    [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DrawBuffersATI(uint bufs) => ((IGL)this).DrawBuffersATI(1, (uint*)&bufs);
-
-    [NativeName("glDrawBuffersATI")]
-    [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
-    [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DrawBuffersATI(uint bufs) => ThisThread.DrawBuffersATI(bufs);
-
     [NativeName("glDrawBuffersATI")]
     [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
     [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
@@ -446152,18 +446167,6 @@ void IGL.DrawBuffersATI(uint n, Ref<GLEnum> bufs)
     public static void DrawBuffersATI(uint n, Ref<GLEnum> bufs) =>
         ThisThread.DrawBuffersATI(n, bufs);
 
-    [NativeName("glDrawBuffersATI")]
-    [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
-    [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DrawBuffersATI(GLEnum bufs) => ((IGL)this).DrawBuffersATI(1, (uint*)(GLEnum*)&bufs);
-
-    [NativeName("glDrawBuffersATI")]
-    [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
-    [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DrawBuffersATI(GLEnum bufs) => ThisThread.DrawBuffersATI(bufs);
-
     [NativeName("glDrawBuffersATI")]
     [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
     [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
@@ -446183,19 +446186,6 @@ void IGL.DrawBuffersATI(uint n, Ref<DrawBufferMode> bufs)
     public static void DrawBuffersATI(uint n, Ref<DrawBufferMode> bufs) =>
         ThisThread.DrawBuffersATI(n, bufs);
 
-    [NativeName("glDrawBuffersATI")]
-    [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
-    [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DrawBuffersATI(DrawBufferMode bufs) =>
-        ((IGL)this).DrawBuffersATI(1, (uint*)(DrawBufferMode*)&bufs);
-
-    [NativeName("glDrawBuffersATI")]
-    [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
-    [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DrawBuffersATI(DrawBufferMode bufs) => ThisThread.DrawBuffersATI(bufs);
-
     [NativeName("glDrawBuffersEXT")]
     [SupportedApiProfile("gles2", ["GL_EXT_draw_buffers"])]
     [NativeFunction("opengl", EntryPoint = "glDrawBuffersEXT")]
@@ -446233,18 +446223,6 @@ void IGL.DrawBuffersEXT(uint n, Ref<uint> bufs)
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static void DrawBuffersEXT(uint n, Ref<uint> bufs) => ThisThread.DrawBuffersEXT(n, bufs);
 
-    [NativeName("glDrawBuffersEXT")]
-    [SupportedApiProfile("gles2", ["GL_EXT_draw_buffers"])]
-    [NativeFunction("opengl", EntryPoint = "glDrawBuffersEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DrawBuffersEXT(uint bufs) => ((IGL)this).DrawBuffersEXT(1, (uint*)&bufs);
-
-    [NativeName("glDrawBuffersEXT")]
-    [SupportedApiProfile("gles2", ["GL_EXT_draw_buffers"])]
-    [NativeFunction("opengl", EntryPoint = "glDrawBuffersEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DrawBuffersEXT(uint bufs) => ThisThread.DrawBuffersEXT(bufs);
-
     [NativeName("glDrawBuffersIndexedEXT")]
     [SupportedApiProfile("gles2", ["GL_EXT_multiview_draw_buffers"])]
     [NativeFunction("opengl", EntryPoint = "glDrawBuffersIndexedEXT")]
@@ -446252,9 +446230,9 @@ void IGL.DrawBuffersEXT(uint n, Ref<uint> bufs)
     void IGL.DrawBuffersIndexedEXT(int n, uint* location, int* indices) =>
         (
             (delegate* unmanaged<int, uint*, int*, void>)(
-                _slots[562] is not null and var loadedFnPtr
+                _slots[563] is not null and var loadedFnPtr
                     ? loadedFnPtr
-                    : _slots[562] = nativeContext.LoadFunction("glDrawBuffersIndexedEXT", "opengl")
+                    : _slots[563] = nativeContext.LoadFunction("glDrawBuffersIndexedEXT", "opengl")
             )
         )(n, location, indices);
 
@@ -446292,9 +446270,9 @@ public static void DrawBuffersIndexedEXT(int n, Ref<uint> location, Ref<int> ind
     void IGL.DrawBuffersNV(uint n, uint* bufs) =>
         (
             (delegate* unmanaged<uint, uint*, void>)(
-                _slots[563] is not null and var loadedFnPtr
+                _slots[562] is not null and var loadedFnPtr
                     ? loadedFnPtr
-                    : _slots[563] = nativeContext.LoadFunction("glDrawBuffersNV", "opengl")
+                    : _slots[562] = nativeContext.LoadFunction("glDrawBuffersNV", "opengl")
             )
         )(n, bufs);
 
@@ -446322,18 +446300,6 @@ void IGL.DrawBuffersNV(uint n, Ref<uint> bufs)
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static void DrawBuffersNV(uint n, Ref<uint> bufs) => ThisThread.DrawBuffersNV(n, bufs);
 
-    [NativeName("glDrawBuffersNV")]
-    [SupportedApiProfile("gles2", ["GL_NV_draw_buffers"])]
-    [NativeFunction("opengl", EntryPoint = "glDrawBuffersNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.DrawBuffersNV(uint bufs) => ((IGL)this).DrawBuffersNV(1, (uint*)&bufs);
-
-    [NativeName("glDrawBuffersNV")]
-    [SupportedApiProfile("gles2", ["GL_NV_draw_buffers"])]
-    [NativeFunction("opengl", EntryPoint = "glDrawBuffersNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void DrawBuffersNV(uint bufs) => ThisThread.DrawBuffersNV(bufs);
-
     [NativeName("glDrawCommandsAddressNV")]
     [SupportedApiProfile("gl", ["GL_NV_command_list"])]
     [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
@@ -455450,6 +455416,29 @@ void IGL.ExtGetBufferPointerQCOM(uint target, Ref2D @params)
     public static void ExtGetBufferPointerQCOM(uint target, Ref2D @params) =>
         ThisThread.ExtGetBufferPointerQCOM(target, @params);
 
+    [NativeName("glExtGetBuffersQCOM")]
+    [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
+    [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
+    [NativeFunction("opengl", EntryPoint = "glExtGetBuffersQCOM")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IGL.ExtGetBufferQCOM(Ref<int> numBuffers)
+    {
+        fixed (int* __dsl_numBuffers = numBuffers)
+        {
+            uint buffers = default;
+            ((IGL)this).ExtGetBuffersQCOM((uint*)&buffers, 1, __dsl_numBuffers);
+            return buffers;
+        }
+    }
+
+    [NativeName("glExtGetBuffersQCOM")]
+    [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
+    [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
+    [NativeFunction("opengl", EntryPoint = "glExtGetBuffersQCOM")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint ExtGetBufferQCOM(Ref<int> numBuffers) =>
+        ThisThread.ExtGetBufferQCOM(numBuffers);
+
     [NativeName("glExtGetBuffersQCOM")]
     [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
     [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
@@ -455494,28 +455483,28 @@ void IGL.ExtGetBuffersQCOM(Ref<uint> buffers, int maxBuffers, Ref<int> numBuffer
     public static void ExtGetBuffersQCOM(Ref<uint> buffers, int maxBuffers, Ref<int> numBuffers) =>
         ThisThread.ExtGetBuffersQCOM(buffers, maxBuffers, numBuffers);
 
-    [NativeName("glExtGetBuffersQCOM")]
+    [NativeName("glExtGetFramebuffersQCOM")]
     [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
     [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
-    [NativeFunction("opengl", EntryPoint = "glExtGetBuffersQCOM")]
+    [NativeFunction("opengl", EntryPoint = "glExtGetFramebuffersQCOM")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.ExtGetBuffersQCOM(Ref<int> numBuffers)
+    uint IGL.ExtGetFramebufferQCOM(Ref<int> numFramebuffers)
     {
-        fixed (int* __dsl_numBuffers = numBuffers)
+        fixed (int* __dsl_numFramebuffers = numFramebuffers)
         {
-            uint buffers = default;
-            ((IGL)this).ExtGetBuffersQCOM((uint*)&buffers, 1, __dsl_numBuffers);
-            return buffers;
+            uint framebuffers = default;
+            ((IGL)this).ExtGetFramebuffersQCOM((uint*)&framebuffers, 1, __dsl_numFramebuffers);
+            return framebuffers;
         }
     }
 
-    [NativeName("glExtGetBuffersQCOM")]
+    [NativeName("glExtGetFramebuffersQCOM")]
     [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
     [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
-    [NativeFunction("opengl", EntryPoint = "glExtGetBuffersQCOM")]
+    [NativeFunction("opengl", EntryPoint = "glExtGetFramebuffersQCOM")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint ExtGetBuffersQCOM(Ref<int> numBuffers) =>
-        ThisThread.ExtGetBuffersQCOM(numBuffers);
+    public static uint ExtGetFramebufferQCOM(Ref<int> numFramebuffers) =>
+        ThisThread.ExtGetFramebufferQCOM(numFramebuffers);
 
     [NativeName("glExtGetFramebuffersQCOM")]
     [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
@@ -455579,29 +455568,6 @@ public static void ExtGetFramebuffersQCOM(
         Ref<int> numFramebuffers
     ) => ThisThread.ExtGetFramebuffersQCOM(framebuffers, maxFramebuffers, numFramebuffers);
 
-    [NativeName("glExtGetFramebuffersQCOM")]
-    [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
-    [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
-    [NativeFunction("opengl", EntryPoint = "glExtGetFramebuffersQCOM")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.ExtGetFramebuffersQCOM(Ref<int> numFramebuffers)
-    {
-        fixed (int* __dsl_numFramebuffers = numFramebuffers)
-        {
-            uint framebuffers = default;
-            ((IGL)this).ExtGetFramebuffersQCOM((uint*)&framebuffers, 1, __dsl_numFramebuffers);
-            return framebuffers;
-        }
-    }
-
-    [NativeName("glExtGetFramebuffersQCOM")]
-    [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
-    [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
-    [NativeFunction("opengl", EntryPoint = "glExtGetFramebuffersQCOM")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint ExtGetFramebuffersQCOM(Ref<int> numFramebuffers) =>
-        ThisThread.ExtGetFramebuffersQCOM(numFramebuffers);
-
     [NativeName("glExtGetProgramBinarySourceQCOM")]
     [SupportedApiProfile("gles2", ["GL_QCOM_extended_get2"])]
     [SupportedApiProfile("gles1", ["GL_QCOM_extended_get2"])]
@@ -455742,6 +455708,29 @@ uint IGL.ExtGetProgramQCOM(Ref<int> numPrograms)
     public static uint ExtGetProgramQCOM(Ref<int> numPrograms) =>
         ThisThread.ExtGetProgramQCOM(numPrograms);
 
+    [NativeName("glExtGetRenderbuffersQCOM")]
+    [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
+    [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
+    [NativeFunction("opengl", EntryPoint = "glExtGetRenderbuffersQCOM")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IGL.ExtGetRenderbufferQCOM(Ref<int> numRenderbuffers)
+    {
+        fixed (int* __dsl_numRenderbuffers = numRenderbuffers)
+        {
+            uint renderbuffers = default;
+            ((IGL)this).ExtGetRenderbuffersQCOM((uint*)&renderbuffers, 1, __dsl_numRenderbuffers);
+            return renderbuffers;
+        }
+    }
+
+    [NativeName("glExtGetRenderbuffersQCOM")]
+    [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
+    [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
+    [NativeFunction("opengl", EntryPoint = "glExtGetRenderbuffersQCOM")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint ExtGetRenderbufferQCOM(Ref<int> numRenderbuffers) =>
+        ThisThread.ExtGetRenderbufferQCOM(numRenderbuffers);
+
     [NativeName("glExtGetRenderbuffersQCOM")]
     [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
     [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
@@ -455807,28 +455796,28 @@ public static void ExtGetRenderbuffersQCOM(
         Ref<int> numRenderbuffers
     ) => ThisThread.ExtGetRenderbuffersQCOM(renderbuffers, maxRenderbuffers, numRenderbuffers);
 
-    [NativeName("glExtGetRenderbuffersQCOM")]
-    [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
-    [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
-    [NativeFunction("opengl", EntryPoint = "glExtGetRenderbuffersQCOM")]
+    [NativeName("glExtGetShadersQCOM")]
+    [SupportedApiProfile("gles2", ["GL_QCOM_extended_get2"])]
+    [SupportedApiProfile("gles1", ["GL_QCOM_extended_get2"])]
+    [NativeFunction("opengl", EntryPoint = "glExtGetShadersQCOM")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.ExtGetRenderbuffersQCOM(Ref<int> numRenderbuffers)
+    uint IGL.ExtGetShaderQCOM(Ref<int> numShaders)
     {
-        fixed (int* __dsl_numRenderbuffers = numRenderbuffers)
+        fixed (int* __dsl_numShaders = numShaders)
         {
-            uint renderbuffers = default;
-            ((IGL)this).ExtGetRenderbuffersQCOM((uint*)&renderbuffers, 1, __dsl_numRenderbuffers);
-            return renderbuffers;
+            uint shaders = default;
+            ((IGL)this).ExtGetShadersQCOM((uint*)&shaders, 1, __dsl_numShaders);
+            return shaders;
         }
     }
 
-    [NativeName("glExtGetRenderbuffersQCOM")]
-    [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
-    [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
-    [NativeFunction("opengl", EntryPoint = "glExtGetRenderbuffersQCOM")]
+    [NativeName("glExtGetShadersQCOM")]
+    [SupportedApiProfile("gles2", ["GL_QCOM_extended_get2"])]
+    [SupportedApiProfile("gles1", ["GL_QCOM_extended_get2"])]
+    [NativeFunction("opengl", EntryPoint = "glExtGetShadersQCOM")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint ExtGetRenderbuffersQCOM(Ref<int> numRenderbuffers) =>
-        ThisThread.ExtGetRenderbuffersQCOM(numRenderbuffers);
+    public static uint ExtGetShaderQCOM(Ref<int> numShaders) =>
+        ThisThread.ExtGetShaderQCOM(numShaders);
 
     [NativeName("glExtGetShadersQCOM")]
     [SupportedApiProfile("gles2", ["GL_QCOM_extended_get2"])]
@@ -455874,29 +455863,6 @@ void IGL.ExtGetShadersQCOM(Ref<uint> shaders, int maxShaders, Ref<int> numShader
     public static void ExtGetShadersQCOM(Ref<uint> shaders, int maxShaders, Ref<int> numShaders) =>
         ThisThread.ExtGetShadersQCOM(shaders, maxShaders, numShaders);
 
-    [NativeName("glExtGetShadersQCOM")]
-    [SupportedApiProfile("gles2", ["GL_QCOM_extended_get2"])]
-    [SupportedApiProfile("gles1", ["GL_QCOM_extended_get2"])]
-    [NativeFunction("opengl", EntryPoint = "glExtGetShadersQCOM")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.ExtGetShadersQCOM(Ref<int> numShaders)
-    {
-        fixed (int* __dsl_numShaders = numShaders)
-        {
-            uint shaders = default;
-            ((IGL)this).ExtGetShadersQCOM((uint*)&shaders, 1, __dsl_numShaders);
-            return shaders;
-        }
-    }
-
-    [NativeName("glExtGetShadersQCOM")]
-    [SupportedApiProfile("gles2", ["GL_QCOM_extended_get2"])]
-    [SupportedApiProfile("gles1", ["GL_QCOM_extended_get2"])]
-    [NativeFunction("opengl", EntryPoint = "glExtGetShadersQCOM")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint ExtGetShadersQCOM(Ref<int> numShaders) =>
-        ThisThread.ExtGetShadersQCOM(numShaders);
-
     [NativeName("glExtGetTexLevelParameterivQCOM")]
     [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
     [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
@@ -459876,6 +459842,38 @@ public static void FramebufferDrawBufferEXT(
         Constant<uint, GLEnum, DrawBufferMode> mode
     ) => ThisThread.FramebufferDrawBufferEXT(framebuffer, mode);
 
+    [NativeName("glFramebufferDrawBuffersEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
+    [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
+    [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.FramebufferDrawBufferEXT(uint framebuffer, GLEnum bufs) =>
+        ((IGL)this).FramebufferDrawBuffersEXT(framebuffer, 1, (uint*)(GLEnum*)&bufs);
+
+    [NativeName("glFramebufferDrawBuffersEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
+    [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
+    [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void FramebufferDrawBufferEXT(uint framebuffer, GLEnum bufs) =>
+        ThisThread.FramebufferDrawBufferEXT(framebuffer, bufs);
+
+    [NativeName("glFramebufferDrawBuffersEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
+    [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
+    [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.FramebufferDrawBufferEXT(uint framebuffer, DrawBufferMode bufs) =>
+        ((IGL)this).FramebufferDrawBuffersEXT(framebuffer, 1, (uint*)(DrawBufferMode*)&bufs);
+
+    [NativeName("glFramebufferDrawBuffersEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
+    [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
+    [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void FramebufferDrawBufferEXT(uint framebuffer, DrawBufferMode bufs) =>
+        ThisThread.FramebufferDrawBufferEXT(framebuffer, bufs);
+
     [NativeName("glFramebufferDrawBuffersEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
     [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
@@ -459922,22 +459920,6 @@ void IGL.FramebufferDrawBuffersEXT(uint framebuffer, uint n, Ref<uint> bufs)
     public static void FramebufferDrawBuffersEXT(uint framebuffer, uint n, Ref<uint> bufs) =>
         ThisThread.FramebufferDrawBuffersEXT(framebuffer, n, bufs);
 
-    [NativeName("glFramebufferDrawBuffersEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
-    [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
-    [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.FramebufferDrawBuffersEXT(uint framebuffer, uint bufs) =>
-        ((IGL)this).FramebufferDrawBuffersEXT(framebuffer, 1, (uint*)&bufs);
-
-    [NativeName("glFramebufferDrawBuffersEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
-    [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
-    [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void FramebufferDrawBuffersEXT(uint framebuffer, uint bufs) =>
-        ThisThread.FramebufferDrawBuffersEXT(framebuffer, bufs);
-
     [NativeName("glFramebufferDrawBuffersEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
     [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
@@ -459959,22 +459941,6 @@ void IGL.FramebufferDrawBuffersEXT(uint framebuffer, uint n, Ref<GLEnum> bufs)
     public static void FramebufferDrawBuffersEXT(uint framebuffer, uint n, Ref<GLEnum> bufs) =>
         ThisThread.FramebufferDrawBuffersEXT(framebuffer, n, bufs);
 
-    [NativeName("glFramebufferDrawBuffersEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
-    [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
-    [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.FramebufferDrawBuffersEXT(uint framebuffer, GLEnum bufs) =>
-        ((IGL)this).FramebufferDrawBuffersEXT(framebuffer, 1, (uint*)(GLEnum*)&bufs);
-
-    [NativeName("glFramebufferDrawBuffersEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
-    [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
-    [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void FramebufferDrawBuffersEXT(uint framebuffer, GLEnum bufs) =>
-        ThisThread.FramebufferDrawBuffersEXT(framebuffer, bufs);
-
     [NativeName("glFramebufferDrawBuffersEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
     [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
@@ -459999,22 +459965,6 @@ public static void FramebufferDrawBuffersEXT(
         Ref<DrawBufferMode> bufs
     ) => ThisThread.FramebufferDrawBuffersEXT(framebuffer, n, bufs);
 
-    [NativeName("glFramebufferDrawBuffersEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
-    [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
-    [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.FramebufferDrawBuffersEXT(uint framebuffer, DrawBufferMode bufs) =>
-        ((IGL)this).FramebufferDrawBuffersEXT(framebuffer, 1, (uint*)(DrawBufferMode*)&bufs);
-
-    [NativeName("glFramebufferDrawBuffersEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
-    [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
-    [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void FramebufferDrawBuffersEXT(uint framebuffer, DrawBufferMode bufs) =>
-        ThisThread.FramebufferDrawBuffersEXT(framebuffer, bufs);
-
     [NativeName("glFramebufferFetchBarrierEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_shader_framebuffer_fetch_non_coherent"])]
     [SupportedApiProfile("glcore", ["GL_EXT_shader_framebuffer_fetch_non_coherent"])]
@@ -463993,6 +463943,23 @@ uint IGL.GenBuffer()
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static uint GenBuffer() => ThisThread.GenBuffer();
 
+    [NativeName("glGenBuffersARB")]
+    [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glGenBuffersARB")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IGL.GenBufferARB()
+    {
+        uint buffers = default;
+        ((IGL)this).GenBuffersARB(1, (uint*)&buffers);
+        return buffers;
+    }
+
+    [NativeName("glGenBuffersARB")]
+    [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glGenBuffersARB")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint GenBufferARB() => ThisThread.GenBufferARB();
+
     [NativeName("glGenBuffers")]
     [SupportedApiProfile(
         "gl",
@@ -464248,23 +464215,6 @@ void IGL.GenBuffersARB(uint n, Ref<uint> buffers)
     public static void GenBuffersARB(uint n, Ref<uint> buffers) =>
         ThisThread.GenBuffersARB(n, buffers);
 
-    [NativeName("glGenBuffersARB")]
-    [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glGenBuffersARB")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.GenBuffersARB()
-    {
-        uint buffers = default;
-        ((IGL)this).GenBuffersARB(1, (uint*)&buffers);
-        return buffers;
-    }
-
-    [NativeName("glGenBuffersARB")]
-    [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glGenBuffersARB")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint GenBuffersARB() => ThisThread.GenBuffersARB();
-
     [NativeName("glGenerateMipmap")]
     [SupportedApiProfile(
         "gl",
@@ -464650,6 +464600,44 @@ public static void GenerateTextureMipmapEXT(
         Constant<uint, GLEnum, TextureTarget> target
     ) => ThisThread.GenerateTextureMipmapEXT(texture, target);
 
+    [NativeName("glGenFencesAPPLE")]
+    [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
+    [NativeFunction("opengl", EntryPoint = "glGenFencesAPPLE")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IGL.GenFenceAPPLE()
+    {
+        uint fences = default;
+        ((IGL)this).GenFencesAPPLE(1, (uint*)&fences);
+        return fences;
+    }
+
+    [NativeName("glGenFencesAPPLE")]
+    [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
+    [NativeFunction("opengl", EntryPoint = "glGenFencesAPPLE")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint GenFenceAPPLE() => ThisThread.GenFenceAPPLE();
+
+    [NativeName("glGenFencesNV")]
+    [SupportedApiProfile("gl", ["GL_NV_fence"])]
+    [SupportedApiProfile("gles2", ["GL_NV_fence"])]
+    [SupportedApiProfile("gles1", ["GL_NV_fence"])]
+    [NativeFunction("opengl", EntryPoint = "glGenFencesNV")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IGL.GenFenceNV()
+    {
+        uint fences = default;
+        ((IGL)this).GenFencesNV(1, (uint*)&fences);
+        return fences;
+    }
+
+    [NativeName("glGenFencesNV")]
+    [SupportedApiProfile("gl", ["GL_NV_fence"])]
+    [SupportedApiProfile("gles2", ["GL_NV_fence"])]
+    [SupportedApiProfile("gles1", ["GL_NV_fence"])]
+    [NativeFunction("opengl", EntryPoint = "glGenFencesNV")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint GenFenceNV() => ThisThread.GenFenceNV();
+
     [NativeName("glGenFencesAPPLE")]
     [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
     [NativeFunction("opengl", EntryPoint = "glGenFencesAPPLE")]
@@ -464688,23 +464676,6 @@ void IGL.GenFencesAPPLE(uint n, Ref<uint> fences)
     public static void GenFencesAPPLE(uint n, Ref<uint> fences) =>
         ThisThread.GenFencesAPPLE(n, fences);
 
-    [NativeName("glGenFencesAPPLE")]
-    [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
-    [NativeFunction("opengl", EntryPoint = "glGenFencesAPPLE")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.GenFencesAPPLE()
-    {
-        uint fences = default;
-        ((IGL)this).GenFencesAPPLE(1, (uint*)&fences);
-        return fences;
-    }
-
-    [NativeName("glGenFencesAPPLE")]
-    [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
-    [NativeFunction("opengl", EntryPoint = "glGenFencesAPPLE")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint GenFencesAPPLE() => ThisThread.GenFencesAPPLE();
-
     [NativeName("glGenFencesNV")]
     [SupportedApiProfile("gl", ["GL_NV_fence"])]
     [SupportedApiProfile("gles2", ["GL_NV_fence"])]
@@ -464750,27 +464721,6 @@ void IGL.GenFencesNV(uint n, Ref<uint> fences)
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static void GenFencesNV(uint n, Ref<uint> fences) => ThisThread.GenFencesNV(n, fences);
 
-    [NativeName("glGenFencesNV")]
-    [SupportedApiProfile("gl", ["GL_NV_fence"])]
-    [SupportedApiProfile("gles2", ["GL_NV_fence"])]
-    [SupportedApiProfile("gles1", ["GL_NV_fence"])]
-    [NativeFunction("opengl", EntryPoint = "glGenFencesNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.GenFencesNV()
-    {
-        uint fences = default;
-        ((IGL)this).GenFencesNV(1, (uint*)&fences);
-        return fences;
-    }
-
-    [NativeName("glGenFencesNV")]
-    [SupportedApiProfile("gl", ["GL_NV_fence"])]
-    [SupportedApiProfile("gles2", ["GL_NV_fence"])]
-    [SupportedApiProfile("gles1", ["GL_NV_fence"])]
-    [NativeFunction("opengl", EntryPoint = "glGenFencesNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint GenFencesNV() => ThisThread.GenFencesNV();
-
     [NativeName("glGenFragmentShadersATI")]
     [SupportedApiProfile("gl", ["GL_ATI_fragment_shader"])]
     [NativeFunction("opengl", EntryPoint = "glGenFragmentShadersATI")]
@@ -464887,6 +464837,40 @@ uint IGL.GenFramebuffer()
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static uint GenFramebuffer() => ThisThread.GenFramebuffer();
 
+    [NativeName("glGenFramebuffersEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glGenFramebuffersEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IGL.GenFramebufferEXT()
+    {
+        uint framebuffers = default;
+        ((IGL)this).GenFramebuffersEXT(1, (uint*)&framebuffers);
+        return framebuffers;
+    }
+
+    [NativeName("glGenFramebuffersEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glGenFramebuffersEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint GenFramebufferEXT() => ThisThread.GenFramebufferEXT();
+
+    [NativeName("glGenFramebuffersOES")]
+    [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IGL.GenFramebufferOES()
+    {
+        uint framebuffers = default;
+        ((IGL)this).GenFramebuffersOES(1, (uint*)&framebuffers);
+        return framebuffers;
+    }
+
+    [NativeName("glGenFramebuffersOES")]
+    [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint GenFramebufferOES() => ThisThread.GenFramebufferOES();
+
     [NativeName("glGenFramebuffers")]
     [SupportedApiProfile(
         "gl",
@@ -465125,23 +465109,6 @@ void IGL.GenFramebuffersEXT(uint n, Ref<uint> framebuffers)
     public static void GenFramebuffersEXT(uint n, Ref<uint> framebuffers) =>
         ThisThread.GenFramebuffersEXT(n, framebuffers);
 
-    [NativeName("glGenFramebuffersEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glGenFramebuffersEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.GenFramebuffersEXT()
-    {
-        uint framebuffers = default;
-        ((IGL)this).GenFramebuffersEXT(1, (uint*)&framebuffers);
-        return framebuffers;
-    }
-
-    [NativeName("glGenFramebuffersEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glGenFramebuffersEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint GenFramebuffersEXT() => ThisThread.GenFramebuffersEXT();
-
     [NativeName("glGenFramebuffersOES")]
     [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
     [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")]
@@ -465181,23 +465148,6 @@ void IGL.GenFramebuffersOES(uint n, Ref<uint> framebuffers)
     public static void GenFramebuffersOES(uint n, Ref<uint> framebuffers) =>
         ThisThread.GenFramebuffersOES(n, framebuffers);
 
-    [NativeName("glGenFramebuffersOES")]
-    [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.GenFramebuffersOES()
-    {
-        uint framebuffers = default;
-        ((IGL)this).GenFramebuffersOES(1, (uint*)&framebuffers);
-        return framebuffers;
-    }
-
-    [NativeName("glGenFramebuffersOES")]
-    [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint GenFramebuffersOES() => ThisThread.GenFramebuffersOES();
-
     [NativeName("glGenLists")]
     [SupportedApiProfile(
         "gl",
@@ -465265,6 +465215,23 @@ _slots[819] is not null and var loadedFnPtr
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static uint GenLists(uint range) => ThisThread.GenLists(range);
 
+    [NativeName("glGenNamesAMD")]
+    [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
+    [NativeFunction("opengl", EntryPoint = "glGenNamesAMD")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IGL.GenNameAMD(uint identifier)
+    {
+        uint names = default;
+        ((IGL)this).GenNamesAMD(identifier, 1, (uint*)&names);
+        return names;
+    }
+
+    [NativeName("glGenNamesAMD")]
+    [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
+    [NativeFunction("opengl", EntryPoint = "glGenNamesAMD")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint GenNameAMD(uint identifier) => ThisThread.GenNameAMD(identifier);
+
     [NativeName("glGenNamesAMD")]
     [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
     [NativeFunction("opengl", EntryPoint = "glGenNamesAMD")]
@@ -465304,23 +465271,6 @@ void IGL.GenNamesAMD(uint identifier, uint num, Ref<uint> names)
     public static void GenNamesAMD(uint identifier, uint num, Ref<uint> names) =>
         ThisThread.GenNamesAMD(identifier, num, names);
 
-    [NativeName("glGenNamesAMD")]
-    [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
-    [NativeFunction("opengl", EntryPoint = "glGenNamesAMD")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.GenNamesAMD(uint identifier)
-    {
-        uint names = default;
-        ((IGL)this).GenNamesAMD(identifier, 1, (uint*)&names);
-        return names;
-    }
-
-    [NativeName("glGenNamesAMD")]
-    [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
-    [NativeFunction("opengl", EntryPoint = "glGenNamesAMD")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint GenNamesAMD(uint identifier) => ThisThread.GenNamesAMD(identifier);
-
     [NativeName("glGenOcclusionQueriesNV")]
     [SupportedApiProfile("gl", ["GL_NV_occlusion_query"])]
     [NativeFunction("opengl", EntryPoint = "glGenOcclusionQueriesNV")]
@@ -465364,7 +465314,7 @@ public static void GenOcclusionQueriesNV(uint n, Ref<uint> ids) =>
     [SupportedApiProfile("gl", ["GL_NV_occlusion_query"])]
     [NativeFunction("opengl", EntryPoint = "glGenOcclusionQueriesNV")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.GenOcclusionQueriesNV()
+    uint IGL.GenOcclusionQueryNV()
     {
         uint ids = default;
         ((IGL)this).GenOcclusionQueriesNV(1, (uint*)&ids);
@@ -465375,7 +465325,7 @@ uint IGL.GenOcclusionQueriesNV()
     [SupportedApiProfile("gl", ["GL_NV_occlusion_query"])]
     [NativeFunction("opengl", EntryPoint = "glGenOcclusionQueriesNV")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint GenOcclusionQueriesNV() => ThisThread.GenOcclusionQueriesNV();
+    public static uint GenOcclusionQueryNV() => ThisThread.GenOcclusionQueryNV();
 
     [NativeName("glGenPathsNV")]
     [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
@@ -465400,6 +465350,27 @@ _slots[822] is not null and var loadedFnPtr
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static uint GenPathNV(uint range) => ThisThread.GenPathNV(range);
 
+    [NativeName("glGenPerfMonitorsAMD")]
+    [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
+    [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
+    [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
+    [NativeFunction("opengl", EntryPoint = "glGenPerfMonitorsAMD")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IGL.GenPerfMonitorAMD()
+    {
+        uint monitors = default;
+        ((IGL)this).GenPerfMonitorsAMD(1, (uint*)&monitors);
+        return monitors;
+    }
+
+    [NativeName("glGenPerfMonitorsAMD")]
+    [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
+    [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
+    [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
+    [NativeFunction("opengl", EntryPoint = "glGenPerfMonitorsAMD")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint GenPerfMonitorAMD() => ThisThread.GenPerfMonitorAMD();
+
     [NativeName("glGenPerfMonitorsAMD")]
     [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
     [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
@@ -465447,27 +465418,6 @@ void IGL.GenPerfMonitorsAMD(uint n, Ref<uint> monitors)
     public static void GenPerfMonitorsAMD(uint n, Ref<uint> monitors) =>
         ThisThread.GenPerfMonitorsAMD(n, monitors);
 
-    [NativeName("glGenPerfMonitorsAMD")]
-    [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
-    [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
-    [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
-    [NativeFunction("opengl", EntryPoint = "glGenPerfMonitorsAMD")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.GenPerfMonitorsAMD()
-    {
-        uint monitors = default;
-        ((IGL)this).GenPerfMonitorsAMD(1, (uint*)&monitors);
-        return monitors;
-    }
-
-    [NativeName("glGenPerfMonitorsAMD")]
-    [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
-    [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
-    [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
-    [NativeFunction("opengl", EntryPoint = "glGenPerfMonitorsAMD")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint GenPerfMonitorsAMD() => ThisThread.GenPerfMonitorsAMD();
-
     [NativeName("glGenProgramPipelines")]
     [SupportedApiProfile(
         "gl",
@@ -465535,6 +465485,23 @@ uint IGL.GenProgramPipeline()
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static uint GenProgramPipeline() => ThisThread.GenProgramPipeline();
 
+    [NativeName("glGenProgramPipelinesEXT")]
+    [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])]
+    [NativeFunction("opengl", EntryPoint = "glGenProgramPipelinesEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IGL.GenProgramPipelineEXT()
+    {
+        uint pipelines = default;
+        ((IGL)this).GenProgramPipelinesEXT(1, (uint*)&pipelines);
+        return pipelines;
+    }
+
+    [NativeName("glGenProgramPipelinesEXT")]
+    [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])]
+    [NativeFunction("opengl", EntryPoint = "glGenProgramPipelinesEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint GenProgramPipelineEXT() => ThisThread.GenProgramPipelineEXT();
+
     [NativeName("glGenProgramPipelines")]
     [SupportedApiProfile(
         "gl",
@@ -465713,23 +465680,6 @@ void IGL.GenProgramPipelinesEXT(uint n, Ref<uint> pipelines)
     public static void GenProgramPipelinesEXT(uint n, Ref<uint> pipelines) =>
         ThisThread.GenProgramPipelinesEXT(n, pipelines);
 
-    [NativeName("glGenProgramPipelinesEXT")]
-    [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])]
-    [NativeFunction("opengl", EntryPoint = "glGenProgramPipelinesEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.GenProgramPipelinesEXT()
-    {
-        uint pipelines = default;
-        ((IGL)this).GenProgramPipelinesEXT(1, (uint*)&pipelines);
-        return pipelines;
-    }
-
-    [NativeName("glGenProgramPipelinesEXT")]
-    [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])]
-    [NativeFunction("opengl", EntryPoint = "glGenProgramPipelinesEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint GenProgramPipelinesEXT() => ThisThread.GenProgramPipelinesEXT();
-
     [NativeName("glGenProgramsARB")]
     [SupportedApiProfile("gl", ["GL_ARB_fragment_program", "GL_ARB_vertex_program"])]
     [NativeFunction("opengl", EntryPoint = "glGenProgramsARB")]
@@ -466071,23 +466021,6 @@ void IGL.GenQueriesARB(uint n, Ref<uint> ids)
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static void GenQueriesARB(uint n, Ref<uint> ids) => ThisThread.GenQueriesARB(n, ids);
 
-    [NativeName("glGenQueriesARB")]
-    [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
-    [NativeFunction("opengl", EntryPoint = "glGenQueriesARB")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.GenQueriesARB()
-    {
-        uint ids = default;
-        ((IGL)this).GenQueriesARB(1, (uint*)&ids);
-        return ids;
-    }
-
-    [NativeName("glGenQueriesARB")]
-    [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
-    [NativeFunction("opengl", EntryPoint = "glGenQueriesARB")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint GenQueriesARB() => ThisThread.GenQueriesARB();
-
     [NativeName("glGenQueriesEXT")]
     [SupportedApiProfile(
         "gles2",
@@ -466137,29 +466070,6 @@ void IGL.GenQueriesEXT(uint n, Ref<uint> ids)
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static void GenQueriesEXT(uint n, Ref<uint> ids) => ThisThread.GenQueriesEXT(n, ids);
 
-    [NativeName("glGenQueriesEXT")]
-    [SupportedApiProfile(
-        "gles2",
-        ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
-    )]
-    [NativeFunction("opengl", EntryPoint = "glGenQueriesEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.GenQueriesEXT()
-    {
-        uint ids = default;
-        ((IGL)this).GenQueriesEXT(1, (uint*)&ids);
-        return ids;
-    }
-
-    [NativeName("glGenQueriesEXT")]
-    [SupportedApiProfile(
-        "gles2",
-        ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
-    )]
-    [NativeFunction("opengl", EntryPoint = "glGenQueriesEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint GenQueriesEXT() => ThisThread.GenQueriesEXT();
-
     [NativeName("glGenQueries")]
     [SupportedApiProfile(
         "gl",
@@ -466255,6 +466165,46 @@ uint IGL.GenQuery()
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static uint GenQuery() => ThisThread.GenQuery();
 
+    [NativeName("glGenQueriesARB")]
+    [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
+    [NativeFunction("opengl", EntryPoint = "glGenQueriesARB")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IGL.GenQueryARB()
+    {
+        uint ids = default;
+        ((IGL)this).GenQueriesARB(1, (uint*)&ids);
+        return ids;
+    }
+
+    [NativeName("glGenQueriesARB")]
+    [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
+    [NativeFunction("opengl", EntryPoint = "glGenQueriesARB")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint GenQueryARB() => ThisThread.GenQueryARB();
+
+    [NativeName("glGenQueriesEXT")]
+    [SupportedApiProfile(
+        "gles2",
+        ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
+    )]
+    [NativeFunction("opengl", EntryPoint = "glGenQueriesEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IGL.GenQueryEXT()
+    {
+        uint ids = default;
+        ((IGL)this).GenQueriesEXT(1, (uint*)&ids);
+        return ids;
+    }
+
+    [NativeName("glGenQueriesEXT")]
+    [SupportedApiProfile(
+        "gles2",
+        ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
+    )]
+    [NativeFunction("opengl", EntryPoint = "glGenQueriesEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint GenQueryEXT() => ThisThread.GenQueryEXT();
+
     [NativeName("glGenQueryResourceTagNV")]
     [SupportedApiProfile("gl", ["GL_NV_query_resource_tag"])]
     [NativeFunction("opengl", EntryPoint = "glGenQueryResourceTagNV")]
@@ -466408,6 +466358,40 @@ uint IGL.GenRenderbuffer()
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static uint GenRenderbuffer() => ThisThread.GenRenderbuffer();
 
+    [NativeName("glGenRenderbuffersEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IGL.GenRenderbufferEXT()
+    {
+        uint renderbuffers = default;
+        ((IGL)this).GenRenderbuffersEXT(1, (uint*)&renderbuffers);
+        return renderbuffers;
+    }
+
+    [NativeName("glGenRenderbuffersEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint GenRenderbufferEXT() => ThisThread.GenRenderbufferEXT();
+
+    [NativeName("glGenRenderbuffersOES")]
+    [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IGL.GenRenderbufferOES()
+    {
+        uint renderbuffers = default;
+        ((IGL)this).GenRenderbuffersOES(1, (uint*)&renderbuffers);
+        return renderbuffers;
+    }
+
+    [NativeName("glGenRenderbuffersOES")]
+    [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint GenRenderbufferOES() => ThisThread.GenRenderbufferOES();
+
     [NativeName("glGenRenderbuffers")]
     [SupportedApiProfile(
         "gl",
@@ -466646,23 +466630,6 @@ void IGL.GenRenderbuffersEXT(uint n, Ref<uint> renderbuffers)
     public static void GenRenderbuffersEXT(uint n, Ref<uint> renderbuffers) =>
         ThisThread.GenRenderbuffersEXT(n, renderbuffers);
 
-    [NativeName("glGenRenderbuffersEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.GenRenderbuffersEXT()
-    {
-        uint renderbuffers = default;
-        ((IGL)this).GenRenderbuffersEXT(1, (uint*)&renderbuffers);
-        return renderbuffers;
-    }
-
-    [NativeName("glGenRenderbuffersEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint GenRenderbuffersEXT() => ThisThread.GenRenderbuffersEXT();
-
     [NativeName("glGenRenderbuffersOES")]
     [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
     [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")]
@@ -466702,23 +466669,6 @@ void IGL.GenRenderbuffersOES(uint n, Ref<uint> renderbuffers)
     public static void GenRenderbuffersOES(uint n, Ref<uint> renderbuffers) =>
         ThisThread.GenRenderbuffersOES(n, renderbuffers);
 
-    [NativeName("glGenRenderbuffersOES")]
-    [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.GenRenderbuffersOES()
-    {
-        uint renderbuffers = default;
-        ((IGL)this).GenRenderbuffersOES(1, (uint*)&renderbuffers);
-        return renderbuffers;
-    }
-
-    [NativeName("glGenRenderbuffersOES")]
-    [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint GenRenderbuffersOES() => ThisThread.GenRenderbuffersOES();
-
     [NativeName("glGenSamplers")]
     [SupportedApiProfile(
         "gl",
@@ -466979,6 +466929,25 @@ void IGL.GenSamplers(uint count, Ref<uint> samplers)
     public static void GenSamplers(uint count, Ref<uint> samplers) =>
         ThisThread.GenSamplers(count, samplers);
 
+    [NativeName("glGenSemaphoresEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
+    [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])]
+    [NativeFunction("opengl", EntryPoint = "glGenSemaphoresEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IGL.GenSemaphoreEXT()
+    {
+        uint semaphores = default;
+        ((IGL)this).GenSemaphoresEXT(1, (uint*)&semaphores);
+        return semaphores;
+    }
+
+    [NativeName("glGenSemaphoresEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
+    [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])]
+    [NativeFunction("opengl", EntryPoint = "glGenSemaphoresEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint GenSemaphoreEXT() => ThisThread.GenSemaphoreEXT();
+
     [NativeName("glGenSemaphoresEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
     [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])]
@@ -467022,25 +466991,6 @@ void IGL.GenSemaphoresEXT(uint n, Ref<uint> semaphores)
     public static void GenSemaphoresEXT(uint n, Ref<uint> semaphores) =>
         ThisThread.GenSemaphoresEXT(n, semaphores);
 
-    [NativeName("glGenSemaphoresEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
-    [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])]
-    [NativeFunction("opengl", EntryPoint = "glGenSemaphoresEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.GenSemaphoresEXT()
-    {
-        uint semaphores = default;
-        ((IGL)this).GenSemaphoresEXT(1, (uint*)&semaphores);
-        return semaphores;
-    }
-
-    [NativeName("glGenSemaphoresEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
-    [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])]
-    [NativeFunction("opengl", EntryPoint = "glGenSemaphoresEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint GenSemaphoresEXT() => ThisThread.GenSemaphoresEXT();
-
     [NativeName("glGenSymbolsEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])]
     [NativeFunction("opengl", EntryPoint = "glGenSymbolsEXT")]
@@ -467206,6 +467156,23 @@ uint IGL.GenTexture()
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static uint GenTexture() => ThisThread.GenTexture();
 
+    [NativeName("glGenTexturesEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_texture_object"])]
+    [NativeFunction("opengl", EntryPoint = "glGenTexturesEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IGL.GenTextureEXT()
+    {
+        uint textures = default;
+        ((IGL)this).GenTexturesEXT(1, (uint*)&textures);
+        return textures;
+    }
+
+    [NativeName("glGenTexturesEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_texture_object"])]
+    [NativeFunction("opengl", EntryPoint = "glGenTexturesEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint GenTextureEXT() => ThisThread.GenTextureEXT();
+
     [NativeName("glGenTextures")]
     [SupportedApiProfile(
         "gl",
@@ -467495,23 +467462,44 @@ void IGL.GenTexturesEXT(uint n, Ref<uint> textures)
     public static void GenTexturesEXT(uint n, Ref<uint> textures) =>
         ThisThread.GenTexturesEXT(n, textures);
 
-    [NativeName("glGenTexturesEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_texture_object"])]
-    [NativeFunction("opengl", EntryPoint = "glGenTexturesEXT")]
+    [NativeName("glGenTransformFeedbacks")]
+    [SupportedApiProfile(
+        "gl",
+        [
+            "GL_ARB_transform_feedback2",
+            "GL_VERSION_4_0",
+            "GL_VERSION_4_1",
+            "GL_VERSION_4_2",
+            "GL_VERSION_4_3",
+            "GL_VERSION_4_4",
+            "GL_VERSION_4_5",
+            "GL_VERSION_4_6",
+        ],
+        MinVersion = "4.0"
+    )]
+    [SupportedApiProfile(
+        "glcore",
+        [
+            "GL_ARB_transform_feedback2",
+            "GL_VERSION_4_0",
+            "GL_VERSION_4_1",
+            "GL_VERSION_4_2",
+            "GL_VERSION_4_3",
+            "GL_VERSION_4_4",
+            "GL_VERSION_4_5",
+            "GL_VERSION_4_6",
+        ],
+        MinVersion = "4.0"
+    )]
+    [NativeFunction("opengl", EntryPoint = "glGenTransformFeedbacks")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.GenTexturesEXT()
+    uint IGL.GenTransformFeedback()
     {
-        uint textures = default;
-        ((IGL)this).GenTexturesEXT(1, (uint*)&textures);
-        return textures;
+        uint ids = default;
+        ((IGL)this).GenTransformFeedbacks(1, (uint*)&ids);
+        return ids;
     }
 
-    [NativeName("glGenTexturesEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_texture_object"])]
-    [NativeFunction("opengl", EntryPoint = "glGenTexturesEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint GenTexturesEXT() => ThisThread.GenTexturesEXT();
-
     [NativeName("glGenTransformFeedbacks")]
     [SupportedApiProfile(
         "gl",
@@ -467543,45 +467531,24 @@ uint IGL.GenTexturesEXT()
     )]
     [NativeFunction("opengl", EntryPoint = "glGenTransformFeedbacks")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.GenTransformFeedback()
+    public static uint GenTransformFeedback() => ThisThread.GenTransformFeedback();
+
+    [NativeName("glGenTransformFeedbacksNV")]
+    [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])]
+    [NativeFunction("opengl", EntryPoint = "glGenTransformFeedbacksNV")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IGL.GenTransformFeedbackNV()
     {
         uint ids = default;
-        ((IGL)this).GenTransformFeedbacks(1, (uint*)&ids);
+        ((IGL)this).GenTransformFeedbacksNV(1, (uint*)&ids);
         return ids;
     }
 
-    [NativeName("glGenTransformFeedbacks")]
-    [SupportedApiProfile(
-        "gl",
-        [
-            "GL_ARB_transform_feedback2",
-            "GL_VERSION_4_0",
-            "GL_VERSION_4_1",
-            "GL_VERSION_4_2",
-            "GL_VERSION_4_3",
-            "GL_VERSION_4_4",
-            "GL_VERSION_4_5",
-            "GL_VERSION_4_6",
-        ],
-        MinVersion = "4.0"
-    )]
-    [SupportedApiProfile(
-        "glcore",
-        [
-            "GL_ARB_transform_feedback2",
-            "GL_VERSION_4_0",
-            "GL_VERSION_4_1",
-            "GL_VERSION_4_2",
-            "GL_VERSION_4_3",
-            "GL_VERSION_4_4",
-            "GL_VERSION_4_5",
-            "GL_VERSION_4_6",
-        ],
-        MinVersion = "4.0"
-    )]
-    [NativeFunction("opengl", EntryPoint = "glGenTransformFeedbacks")]
+    [NativeName("glGenTransformFeedbacksNV")]
+    [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])]
+    [NativeFunction("opengl", EntryPoint = "glGenTransformFeedbacksNV")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint GenTransformFeedback() => ThisThread.GenTransformFeedback();
+    public static uint GenTransformFeedbackNV() => ThisThread.GenTransformFeedbackNV();
 
     [NativeName("glGenTransformFeedbacks")]
     [SupportedApiProfile(
@@ -467772,23 +467739,6 @@ void IGL.GenTransformFeedbacksNV(uint n, Ref<uint> ids)
     public static void GenTransformFeedbacksNV(uint n, Ref<uint> ids) =>
         ThisThread.GenTransformFeedbacksNV(n, ids);
 
-    [NativeName("glGenTransformFeedbacksNV")]
-    [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])]
-    [NativeFunction("opengl", EntryPoint = "glGenTransformFeedbacksNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.GenTransformFeedbacksNV()
-    {
-        uint ids = default;
-        ((IGL)this).GenTransformFeedbacksNV(1, (uint*)&ids);
-        return ids;
-    }
-
-    [NativeName("glGenTransformFeedbacksNV")]
-    [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])]
-    [NativeFunction("opengl", EntryPoint = "glGenTransformFeedbacksNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint GenTransformFeedbacksNV() => ThisThread.GenTransformFeedbacksNV();
-
     [NativeName("glGenVertexArrays")]
     [SupportedApiProfile(
         "gl",
@@ -467876,6 +467826,42 @@ uint IGL.GenVertexArray()
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static uint GenVertexArray() => ThisThread.GenVertexArray();
 
+    [NativeName("glGenVertexArraysAPPLE")]
+    [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])]
+    [NativeFunction("opengl", EntryPoint = "glGenVertexArraysAPPLE")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IGL.GenVertexArrayAPPLE()
+    {
+        uint arrays = default;
+        ((IGL)this).GenVertexArraysAPPLE(1, (uint*)&arrays);
+        return arrays;
+    }
+
+    [NativeName("glGenVertexArraysAPPLE")]
+    [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])]
+    [NativeFunction("opengl", EntryPoint = "glGenVertexArraysAPPLE")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint GenVertexArrayAPPLE() => ThisThread.GenVertexArrayAPPLE();
+
+    [NativeName("glGenVertexArraysOES")]
+    [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
+    [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
+    [NativeFunction("opengl", EntryPoint = "glGenVertexArraysOES")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IGL.GenVertexArrayOES()
+    {
+        uint arrays = default;
+        ((IGL)this).GenVertexArraysOES(1, (uint*)&arrays);
+        return arrays;
+    }
+
+    [NativeName("glGenVertexArraysOES")]
+    [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
+    [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
+    [NativeFunction("opengl", EntryPoint = "glGenVertexArraysOES")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint GenVertexArrayOES() => ThisThread.GenVertexArrayOES();
+
     [NativeName("glGenVertexArrays")]
     [SupportedApiProfile(
         "gl",
@@ -468094,23 +468080,6 @@ void IGL.GenVertexArraysAPPLE(uint n, Ref<uint> arrays)
     public static void GenVertexArraysAPPLE(uint n, Ref<uint> arrays) =>
         ThisThread.GenVertexArraysAPPLE(n, arrays);
 
-    [NativeName("glGenVertexArraysAPPLE")]
-    [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])]
-    [NativeFunction("opengl", EntryPoint = "glGenVertexArraysAPPLE")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.GenVertexArraysAPPLE()
-    {
-        uint arrays = default;
-        ((IGL)this).GenVertexArraysAPPLE(1, (uint*)&arrays);
-        return arrays;
-    }
-
-    [NativeName("glGenVertexArraysAPPLE")]
-    [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])]
-    [NativeFunction("opengl", EntryPoint = "glGenVertexArraysAPPLE")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint GenVertexArraysAPPLE() => ThisThread.GenVertexArraysAPPLE();
-
     [NativeName("glGenVertexArraysOES")]
     [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
     [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
@@ -468154,25 +468123,6 @@ void IGL.GenVertexArraysOES(uint n, Ref<uint> arrays)
     public static void GenVertexArraysOES(uint n, Ref<uint> arrays) =>
         ThisThread.GenVertexArraysOES(n, arrays);
 
-    [NativeName("glGenVertexArraysOES")]
-    [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
-    [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
-    [NativeFunction("opengl", EntryPoint = "glGenVertexArraysOES")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.GenVertexArraysOES()
-    {
-        uint arrays = default;
-        ((IGL)this).GenVertexArraysOES(1, (uint*)&arrays);
-        return arrays;
-    }
-
-    [NativeName("glGenVertexArraysOES")]
-    [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
-    [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
-    [NativeFunction("opengl", EntryPoint = "glGenVertexArraysOES")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint GenVertexArraysOES() => ThisThread.GenVertexArraysOES();
-
     [NativeName("glGenVertexShadersEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])]
     [NativeFunction("opengl", EntryPoint = "glGenVertexShadersEXT")]
@@ -472805,6 +472755,27 @@ public static int GetArrayObjectivATI(
         Constant<uint, GLEnum, ArrayObjectPNameATI> pname
     ) => ThisThread.GetArrayObjectivATI(array, pname);
 
+    [NativeName("glGetAttachedObjectsARB")]
+    [SupportedApiProfile("gl", ["GL_ARB_shader_objects"])]
+    [NativeFunction("opengl", EntryPoint = "glGetAttachedObjectsARB")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IGL.GetAttachedObjectARB(uint containerObj, Ref<uint> count)
+    {
+        fixed (uint* __dsl_count = count)
+        {
+            uint obj = default;
+            ((IGL)this).GetAttachedObjectsARB(containerObj, 1, __dsl_count, (uint*)&obj);
+            return obj;
+        }
+    }
+
+    [NativeName("glGetAttachedObjectsARB")]
+    [SupportedApiProfile("gl", ["GL_ARB_shader_objects"])]
+    [NativeFunction("opengl", EntryPoint = "glGetAttachedObjectsARB")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint GetAttachedObjectARB(uint containerObj, Ref<uint> count) =>
+        ThisThread.GetAttachedObjectARB(containerObj, count);
+
     [NativeName("glGetAttachedObjectsARB")]
     [SupportedApiProfile("gl", ["GL_ARB_shader_objects"])]
     [NativeFunction("opengl", EntryPoint = "glGetAttachedObjectsARB")]
@@ -472853,27 +472824,6 @@ public static void GetAttachedObjectsARB(
         Ref<uint> obj
     ) => ThisThread.GetAttachedObjectsARB(containerObj, maxCount, count, obj);
 
-    [NativeName("glGetAttachedObjectsARB")]
-    [SupportedApiProfile("gl", ["GL_ARB_shader_objects"])]
-    [NativeFunction("opengl", EntryPoint = "glGetAttachedObjectsARB")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.GetAttachedObjectsARB(uint containerObj, Ref<uint> count)
-    {
-        fixed (uint* __dsl_count = count)
-        {
-            uint obj = default;
-            ((IGL)this).GetAttachedObjectsARB(containerObj, 1, __dsl_count, (uint*)&obj);
-            return obj;
-        }
-    }
-
-    [NativeName("glGetAttachedObjectsARB")]
-    [SupportedApiProfile("gl", ["GL_ARB_shader_objects"])]
-    [NativeFunction("opengl", EntryPoint = "glGetAttachedObjectsARB")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint GetAttachedObjectsARB(uint containerObj, Ref<uint> count) =>
-        ThisThread.GetAttachedObjectsARB(containerObj, count);
-
     [NativeName("glGetAttachedShaders")]
     [SupportedApiProfile(
         "gl",
@@ -480540,6 +480490,27 @@ public static void GetFragmentMaterialSGIX(
         Ref<int> @params
     ) => ThisThread.GetFragmentMaterialSGIX(face, pname, @params);
 
+    [NativeName("glGetFragmentShadingRatesEXT")]
+    [SupportedApiProfile("gles2", ["GL_EXT_fragment_shading_rate"])]
+    [NativeFunction("opengl", EntryPoint = "glGetFragmentShadingRatesEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IGL.GetFragmentShadingRateEXT(uint samples, Ref<uint> count)
+    {
+        fixed (uint* __dsl_count = count)
+        {
+            uint shadingRates = default;
+            ((IGL)this).GetFragmentShadingRatesEXT(samples, 1, __dsl_count, (uint*)&shadingRates);
+            return shadingRates;
+        }
+    }
+
+    [NativeName("glGetFragmentShadingRatesEXT")]
+    [SupportedApiProfile("gles2", ["GL_EXT_fragment_shading_rate"])]
+    [NativeFunction("opengl", EntryPoint = "glGetFragmentShadingRatesEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint GetFragmentShadingRateEXT(uint samples, Ref<uint> count) =>
+        ThisThread.GetFragmentShadingRateEXT(samples, count);
+
     [NativeName("glGetFragmentShadingRatesEXT")]
     [SupportedApiProfile("gles2", ["GL_EXT_fragment_shading_rate"])]
     [NativeFunction("opengl", EntryPoint = "glGetFragmentShadingRatesEXT")]
@@ -480606,27 +480577,6 @@ public static void GetFragmentShadingRatesEXT(
         Ref<uint> shadingRates
     ) => ThisThread.GetFragmentShadingRatesEXT(samples, maxCount, count, shadingRates);
 
-    [NativeName("glGetFragmentShadingRatesEXT")]
-    [SupportedApiProfile("gles2", ["GL_EXT_fragment_shading_rate"])]
-    [NativeFunction("opengl", EntryPoint = "glGetFragmentShadingRatesEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.GetFragmentShadingRatesEXT(uint samples, Ref<uint> count)
-    {
-        fixed (uint* __dsl_count = count)
-        {
-            uint shadingRates = default;
-            ((IGL)this).GetFragmentShadingRatesEXT(samples, 1, __dsl_count, (uint*)&shadingRates);
-            return shadingRates;
-        }
-    }
-
-    [NativeName("glGetFragmentShadingRatesEXT")]
-    [SupportedApiProfile("gles2", ["GL_EXT_fragment_shading_rate"])]
-    [NativeFunction("opengl", EntryPoint = "glGetFragmentShadingRatesEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint GetFragmentShadingRatesEXT(uint samples, Ref<uint> count) =>
-        ThisThread.GetFragmentShadingRatesEXT(samples, count);
-
     [NativeName("glGetFragmentShadingRatesEXT")]
     [SupportedApiProfile("gles2", ["GL_EXT_fragment_shading_rate"])]
     [NativeFunction("opengl", EntryPoint = "glGetFragmentShadingRatesEXT")]
@@ -492689,6 +492639,27 @@ public static void GetPathColorGenNV(
         Ref<int> value
     ) => ThisThread.GetPathColorGenNV(color, pname, value);
 
+    [NativeName("glGetPathCommandsNV")]
+    [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
+    [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
+    [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])]
+    [NativeFunction("opengl", EntryPoint = "glGetPathCommandsNV")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    byte IGL.GetPathCommandNV()
+    {
+        byte commands = default;
+        ((IGL)this).GetPathCommandsNV(1, (byte*)&commands);
+        return commands;
+    }
+
+    [NativeName("glGetPathCommandsNV")]
+    [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
+    [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
+    [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])]
+    [NativeFunction("opengl", EntryPoint = "glGetPathCommandsNV")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static byte GetPathCommandNV() => ThisThread.GetPathCommandNV();
+
     [NativeName("glGetPathCommandsNV")]
     [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
     [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
@@ -492742,11 +492713,12 @@ public static void GetPathCommandsNV(uint path, Ref<byte> commands) =>
     [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])]
     [NativeFunction("opengl", EntryPoint = "glGetPathCommandsNV")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    byte IGL.GetPathCommandsNV()
+    void IGL.GetPathCommandsNV(uint path, Ref<PathCoordType> commands)
     {
-        byte commands = default;
-        ((IGL)this).GetPathCommandsNV(1, (byte*)&commands);
-        return commands;
+        fixed (PathCoordType* __dsl_commands = commands)
+        {
+            ((IGL)this).GetPathCommandsNV(path, (byte*)__dsl_commands);
+        }
     }
 
     [NativeName("glGetPathCommandsNV")]
@@ -492755,30 +492727,29 @@ byte IGL.GetPathCommandsNV()
     [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])]
     [NativeFunction("opengl", EntryPoint = "glGetPathCommandsNV")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static byte GetPathCommandsNV() => ThisThread.GetPathCommandsNV();
+    public static void GetPathCommandsNV(uint path, Ref<PathCoordType> commands) =>
+        ThisThread.GetPathCommandsNV(path, commands);
 
-    [NativeName("glGetPathCommandsNV")]
+    [NativeName("glGetPathCoordsNV")]
     [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
     [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
     [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])]
-    [NativeFunction("opengl", EntryPoint = "glGetPathCommandsNV")]
+    [NativeFunction("opengl", EntryPoint = "glGetPathCoordsNV")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.GetPathCommandsNV(uint path, Ref<PathCoordType> commands)
+    float IGL.GetPathCoordNV()
     {
-        fixed (PathCoordType* __dsl_commands = commands)
-        {
-            ((IGL)this).GetPathCommandsNV(path, (byte*)__dsl_commands);
-        }
+        float coords = default;
+        ((IGL)this).GetPathCoordsNV(1, (float*)&coords);
+        return coords;
     }
 
-    [NativeName("glGetPathCommandsNV")]
+    [NativeName("glGetPathCoordsNV")]
     [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
     [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
     [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])]
-    [NativeFunction("opengl", EntryPoint = "glGetPathCommandsNV")]
+    [NativeFunction("opengl", EntryPoint = "glGetPathCoordsNV")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void GetPathCommandsNV(uint path, Ref<PathCoordType> commands) =>
-        ThisThread.GetPathCommandsNV(path, commands);
+    public static float GetPathCoordNV() => ThisThread.GetPathCoordNV();
 
     [NativeName("glGetPathCoordsNV")]
     [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
@@ -492827,27 +492798,6 @@ void IGL.GetPathCoordsNV(uint path, Ref<float> coords)
     public static void GetPathCoordsNV(uint path, Ref<float> coords) =>
         ThisThread.GetPathCoordsNV(path, coords);
 
-    [NativeName("glGetPathCoordsNV")]
-    [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
-    [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
-    [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])]
-    [NativeFunction("opengl", EntryPoint = "glGetPathCoordsNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    float IGL.GetPathCoordsNV()
-    {
-        float coords = default;
-        ((IGL)this).GetPathCoordsNV(1, (float*)&coords);
-        return coords;
-    }
-
-    [NativeName("glGetPathCoordsNV")]
-    [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
-    [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
-    [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])]
-    [NativeFunction("opengl", EntryPoint = "glGetPathCoordsNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static float GetPathCoordsNV() => ThisThread.GetPathCoordsNV();
-
     [NativeName("glGetPathDashArrayNV")]
     [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
     [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
@@ -493611,6 +493561,41 @@ Ref<ulong> rawCounterMaxValue
             rawCounterMaxValue
         );
 
+    [NativeName("glGetPerfMonitorCountersAMD")]
+    [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
+    [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
+    [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
+    [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorCountersAMD")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IGL.GetPerfMonitorCounterAMD(uint group, Ref<int> numCounters, Ref<int> maxActiveCounters)
+    {
+        fixed (int* __dsl_maxActiveCounters = maxActiveCounters)
+        fixed (int* __dsl_numCounters = numCounters)
+        {
+            uint counters = default;
+            ((IGL)this).GetPerfMonitorCountersAMD(
+                group,
+                __dsl_numCounters,
+                __dsl_maxActiveCounters,
+                1,
+                (uint*)&counters
+            );
+            return counters;
+        }
+    }
+
+    [NativeName("glGetPerfMonitorCountersAMD")]
+    [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
+    [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
+    [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
+    [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorCountersAMD")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint GetPerfMonitorCounterAMD(
+        uint group,
+        Ref<int> numCounters,
+        Ref<int> maxActiveCounters
+    ) => ThisThread.GetPerfMonitorCounterAMD(group, numCounters, maxActiveCounters);
+
     [NativeName("glGetPerfMonitorCounterDataAMD")]
     [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
     [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
@@ -493626,9 +493611,9 @@ void IGL.GetPerfMonitorCounterDataAMD(
     ) =>
         (
             (delegate* unmanaged<uint, uint, uint, uint*, int*, void>)(
-                _slots[1126] is not null and var loadedFnPtr
+                _slots[1127] is not null and var loadedFnPtr
                     ? loadedFnPtr
-                    : _slots[1126] = nativeContext.LoadFunction(
+                    : _slots[1127] = nativeContext.LoadFunction(
                         "glGetPerfMonitorCounterDataAMD",
                         "opengl"
                     )
@@ -493696,7 +493681,7 @@ Ref<int> bytesWritten
     [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
     [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorCounterDataAMD")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    int IGL.GetPerfMonitorCounterDataAMD(uint monitor, uint pname, uint dataSize, Ref<uint> data)
+    int IGL.GetPerfMonitorCounterDatumAMD(uint monitor, uint pname, uint dataSize, Ref<uint> data)
     {
         fixed (uint* __dsl_data = data)
         {
@@ -493718,12 +493703,12 @@ int IGL.GetPerfMonitorCounterDataAMD(uint monitor, uint pname, uint dataSize, Re
     [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
     [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorCounterDataAMD")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static int GetPerfMonitorCounterDataAMD(
+    public static int GetPerfMonitorCounterDatumAMD(
         uint monitor,
         uint pname,
         uint dataSize,
         Ref<uint> data
-    ) => ThisThread.GetPerfMonitorCounterDataAMD(monitor, pname, dataSize, data);
+    ) => ThisThread.GetPerfMonitorCounterDatumAMD(monitor, pname, dataSize, data);
 
     [NativeName("glGetPerfMonitorCounterInfoAMD")]
     [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
@@ -493734,9 +493719,9 @@ Ref<uint> data
     void IGL.GetPerfMonitorCounterInfoAMD(uint group, uint counter, uint pname, void* data) =>
         (
             (delegate* unmanaged<uint, uint, uint, void*, void>)(
-                _slots[1127] is not null and var loadedFnPtr
+                _slots[1128] is not null and var loadedFnPtr
                     ? loadedFnPtr
-                    : _slots[1127] = nativeContext.LoadFunction(
+                    : _slots[1128] = nativeContext.LoadFunction(
                         "glGetPerfMonitorCounterInfoAMD",
                         "opengl"
                     )
@@ -493798,9 +493783,9 @@ void IGL.GetPerfMonitorCountersAMD(
     ) =>
         (
             (delegate* unmanaged<uint, int*, int*, uint, uint*, void>)(
-                _slots[1128] is not null and var loadedFnPtr
+                _slots[1126] is not null and var loadedFnPtr
                     ? loadedFnPtr
-                    : _slots[1128] = nativeContext.LoadFunction(
+                    : _slots[1126] = nativeContext.LoadFunction(
                         "glGetPerfMonitorCountersAMD",
                         "opengl"
                     )
@@ -493877,41 +493862,6 @@ Ref<uint> counters
             counters
         );
 
-    [NativeName("glGetPerfMonitorCountersAMD")]
-    [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
-    [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
-    [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
-    [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorCountersAMD")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.GetPerfMonitorCountersAMD(uint group, Ref<int> numCounters, Ref<int> maxActiveCounters)
-    {
-        fixed (int* __dsl_maxActiveCounters = maxActiveCounters)
-        fixed (int* __dsl_numCounters = numCounters)
-        {
-            uint counters = default;
-            ((IGL)this).GetPerfMonitorCountersAMD(
-                group,
-                __dsl_numCounters,
-                __dsl_maxActiveCounters,
-                1,
-                (uint*)&counters
-            );
-            return counters;
-        }
-    }
-
-    [NativeName("glGetPerfMonitorCountersAMD")]
-    [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
-    [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
-    [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
-    [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorCountersAMD")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint GetPerfMonitorCountersAMD(
-        uint group,
-        Ref<int> numCounters,
-        Ref<int> maxActiveCounters
-    ) => ThisThread.GetPerfMonitorCountersAMD(group, numCounters, maxActiveCounters);
-
     [NativeName("glGetPerfMonitorCounterStringAMD")]
     [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
     [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
@@ -494025,6 +493975,31 @@ public static sbyte GetPerfMonitorCounterStringAMD(
         Ref<uint> length
     ) => ThisThread.GetPerfMonitorCounterStringAMD(group, counter, length);
 
+    [NativeName("glGetPerfMonitorGroupsAMD")]
+    [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
+    [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
+    [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
+    [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorGroupsAMD")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IGL.GetPerfMonitorGroupAMD(Ref<int> numGroups)
+    {
+        fixed (int* __dsl_numGroups = numGroups)
+        {
+            uint groups = default;
+            ((IGL)this).GetPerfMonitorGroupsAMD(__dsl_numGroups, 1, (uint*)&groups);
+            return groups;
+        }
+    }
+
+    [NativeName("glGetPerfMonitorGroupsAMD")]
+    [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
+    [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
+    [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
+    [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorGroupsAMD")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint GetPerfMonitorGroupAMD(Ref<int> numGroups) =>
+        ThisThread.GetPerfMonitorGroupAMD(numGroups);
+
     [NativeName("glGetPerfMonitorGroupsAMD")]
     [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
     [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
@@ -494079,31 +494054,6 @@ public static void GetPerfMonitorGroupsAMD(
         Ref<uint> groups
     ) => ThisThread.GetPerfMonitorGroupsAMD(numGroups, groupsSize, groups);
 
-    [NativeName("glGetPerfMonitorGroupsAMD")]
-    [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
-    [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
-    [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
-    [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorGroupsAMD")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.GetPerfMonitorGroupsAMD(Ref<int> numGroups)
-    {
-        fixed (int* __dsl_numGroups = numGroups)
-        {
-            uint groups = default;
-            ((IGL)this).GetPerfMonitorGroupsAMD(__dsl_numGroups, 1, (uint*)&groups);
-            return groups;
-        }
-    }
-
-    [NativeName("glGetPerfMonitorGroupsAMD")]
-    [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
-    [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
-    [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
-    [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorGroupsAMD")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint GetPerfMonitorGroupsAMD(Ref<int> numGroups) =>
-        ThisThread.GetPerfMonitorGroupsAMD(numGroups);
-
     [NativeName("glGetPerfMonitorGroupStringAMD")]
     [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
     [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
@@ -564063,6 +564013,35 @@ void IGL.ProgramBinaryOES(uint program, uint binaryFormat, Ref binary, int lengt
     public static void ProgramBinaryOES(uint program, uint binaryFormat, Ref binary, int length) =>
         ThisThread.ProgramBinaryOES(program, binaryFormat, binary, length);
 
+    [NativeName("glProgramBufferParametersfvNV")]
+    [SupportedApiProfile("gl", ["GL_NV_parameter_buffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glProgramBufferParametersfvNV")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.ProgramBufferParameterNV(
+        Constant<uint, GLEnum, ProgramTarget> target,
+        uint bindingIndex,
+        uint wordIndex,
+        float @params
+    ) =>
+        ((IGL)this).ProgramBufferParametersNV(
+            (uint)target,
+            bindingIndex,
+            wordIndex,
+            1,
+            (float*)&@params
+        );
+
+    [NativeName("glProgramBufferParametersfvNV")]
+    [SupportedApiProfile("gl", ["GL_NV_parameter_buffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glProgramBufferParametersfvNV")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void ProgramBufferParameterNV(
+        Constant<uint, GLEnum, ProgramTarget> target,
+        uint bindingIndex,
+        uint wordIndex,
+        float @params
+    ) => ThisThread.ProgramBufferParameterNV(target, bindingIndex, wordIndex, @params);
+
     [NativeName("glProgramBufferParametersfvNV")]
     [SupportedApiProfile("gl", ["GL_NV_parameter_buffer_object"])]
     [NativeFunction("opengl", EntryPoint = "glProgramBufferParametersfvNV")]
@@ -564133,35 +564112,6 @@ public static void ProgramBufferParametersNV(
         Ref<float> @params
     ) => ThisThread.ProgramBufferParametersNV(target, bindingIndex, wordIndex, count, @params);
 
-    [NativeName("glProgramBufferParametersfvNV")]
-    [SupportedApiProfile("gl", ["GL_NV_parameter_buffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glProgramBufferParametersfvNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.ProgramBufferParametersNV(
-        Constant<uint, GLEnum, ProgramTarget> target,
-        uint bindingIndex,
-        uint wordIndex,
-        float @params
-    ) =>
-        ((IGL)this).ProgramBufferParametersNV(
-            (uint)target,
-            bindingIndex,
-            wordIndex,
-            1,
-            (float*)&@params
-        );
-
-    [NativeName("glProgramBufferParametersfvNV")]
-    [SupportedApiProfile("gl", ["GL_NV_parameter_buffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glProgramBufferParametersfvNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void ProgramBufferParametersNV(
-        Constant<uint, GLEnum, ProgramTarget> target,
-        uint bindingIndex,
-        uint wordIndex,
-        float @params
-    ) => ThisThread.ProgramBufferParametersNV(target, bindingIndex, wordIndex, @params);
-
     [NativeName("glProgramBufferParametersIivNV")]
     [SupportedApiProfile("gl", ["GL_NV_parameter_buffer_object"])]
     [NativeFunction("opengl", EntryPoint = "glProgramBufferParametersIivNV")]
@@ -566573,15 +566523,15 @@ public static void ProgramSubroutineParametersNV(uint target, uint count, Ref<ui
     [SupportedApiProfile("gl", ["GL_NV_gpu_program5"])]
     [NativeFunction("opengl", EntryPoint = "glProgramSubroutineParametersuivNV")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.ProgramSubroutineParametersNV(uint target, uint @params) =>
+    void IGL.ProgramSubroutineParameterNV(uint target, uint @params) =>
         ((IGL)this).ProgramSubroutineParametersNV(target, 1, (uint*)&@params);
 
     [NativeName("glProgramSubroutineParametersuivNV")]
     [SupportedApiProfile("gl", ["GL_NV_gpu_program5"])]
     [NativeFunction("opengl", EntryPoint = "glProgramSubroutineParametersuivNV")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void ProgramSubroutineParametersNV(uint target, uint @params) =>
-        ThisThread.ProgramSubroutineParametersNV(target, @params);
+    public static void ProgramSubroutineParameterNV(uint target, uint @params) =>
+        ThisThread.ProgramSubroutineParameterNV(target, @params);
 
     [NativeName("glProgramUniform1d")]
     [SupportedApiProfile(
@@ -593533,6 +593483,37 @@ uint IGL.SelectBuffer()
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static uint SelectBuffer() => ThisThread.SelectBuffer();
 
+    [NativeName("glSelectPerfMonitorCountersAMD")]
+    [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
+    [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
+    [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
+    [NativeFunction("opengl", EntryPoint = "glSelectPerfMonitorCountersAMD")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    uint IGL.SelectPerfMonitorCounterAMD(uint monitor, MaybeBool<uint> enable, uint group)
+    {
+        uint counterList = default;
+        ((IGL)this).SelectPerfMonitorCountersAMD(
+            monitor,
+            (uint)enable,
+            group,
+            1,
+            (uint*)&counterList
+        );
+        return counterList;
+    }
+
+    [NativeName("glSelectPerfMonitorCountersAMD")]
+    [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
+    [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
+    [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
+    [NativeFunction("opengl", EntryPoint = "glSelectPerfMonitorCountersAMD")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static uint SelectPerfMonitorCounterAMD(
+        uint monitor,
+        MaybeBool<uint> enable,
+        uint group
+    ) => ThisThread.SelectPerfMonitorCounterAMD(monitor, enable, group);
+
     [NativeName("glSelectPerfMonitorCountersAMD")]
     [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
     [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
@@ -593611,37 +593592,6 @@ public static void SelectPerfMonitorCountersAMD(
         Ref<uint> counterList
     ) => ThisThread.SelectPerfMonitorCountersAMD(monitor, enable, group, numCounters, counterList);
 
-    [NativeName("glSelectPerfMonitorCountersAMD")]
-    [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
-    [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
-    [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
-    [NativeFunction("opengl", EntryPoint = "glSelectPerfMonitorCountersAMD")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    uint IGL.SelectPerfMonitorCountersAMD(uint monitor, MaybeBool<uint> enable, uint group)
-    {
-        uint counterList = default;
-        ((IGL)this).SelectPerfMonitorCountersAMD(
-            monitor,
-            (uint)enable,
-            group,
-            1,
-            (uint*)&counterList
-        );
-        return counterList;
-    }
-
-    [NativeName("glSelectPerfMonitorCountersAMD")]
-    [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
-    [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
-    [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
-    [NativeFunction("opengl", EntryPoint = "glSelectPerfMonitorCountersAMD")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static uint SelectPerfMonitorCountersAMD(
-        uint monitor,
-        MaybeBool<uint> enable,
-        uint group
-    ) => ThisThread.SelectPerfMonitorCountersAMD(monitor, enable, group);
-
     [NativeName("glSemaphoreParameterivNV")]
     [SupportedApiProfile("gl", ["GL_NV_timeline_semaphore"])]
     [SupportedApiProfile("gles2", ["GL_NV_timeline_semaphore"])]
@@ -605947,26 +605897,6 @@ public static void TexEstimateMotionRegionQCOM(
         uint mask
     ) => ThisThread.TexEstimateMotionRegionQCOM(@ref, target, output, mask);
 
-    [NativeName("glTexFilterFuncSGIS")]
-    [SupportedApiProfile("gl", ["GL_SGIS_texture_filter4"])]
-    [NativeFunction("opengl", EntryPoint = "glTexFilterFuncSGIS")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.TexFilterFuncSgiSGIS(
-        Constant<uint, GLEnum, TextureTarget> target,
-        Constant<uint, GLEnum, TextureFilterSGIS> filter,
-        float weights
-    ) => ((IGL)this).TexFilterFuncSGIS((uint)target, (uint)filter, 1, (float*)&weights);
-
-    [NativeName("glTexFilterFuncSGIS")]
-    [SupportedApiProfile("gl", ["GL_SGIS_texture_filter4"])]
-    [NativeFunction("opengl", EntryPoint = "glTexFilterFuncSGIS")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void TexFilterFuncSgiSGIS(
-        Constant<uint, GLEnum, TextureTarget> target,
-        Constant<uint, GLEnum, TextureFilterSGIS> filter,
-        float weights
-    ) => ThisThread.TexFilterFuncSgiSGIS(target, filter, weights);
-
     [NativeName("glTexFilterFuncSGIS")]
     [SupportedApiProfile("gl", ["GL_SGIS_texture_filter4"])]
     [NativeFunction("opengl", EntryPoint = "glTexFilterFuncSGIS")]
@@ -606015,6 +605945,26 @@ public static void TexFilterFuncSGIS(
         Ref<float> weights
     ) => ThisThread.TexFilterFuncSGIS(target, filter, n, weights);
 
+    [NativeName("glTexFilterFuncSGIS")]
+    [SupportedApiProfile("gl", ["GL_SGIS_texture_filter4"])]
+    [NativeFunction("opengl", EntryPoint = "glTexFilterFuncSGIS")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.TexFilterFuncSGIS(
+        Constant<uint, GLEnum, TextureTarget> target,
+        Constant<uint, GLEnum, TextureFilterSGIS> filter,
+        float weights
+    ) => ((IGL)this).TexFilterFuncSGIS((uint)target, (uint)filter, 1, (float*)&weights);
+
+    [NativeName("glTexFilterFuncSGIS")]
+    [SupportedApiProfile("gl", ["GL_SGIS_texture_filter4"])]
+    [NativeFunction("opengl", EntryPoint = "glTexFilterFuncSGIS")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void TexFilterFuncSGIS(
+        Constant<uint, GLEnum, TextureTarget> target,
+        Constant<uint, GLEnum, TextureFilterSGIS> filter,
+        float weights
+    ) => ThisThread.TexFilterFuncSGIS(target, filter, weights);
+
     [NativeName("glTexGend")]
     [SupportedApiProfile(
         "gl",
@@ -620393,6 +620343,109 @@ public static void TransformFeedbackVarying(
         Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
     ) => ThisThread.TransformFeedbackVarying(program, varyings, bufferMode);
 
+    [NativeName("glTransformFeedbackVaryingsEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_transform_feedback"])]
+    [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.TransformFeedbackVaryingEXT(
+        uint program,
+        Ref<sbyte> varyings,
+        Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
+    )
+    {
+        fixed (sbyte* __dsl_varyings = varyings)
+        {
+            ((IGL)this).TransformFeedbackVaryingsEXT(
+                program,
+                1,
+                (sbyte**)&__dsl_varyings,
+                (uint)bufferMode
+            );
+        }
+    }
+
+    [NativeName("glTransformFeedbackVaryingsEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_transform_feedback"])]
+    [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void TransformFeedbackVaryingEXT(
+        uint program,
+        Ref<sbyte> varyings,
+        Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
+    ) => ThisThread.TransformFeedbackVaryingEXT(program, varyings, bufferMode);
+
+    [NativeName("glTransformFeedbackVaryingsNV")]
+    [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
+    [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.TransformFeedbackVaryingNV(
+        uint program,
+        int locations,
+        Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
+    ) => ((IGL)this).TransformFeedbackVaryingsNV(program, 1, (int*)&locations, (uint)bufferMode);
+
+    [NativeName("glTransformFeedbackVaryingsNV")]
+    [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
+    [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void TransformFeedbackVaryingNV(
+        uint program,
+        int locations,
+        Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
+    ) => ThisThread.TransformFeedbackVaryingNV(program, locations, bufferMode);
+
+    [NativeName("glTransformFeedbackVaryingsNV")]
+    [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
+    [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.TransformFeedbackVaryingNV(
+        uint program,
+        GLEnum locations,
+        Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
+    ) =>
+        ((IGL)this).TransformFeedbackVaryingsNV(
+            program,
+            1,
+            (int*)(GLEnum*)&locations,
+            (uint)bufferMode
+        );
+
+    [NativeName("glTransformFeedbackVaryingsNV")]
+    [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
+    [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void TransformFeedbackVaryingNV(
+        uint program,
+        GLEnum locations,
+        Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
+    ) => ThisThread.TransformFeedbackVaryingNV(program, locations, bufferMode);
+
+    [NativeName("glTransformFeedbackVaryingsNV")]
+    [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
+    [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.TransformFeedbackVaryingNV(
+        uint program,
+        TransformFeedbackTokenNV locations,
+        Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
+    ) =>
+        ((IGL)this).TransformFeedbackVaryingsNV(
+            program,
+            1,
+            (int*)(TransformFeedbackTokenNV*)&locations,
+            (uint)bufferMode
+        );
+
+    [NativeName("glTransformFeedbackVaryingsNV")]
+    [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
+    [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void TransformFeedbackVaryingNV(
+        uint program,
+        TransformFeedbackTokenNV locations,
+        Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
+    ) => ThisThread.TransformFeedbackVaryingNV(program, locations, bufferMode);
+
     [NativeName("glTransformFeedbackVaryings")]
     [SupportedApiProfile(
         "gl",
@@ -620650,37 +620703,6 @@ public static void TransformFeedbackVaryingsEXT(
         Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
     ) => ThisThread.TransformFeedbackVaryingsEXT(program, count, varyings, bufferMode);
 
-    [NativeName("glTransformFeedbackVaryingsEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_transform_feedback"])]
-    [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.TransformFeedbackVaryingsEXT(
-        uint program,
-        Ref<sbyte> varyings,
-        Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
-    )
-    {
-        fixed (sbyte* __dsl_varyings = varyings)
-        {
-            ((IGL)this).TransformFeedbackVaryingsEXT(
-                program,
-                1,
-                (sbyte**)&__dsl_varyings,
-                (uint)bufferMode
-            );
-        }
-    }
-
-    [NativeName("glTransformFeedbackVaryingsEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_transform_feedback"])]
-    [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void TransformFeedbackVaryingsEXT(
-        uint program,
-        Ref<sbyte> varyings,
-        Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
-    ) => ThisThread.TransformFeedbackVaryingsEXT(program, varyings, bufferMode);
-
     [NativeName("glTransformFeedbackVaryingsNV")]
     [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
     [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
@@ -620746,26 +620768,6 @@ public static void TransformFeedbackVaryingsNV(
         Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
     ) => ThisThread.TransformFeedbackVaryingsNV(program, count, locations, bufferMode);
 
-    [NativeName("glTransformFeedbackVaryingsNV")]
-    [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
-    [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.TransformFeedbackVaryingsNV(
-        uint program,
-        int locations,
-        Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
-    ) => ((IGL)this).TransformFeedbackVaryingsNV(program, 1, (int*)&locations, (uint)bufferMode);
-
-    [NativeName("glTransformFeedbackVaryingsNV")]
-    [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
-    [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void TransformFeedbackVaryingsNV(
-        uint program,
-        int locations,
-        Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
-    ) => ThisThread.TransformFeedbackVaryingsNV(program, locations, bufferMode);
-
     [NativeName("glTransformFeedbackVaryingsNV")]
     [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
     [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
@@ -620799,32 +620801,6 @@ public static void TransformFeedbackVaryingsNV(
         Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
     ) => ThisThread.TransformFeedbackVaryingsNV(program, count, locations, bufferMode);
 
-    [NativeName("glTransformFeedbackVaryingsNV")]
-    [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
-    [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.TransformFeedbackVaryingsNV(
-        uint program,
-        GLEnum locations,
-        Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
-    ) =>
-        ((IGL)this).TransformFeedbackVaryingsNV(
-            program,
-            1,
-            (int*)(GLEnum*)&locations,
-            (uint)bufferMode
-        );
-
-    [NativeName("glTransformFeedbackVaryingsNV")]
-    [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
-    [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void TransformFeedbackVaryingsNV(
-        uint program,
-        GLEnum locations,
-        Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
-    ) => ThisThread.TransformFeedbackVaryingsNV(program, locations, bufferMode);
-
     [NativeName("glTransformFeedbackVaryingsNV")]
     [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
     [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
@@ -620858,32 +620834,6 @@ public static void TransformFeedbackVaryingsNV(
         Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
     ) => ThisThread.TransformFeedbackVaryingsNV(program, count, locations, bufferMode);
 
-    [NativeName("glTransformFeedbackVaryingsNV")]
-    [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
-    [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.TransformFeedbackVaryingsNV(
-        uint program,
-        TransformFeedbackTokenNV locations,
-        Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
-    ) =>
-        ((IGL)this).TransformFeedbackVaryingsNV(
-            program,
-            1,
-            (int*)(TransformFeedbackTokenNV*)&locations,
-            (uint)bufferMode
-        );
-
-    [NativeName("glTransformFeedbackVaryingsNV")]
-    [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
-    [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void TransformFeedbackVaryingsNV(
-        uint program,
-        TransformFeedbackTokenNV locations,
-        Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
-    ) => ThisThread.TransformFeedbackVaryingsNV(program, locations, bufferMode);
-
     [NativeName("glTransformPathNV")]
     [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
     [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
@@ -631404,7 +631354,7 @@ Ref<uint> indices
     )]
     [NativeFunction("opengl", EntryPoint = "glUniformSubroutinesuiv")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.UniformSubroutines(Constant<uint, GLEnum, ShaderType> shadertype, uint indices) =>
+    void IGL.UniformSubroutine(Constant<uint, GLEnum, ShaderType> shadertype, uint indices) =>
         ((IGL)this).UniformSubroutines((uint)shadertype, 1, (uint*)&indices);
 
     [NativeName("glUniformSubroutinesuiv")]
@@ -631438,10 +631388,10 @@ void IGL.UniformSubroutines(Constant<uint, GLEnum, ShaderType> shadertype, uint
     )]
     [NativeFunction("opengl", EntryPoint = "glUniformSubroutinesuiv")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void UniformSubroutines(
+    public static void UniformSubroutine(
         Constant<uint, GLEnum, ShaderType> shadertype,
         uint indices
-    ) => ThisThread.UniformSubroutines(shadertype, indices);
+    ) => ThisThread.UniformSubroutine(shadertype, indices);
 
     [NativeName("glUniformui64NV")]
     [SupportedApiProfile("gl", ["GL_NV_shader_buffer_load"])]
@@ -633213,6 +633163,19 @@ _slots[2843] is not null and var loadedFnPtr
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static uint VdpauIsSurfaceRawNV(nint surface) => ThisThread.VdpauIsSurfaceRawNV(surface);
 
+    [NativeName("glVDPAUMapSurfacesNV")]
+    [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
+    [NativeFunction("opengl", EntryPoint = "glVDPAUMapSurfacesNV")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.VdpauMapSurfaceNV(nint surfaces) =>
+        ((IGL)this).VdpauMapSurfacesNV(1, (nint*)&surfaces);
+
+    [NativeName("glVDPAUMapSurfacesNV")]
+    [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
+    [NativeFunction("opengl", EntryPoint = "glVDPAUMapSurfacesNV")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void VdpauMapSurfaceNV(nint surfaces) => ThisThread.VdpauMapSurfaceNV(surfaces);
+
     [NativeName("glVDPAUMapSurfacesNV")]
     [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
     [NativeFunction("opengl", EntryPoint = "glVDPAUMapSurfacesNV")]
@@ -633252,19 +633215,6 @@ void IGL.VdpauMapSurfacesNV(uint numSurfaces, Ref<nint> surfaces)
     public static void VdpauMapSurfacesNV(uint numSurfaces, Ref<nint> surfaces) =>
         ThisThread.VdpauMapSurfacesNV(numSurfaces, surfaces);
 
-    [NativeName("glVDPAUMapSurfacesNV")]
-    [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
-    [NativeFunction("opengl", EntryPoint = "glVDPAUMapSurfacesNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.VdpauMapSurfacesNV(nint surfaces) =>
-        ((IGL)this).VdpauMapSurfacesNV(1, (nint*)&surfaces);
-
-    [NativeName("glVDPAUMapSurfacesNV")]
-    [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
-    [NativeFunction("opengl", EntryPoint = "glVDPAUMapSurfacesNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void VdpauMapSurfacesNV(nint surfaces) => ThisThread.VdpauMapSurfacesNV(surfaces);
-
     [NativeName("glVDPAURegisterOutputSurfaceNV")]
     [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
     [NativeFunction("opengl", EntryPoint = "glVDPAURegisterOutputSurfaceNV")]
@@ -633505,6 +633455,20 @@ _slots[2848] is not null and var loadedFnPtr
     public static void VdpauSurfaceAccessNV(nint surface, uint access) =>
         ThisThread.VdpauSurfaceAccessNV(surface, access);
 
+    [NativeName("glVDPAUUnmapSurfacesNV")]
+    [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
+    [NativeFunction("opengl", EntryPoint = "glVDPAUUnmapSurfacesNV")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.VdpauUnmapSurfaceNV(nint surfaces) =>
+        ((IGL)this).VdpauUnmapSurfacesNV(1, (nint*)&surfaces);
+
+    [NativeName("glVDPAUUnmapSurfacesNV")]
+    [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
+    [NativeFunction("opengl", EntryPoint = "glVDPAUUnmapSurfacesNV")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void VdpauUnmapSurfaceNV(nint surfaces) =>
+        ThisThread.VdpauUnmapSurfaceNV(surfaces);
+
     [NativeName("glVDPAUUnmapSurfacesNV")]
     [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
     [NativeFunction("opengl", EntryPoint = "glVDPAUUnmapSurfacesNV")]
@@ -633544,20 +633508,6 @@ void IGL.VdpauUnmapSurfacesNV(uint numSurface, Ref<nint> surfaces)
     public static void VdpauUnmapSurfacesNV(uint numSurface, Ref<nint> surfaces) =>
         ThisThread.VdpauUnmapSurfacesNV(numSurface, surfaces);
 
-    [NativeName("glVDPAUUnmapSurfacesNV")]
-    [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
-    [NativeFunction("opengl", EntryPoint = "glVDPAUUnmapSurfacesNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.VdpauUnmapSurfacesNV(nint surfaces) =>
-        ((IGL)this).VdpauUnmapSurfacesNV(1, (nint*)&surfaces);
-
-    [NativeName("glVDPAUUnmapSurfacesNV")]
-    [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
-    [NativeFunction("opengl", EntryPoint = "glVDPAUUnmapSurfacesNV")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void VdpauUnmapSurfacesNV(nint surfaces) =>
-        ThisThread.VdpauUnmapSurfacesNV(surfaces);
-
     [NativeName("glVDPAUUnregisterSurfaceNV")]
     [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
     [NativeFunction("opengl", EntryPoint = "glVDPAUUnregisterSurfaceNV")]
@@ -663151,6 +663101,24 @@ void IGL.WindowPos4MESA(Ref<short> v)
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static void WindowPos4MESA(Ref<short> v) => ThisThread.WindowPos4MESA(v);
 
+    [NativeName("glWindowRectanglesEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_window_rectangles"])]
+    [SupportedApiProfile("glcore", ["GL_EXT_window_rectangles"])]
+    [SupportedApiProfile("gles2", ["GL_EXT_window_rectangles"])]
+    [NativeFunction("opengl", EntryPoint = "glWindowRectanglesEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IGL.WindowRectangleEXT(uint mode, int box) =>
+        ((IGL)this).WindowRectanglesEXT(mode, 1, (int*)&box);
+
+    [NativeName("glWindowRectanglesEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_window_rectangles"])]
+    [SupportedApiProfile("glcore", ["GL_EXT_window_rectangles"])]
+    [SupportedApiProfile("gles2", ["GL_EXT_window_rectangles"])]
+    [NativeFunction("opengl", EntryPoint = "glWindowRectanglesEXT")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void WindowRectangleEXT(uint mode, int box) =>
+        ThisThread.WindowRectangleEXT(mode, box);
+
     [NativeName("glWindowRectanglesEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_window_rectangles"])]
     [SupportedApiProfile("glcore", ["GL_EXT_window_rectangles"])]
@@ -663198,24 +663166,6 @@ void IGL.WindowRectanglesEXT(uint mode, uint count, Ref<int> box)
     public static void WindowRectanglesEXT(uint mode, uint count, Ref<int> box) =>
         ThisThread.WindowRectanglesEXT(mode, count, box);
 
-    [NativeName("glWindowRectanglesEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_window_rectangles"])]
-    [SupportedApiProfile("glcore", ["GL_EXT_window_rectangles"])]
-    [SupportedApiProfile("gles2", ["GL_EXT_window_rectangles"])]
-    [NativeFunction("opengl", EntryPoint = "glWindowRectanglesEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IGL.WindowRectanglesEXT(uint mode, int box) =>
-        ((IGL)this).WindowRectanglesEXT(mode, 1, (int*)&box);
-
-    [NativeName("glWindowRectanglesEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_window_rectangles"])]
-    [SupportedApiProfile("glcore", ["GL_EXT_window_rectangles"])]
-    [SupportedApiProfile("gles2", ["GL_EXT_window_rectangles"])]
-    [NativeFunction("opengl", EntryPoint = "glWindowRectanglesEXT")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void WindowRectanglesEXT(uint mode, int box) =>
-        ThisThread.WindowRectanglesEXT(mode, box);
-
     [NativeName("glWriteMaskEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])]
     [NativeFunction("opengl", EntryPoint = "glWriteMaskEXT")]
diff --git a/sources/OpenGL/OpenGL/gl/IGL.gen.cs b/sources/OpenGL/OpenGL/gl/IGL.gen.cs
index 13648edeeb..23b02d9c91 100644
--- a/sources/OpenGL/OpenGL/gl/IGL.gen.cs
+++ b/sources/OpenGL/OpenGL/gl/IGL.gen.cs
@@ -13435,19 +13435,19 @@ Constant<uint, GLEnum, PathCoverMode> coverMode
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
         [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
         [NativeFunction("opengl", EntryPoint = "glCreateCommandListsNV")]
-        static abstract void CreateCommandListsNV(uint n, uint* lists);
+        static abstract uint CreateCommandListNV();
 
         [NativeName("glCreateCommandListsNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
         [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
         [NativeFunction("opengl", EntryPoint = "glCreateCommandListsNV")]
-        static abstract void CreateCommandListsNV(uint n, Ref<uint> lists);
+        static abstract void CreateCommandListsNV(uint n, uint* lists);
 
         [NativeName("glCreateCommandListsNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
         [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
         [NativeFunction("opengl", EntryPoint = "glCreateCommandListsNV")]
-        static abstract uint CreateCommandListsNV();
+        static abstract void CreateCommandListsNV(uint n, Ref<uint> lists);
 
         [NativeName("glCreateFramebuffers")]
         [SupportedApiProfile(
@@ -13495,19 +13495,19 @@ Constant<uint, GLEnum, PathCoverMode> coverMode
         [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
         [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])]
         [NativeFunction("opengl", EntryPoint = "glCreateMemoryObjectsEXT")]
-        static abstract void CreateMemoryObjectsEXT(uint n, uint* memoryObjects);
+        static abstract uint CreateMemoryObjectEXT();
 
         [NativeName("glCreateMemoryObjectsEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
         [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])]
         [NativeFunction("opengl", EntryPoint = "glCreateMemoryObjectsEXT")]
-        static abstract void CreateMemoryObjectsEXT(uint n, Ref<uint> memoryObjects);
+        static abstract void CreateMemoryObjectsEXT(uint n, uint* memoryObjects);
 
         [NativeName("glCreateMemoryObjectsEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
         [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])]
         [NativeFunction("opengl", EntryPoint = "glCreateMemoryObjectsEXT")]
-        static abstract uint CreateMemoryObjectsEXT();
+        static abstract void CreateMemoryObjectsEXT(uint n, Ref<uint> memoryObjects);
 
         [NativeName("glCreatePerfQueryINTEL")]
         [SupportedApiProfile("gl", ["GL_INTEL_performance_query"])]
@@ -13763,19 +13763,19 @@ Ref<uint> ids
         [SupportedApiProfile("gl", ["GL_NV_timeline_semaphore"])]
         [SupportedApiProfile("gles2", ["GL_NV_timeline_semaphore"])]
         [NativeFunction("opengl", EntryPoint = "glCreateSemaphoresNV")]
-        static abstract void CreateSemaphoresNV(uint n, uint* semaphores);
+        static abstract uint CreateSemaphoreNV();
 
         [NativeName("glCreateSemaphoresNV")]
         [SupportedApiProfile("gl", ["GL_NV_timeline_semaphore"])]
         [SupportedApiProfile("gles2", ["GL_NV_timeline_semaphore"])]
         [NativeFunction("opengl", EntryPoint = "glCreateSemaphoresNV")]
-        static abstract void CreateSemaphoresNV(uint n, Ref<uint> semaphores);
+        static abstract void CreateSemaphoresNV(uint n, uint* semaphores);
 
         [NativeName("glCreateSemaphoresNV")]
         [SupportedApiProfile("gl", ["GL_NV_timeline_semaphore"])]
         [SupportedApiProfile("gles2", ["GL_NV_timeline_semaphore"])]
         [NativeFunction("opengl", EntryPoint = "glCreateSemaphoresNV")]
-        static abstract uint CreateSemaphoresNV();
+        static abstract void CreateSemaphoresNV(uint n, Ref<uint> semaphores);
 
         [NativeName("glCreateShader")]
         [SupportedApiProfile(
@@ -13978,19 +13978,19 @@ Ref2D<sbyte> strings
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
         [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
         [NativeFunction("opengl", EntryPoint = "glCreateStatesNV")]
-        static abstract void CreateStatesNV(uint n, uint* states);
+        static abstract uint CreateStateNV();
 
         [NativeName("glCreateStatesNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
         [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
         [NativeFunction("opengl", EntryPoint = "glCreateStatesNV")]
-        static abstract void CreateStatesNV(uint n, Ref<uint> states);
+        static abstract void CreateStatesNV(uint n, uint* states);
 
         [NativeName("glCreateStatesNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
         [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
         [NativeFunction("opengl", EntryPoint = "glCreateStatesNV")]
-        static abstract uint CreateStatesNV();
+        static abstract void CreateStatesNV(uint n, Ref<uint> states);
 
         [NativeName("glCreateSyncFromCLeventARB")]
         [SupportedApiProfile("gl", ["GL_ARB_cl_event"])]
@@ -14895,6 +14895,11 @@ Ref<float> points
         [NativeFunction("opengl", EntryPoint = "glDeleteBuffers")]
         static abstract void DeleteBuffer(uint buffers);
 
+        [NativeName("glDeleteBuffersARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteBuffersARB")]
+        static abstract void DeleteBufferARB(uint buffers);
+
         [NativeName("glDeleteBuffers")]
         [SupportedApiProfile(
             "gl",
@@ -15005,43 +15010,45 @@ Ref<float> points
         [NativeFunction("opengl", EntryPoint = "glDeleteBuffersARB")]
         static abstract void DeleteBuffersARB(uint n, Ref<uint> buffers);
 
-        [NativeName("glDeleteBuffersARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteBuffersARB")]
-        static abstract void DeleteBuffersARB(uint buffers);
-
         [NativeName("glDeleteCommandListsNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
         [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteCommandListsNV")]
-        static abstract void DeleteCommandListsNV(uint n, uint* lists);
+        static abstract void DeleteCommandListNV(uint lists);
 
         [NativeName("glDeleteCommandListsNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
         [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteCommandListsNV")]
-        static abstract void DeleteCommandListsNV(uint n, Ref<uint> lists);
+        static abstract void DeleteCommandListsNV(uint n, uint* lists);
 
         [NativeName("glDeleteCommandListsNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
         [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteCommandListsNV")]
-        static abstract void DeleteCommandListsNV(uint lists);
+        static abstract void DeleteCommandListsNV(uint n, Ref<uint> lists);
 
         [NativeName("glDeleteFencesAPPLE")]
         [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteFencesAPPLE")]
-        static abstract void DeleteFencesAPPLE(uint n, uint* fences);
+        static abstract void DeleteFenceAPPLE(uint fences);
+
+        [NativeName("glDeleteFencesNV")]
+        [SupportedApiProfile("gl", ["GL_NV_fence"])]
+        [SupportedApiProfile("gles2", ["GL_NV_fence"])]
+        [SupportedApiProfile("gles1", ["GL_NV_fence"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteFencesNV")]
+        static abstract void DeleteFenceNV(uint fences);
 
         [NativeName("glDeleteFencesAPPLE")]
         [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteFencesAPPLE")]
-        static abstract void DeleteFencesAPPLE(uint n, Ref<uint> fences);
+        static abstract void DeleteFencesAPPLE(uint n, uint* fences);
 
         [NativeName("glDeleteFencesAPPLE")]
         [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteFencesAPPLE")]
-        static abstract void DeleteFencesAPPLE(uint fences);
+        static abstract void DeleteFencesAPPLE(uint n, Ref<uint> fences);
 
         [NativeName("glDeleteFencesNV")]
         [SupportedApiProfile("gl", ["GL_NV_fence"])]
@@ -15057,13 +15064,6 @@ Ref<float> points
         [NativeFunction("opengl", EntryPoint = "glDeleteFencesNV")]
         static abstract void DeleteFencesNV(uint n, Ref<uint> fences);
 
-        [NativeName("glDeleteFencesNV")]
-        [SupportedApiProfile("gl", ["GL_NV_fence"])]
-        [SupportedApiProfile("gles2", ["GL_NV_fence"])]
-        [SupportedApiProfile("gles1", ["GL_NV_fence"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteFencesNV")]
-        static abstract void DeleteFencesNV(uint fences);
-
         [NativeName("glDeleteFragmentShaderATI")]
         [SupportedApiProfile("gl", ["GL_ATI_fragment_shader"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteFragmentShaderATI")]
@@ -15114,6 +15114,16 @@ Ref<float> points
         [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffers")]
         static abstract void DeleteFramebuffer(uint framebuffers);
 
+        [NativeName("glDeleteFramebuffersEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersEXT")]
+        static abstract void DeleteFramebufferEXT(uint framebuffers);
+
+        [NativeName("glDeleteFramebuffersOES")]
+        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")]
+        static abstract void DeleteFramebufferOES(uint framebuffers);
+
         [NativeName("glDeleteFramebuffers")]
         [SupportedApiProfile(
             "gl",
@@ -15214,11 +15224,6 @@ Ref<float> points
         [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersEXT")]
         static abstract void DeleteFramebuffersEXT(uint n, Ref<uint> framebuffers);
 
-        [NativeName("glDeleteFramebuffersEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersEXT")]
-        static abstract void DeleteFramebuffersEXT(uint framebuffers);
-
         [NativeName("glDeleteFramebuffersOES")]
         [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")]
@@ -15229,11 +15234,6 @@ Ref<float> points
         [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")]
         static abstract void DeleteFramebuffersOES(uint n, Ref<uint> framebuffers);
 
-        [NativeName("glDeleteFramebuffersOES")]
-        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")]
-        static abstract void DeleteFramebuffersOES(uint framebuffers);
-
         [NativeName("glDeleteLists")]
         [SupportedApiProfile(
             "gl",
@@ -15267,19 +15267,24 @@ Ref<float> points
         [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
         [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteMemoryObjectsEXT")]
-        static abstract void DeleteMemoryObjectsEXT(uint n, uint* memoryObjects);
+        static abstract void DeleteMemoryObjectEXT(uint memoryObjects);
 
         [NativeName("glDeleteMemoryObjectsEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
         [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteMemoryObjectsEXT")]
-        static abstract void DeleteMemoryObjectsEXT(uint n, Ref<uint> memoryObjects);
+        static abstract void DeleteMemoryObjectsEXT(uint n, uint* memoryObjects);
 
         [NativeName("glDeleteMemoryObjectsEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
         [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteMemoryObjectsEXT")]
-        static abstract void DeleteMemoryObjectsEXT(uint memoryObjects);
+        static abstract void DeleteMemoryObjectsEXT(uint n, Ref<uint> memoryObjects);
+
+        [NativeName("glDeleteNamesAMD")]
+        [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteNamesAMD")]
+        static abstract void DeleteNameAMD(uint identifier, uint names);
 
         [NativeName("glDeleteNamedStringARB")]
         [SupportedApiProfile("gl", ["GL_ARB_shading_language_include"])]
@@ -15309,11 +15314,6 @@ Ref<float> points
         [NativeFunction("opengl", EntryPoint = "glDeleteNamesAMD")]
         static abstract void DeleteNamesAMD(uint identifier, uint num, Ref<uint> names);
 
-        [NativeName("glDeleteNamesAMD")]
-        [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteNamesAMD")]
-        static abstract void DeleteNamesAMD(uint identifier, uint names);
-
         [NativeName("glDeleteObjectARB")]
         [SupportedApiProfile("gl", ["GL_ARB_shader_objects"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteObjectARB")]
@@ -15332,7 +15332,7 @@ Ref<float> points
         [NativeName("glDeleteOcclusionQueriesNV")]
         [SupportedApiProfile("gl", ["GL_NV_occlusion_query"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteOcclusionQueriesNV")]
-        static abstract void DeleteOcclusionQueriesNV(uint ids);
+        static abstract void DeleteOcclusionQueryNV(uint ids);
 
         [NativeName("glDeletePathsNV")]
         [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
@@ -15346,21 +15346,21 @@ Ref<float> points
         [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
         [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
         [NativeFunction("opengl", EntryPoint = "glDeletePerfMonitorsAMD")]
-        static abstract void DeletePerfMonitorsAMD(uint n, uint* monitors);
+        static abstract uint DeletePerfMonitorAMD();
 
         [NativeName("glDeletePerfMonitorsAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
         [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
         [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
         [NativeFunction("opengl", EntryPoint = "glDeletePerfMonitorsAMD")]
-        static abstract void DeletePerfMonitorsAMD(uint n, Ref<uint> monitors);
+        static abstract void DeletePerfMonitorsAMD(uint n, uint* monitors);
 
         [NativeName("glDeletePerfMonitorsAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
         [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
         [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
         [NativeFunction("opengl", EntryPoint = "glDeletePerfMonitorsAMD")]
-        static abstract uint DeletePerfMonitorsAMD();
+        static abstract void DeletePerfMonitorsAMD(uint n, Ref<uint> monitors);
 
         [NativeName("glDeletePerfQueryINTEL")]
         [SupportedApiProfile("gl", ["GL_INTEL_performance_query"])]
@@ -15446,6 +15446,11 @@ Ref<float> points
         [NativeFunction("opengl", EntryPoint = "glDeleteProgramPipelines")]
         static abstract void DeleteProgramPipeline(uint pipelines);
 
+        [NativeName("glDeleteProgramPipelinesEXT")]
+        [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteProgramPipelinesEXT")]
+        static abstract void DeleteProgramPipelineEXT(uint pipelines);
+
         [NativeName("glDeleteProgramPipelines")]
         [SupportedApiProfile(
             "gl",
@@ -15516,11 +15521,6 @@ Ref<float> points
         [NativeFunction("opengl", EntryPoint = "glDeleteProgramPipelinesEXT")]
         static abstract void DeleteProgramPipelinesEXT(uint n, Ref<uint> pipelines);
 
-        [NativeName("glDeleteProgramPipelinesEXT")]
-        [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteProgramPipelinesEXT")]
-        static abstract void DeleteProgramPipelinesEXT(uint pipelines);
-
         [NativeName("glDeleteProgramsARB")]
         [SupportedApiProfile("gl", ["GL_ARB_fragment_program", "GL_ARB_vertex_program"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteProgramsARB")]
@@ -15649,11 +15649,6 @@ Ref<float> points
         [NativeFunction("opengl", EntryPoint = "glDeleteQueriesARB")]
         static abstract void DeleteQueriesARB(uint n, Ref<uint> ids);
 
-        [NativeName("glDeleteQueriesARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteQueriesARB")]
-        static abstract void DeleteQueriesARB(uint ids);
-
         [NativeName("glDeleteQueriesEXT")]
         [SupportedApiProfile(
             "gles2",
@@ -15670,14 +15665,6 @@ Ref<float> points
         [NativeFunction("opengl", EntryPoint = "glDeleteQueriesEXT")]
         static abstract void DeleteQueriesEXT(uint n, Ref<uint> ids);
 
-        [NativeName("glDeleteQueriesEXT")]
-        [SupportedApiProfile(
-            "gles2",
-            ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
-        )]
-        [NativeFunction("opengl", EntryPoint = "glDeleteQueriesEXT")]
-        static abstract void DeleteQueriesEXT(uint ids);
-
         [NativeName("glDeleteQueries")]
         [SupportedApiProfile(
             "gl",
@@ -15722,6 +15709,19 @@ Ref<float> points
         [NativeFunction("opengl", EntryPoint = "glDeleteQueries")]
         static abstract void DeleteQuery(uint ids);
 
+        [NativeName("glDeleteQueriesARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteQueriesARB")]
+        static abstract void DeleteQueryARB(uint ids);
+
+        [NativeName("glDeleteQueriesEXT")]
+        [SupportedApiProfile(
+            "gles2",
+            ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
+        )]
+        [NativeFunction("opengl", EntryPoint = "glDeleteQueriesEXT")]
+        static abstract void DeleteQueryEXT(uint ids);
+
         [NativeName("glDeleteQueryResourceTagNV")]
         [SupportedApiProfile("gl", ["GL_NV_query_resource_tag"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteQueryResourceTagNV")]
@@ -15782,6 +15782,16 @@ Ref<float> points
         [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffers")]
         static abstract void DeleteRenderbuffer(uint renderbuffers);
 
+        [NativeName("glDeleteRenderbuffersEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersEXT")]
+        static abstract void DeleteRenderbufferEXT(uint renderbuffers);
+
+        [NativeName("glDeleteRenderbuffersOES")]
+        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")]
+        static abstract void DeleteRenderbufferOES(uint renderbuffers);
+
         [NativeName("glDeleteRenderbuffers")]
         [SupportedApiProfile(
             "gl",
@@ -15882,11 +15892,6 @@ Ref<float> points
         [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersEXT")]
         static abstract void DeleteRenderbuffersEXT(uint n, Ref<uint> renderbuffers);
 
-        [NativeName("glDeleteRenderbuffersEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersEXT")]
-        static abstract void DeleteRenderbuffersEXT(uint renderbuffers);
-
         [NativeName("glDeleteRenderbuffersOES")]
         [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")]
@@ -15897,11 +15902,6 @@ Ref<float> points
         [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")]
         static abstract void DeleteRenderbuffersOES(uint n, Ref<uint> renderbuffers);
 
-        [NativeName("glDeleteRenderbuffersOES")]
-        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")]
-        static abstract void DeleteRenderbuffersOES(uint renderbuffers);
-
         [NativeName("glDeleteSamplers")]
         [SupportedApiProfile(
             "gl",
@@ -16038,19 +16038,19 @@ Ref<float> points
         [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
         [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteSemaphoresEXT")]
-        static abstract void DeleteSemaphoresEXT(uint n, uint* semaphores);
+        static abstract void DeleteSemaphoreEXT(uint semaphores);
 
         [NativeName("glDeleteSemaphoresEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
         [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteSemaphoresEXT")]
-        static abstract void DeleteSemaphoresEXT(uint n, Ref<uint> semaphores);
+        static abstract void DeleteSemaphoresEXT(uint n, uint* semaphores);
 
         [NativeName("glDeleteSemaphoresEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
         [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteSemaphoresEXT")]
-        static abstract void DeleteSemaphoresEXT(uint semaphores);
+        static abstract void DeleteSemaphoresEXT(uint n, Ref<uint> semaphores);
 
         [NativeName("glDeleteShader")]
         [SupportedApiProfile(
@@ -16103,19 +16103,19 @@ Ref<float> points
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
         [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteStatesNV")]
-        static abstract void DeleteStatesNV(uint n, uint* states);
+        static abstract void DeleteStateNV(uint states);
 
         [NativeName("glDeleteStatesNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
         [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteStatesNV")]
-        static abstract void DeleteStatesNV(uint n, Ref<uint> states);
+        static abstract void DeleteStatesNV(uint n, uint* states);
 
         [NativeName("glDeleteStatesNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
         [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteStatesNV")]
-        static abstract void DeleteStatesNV(uint states);
+        static abstract void DeleteStatesNV(uint n, Ref<uint> states);
 
         [NativeName("glDeleteSync")]
         [SupportedApiProfile(
@@ -16259,6 +16259,11 @@ Ref<float> points
         [NativeFunction("opengl", EntryPoint = "glDeleteTextures")]
         static abstract void DeleteTexture(uint textures);
 
+        [NativeName("glDeleteTexturesEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_texture_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteTexturesEXT")]
+        static abstract void DeleteTextureEXT(uint textures);
+
         [NativeName("glDeleteTextures")]
         [SupportedApiProfile(
             "gl",
@@ -16385,11 +16390,6 @@ Ref<float> points
         [NativeFunction("opengl", EntryPoint = "glDeleteTexturesEXT")]
         static abstract void DeleteTexturesEXT(uint n, Ref<uint> textures);
 
-        [NativeName("glDeleteTexturesEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_texture_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteTexturesEXT")]
-        static abstract void DeleteTexturesEXT(uint textures);
-
         [NativeName("glDeleteTransformFeedbacks")]
         [SupportedApiProfile(
             "gl",
@@ -16422,6 +16422,11 @@ Ref<float> points
         [NativeFunction("opengl", EntryPoint = "glDeleteTransformFeedbacks")]
         static abstract void DeleteTransformFeedback(uint ids);
 
+        [NativeName("glDeleteTransformFeedbacksNV")]
+        [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteTransformFeedbacksNV")]
+        static abstract void DeleteTransformFeedbackNV(uint ids);
+
         [NativeName("glDeleteTransformFeedbacks")]
         [SupportedApiProfile(
             "gl",
@@ -16496,11 +16501,6 @@ Ref<float> points
         [NativeFunction("opengl", EntryPoint = "glDeleteTransformFeedbacksNV")]
         static abstract void DeleteTransformFeedbacksNV(uint n, Ref<uint> ids);
 
-        [NativeName("glDeleteTransformFeedbacksNV")]
-        [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteTransformFeedbacksNV")]
-        static abstract void DeleteTransformFeedbacksNV(uint ids);
-
         [NativeName("glDeleteVertexArrays")]
         [SupportedApiProfile(
             "gl",
@@ -16541,6 +16541,17 @@ Ref<float> points
         [NativeFunction("opengl", EntryPoint = "glDeleteVertexArrays")]
         static abstract void DeleteVertexArray(uint arrays);
 
+        [NativeName("glDeleteVertexArraysAPPLE")]
+        [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysAPPLE")]
+        static abstract void DeleteVertexArrayAPPLE(uint arrays);
+
+        [NativeName("glDeleteVertexArraysOES")]
+        [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
+        [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
+        [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")]
+        static abstract void DeleteVertexArrayOES(uint arrays);
+
         [NativeName("glDeleteVertexArrays")]
         [SupportedApiProfile(
             "gl",
@@ -16631,11 +16642,6 @@ Ref<float> points
         [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysAPPLE")]
         static abstract void DeleteVertexArraysAPPLE(uint n, Ref<uint> arrays);
 
-        [NativeName("glDeleteVertexArraysAPPLE")]
-        [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysAPPLE")]
-        static abstract void DeleteVertexArraysAPPLE(uint arrays);
-
         [NativeName("glDeleteVertexArraysOES")]
         [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
         [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
@@ -16648,12 +16654,6 @@ Ref<float> points
         [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")]
         static abstract void DeleteVertexArraysOES(uint n, Ref<uint> arrays);
 
-        [NativeName("glDeleteVertexArraysOES")]
-        [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
-        [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
-        [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")]
-        static abstract void DeleteVertexArraysOES(uint arrays);
-
         [NativeName("glDeleteVertexShaderEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])]
         [NativeFunction("opengl", EntryPoint = "glDeleteVertexShaderEXT")]
@@ -18476,6 +18476,46 @@ uint primcount
         [NativeFunction("opengl", EntryPoint = "glDrawBuffers")]
         static abstract void DrawBuffer(DrawBufferMode bufs);
 
+        [NativeName("glDrawBuffersARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
+        static abstract void DrawBufferARB(uint bufs);
+
+        [NativeName("glDrawBuffersARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
+        static abstract void DrawBufferARB(GLEnum bufs);
+
+        [NativeName("glDrawBuffersARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
+        static abstract void DrawBufferARB(DrawBufferMode bufs);
+
+        [NativeName("glDrawBuffersATI")]
+        [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
+        static abstract void DrawBufferATI(uint bufs);
+
+        [NativeName("glDrawBuffersATI")]
+        [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
+        static abstract void DrawBufferATI(GLEnum bufs);
+
+        [NativeName("glDrawBuffersATI")]
+        [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
+        static abstract void DrawBufferATI(DrawBufferMode bufs);
+
+        [NativeName("glDrawBuffersEXT")]
+        [SupportedApiProfile("gles2", ["GL_EXT_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersEXT")]
+        static abstract void DrawBufferEXT(uint bufs);
+
+        [NativeName("glDrawBuffersNV")]
+        [SupportedApiProfile("gles2", ["GL_NV_draw_buffers"])]
+        [NativeFunction("opengl", EntryPoint = "glDrawBuffersNV")]
+        static abstract void DrawBufferNV(uint bufs);
+
         [NativeName("glDrawBuffers")]
         [SupportedApiProfile(
             "gl",
@@ -18654,31 +18694,16 @@ uint primcount
         [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
         static abstract void DrawBuffersARB(uint n, Ref<uint> bufs);
 
-        [NativeName("glDrawBuffersARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
-        static abstract void DrawBuffersARB(uint bufs);
-
         [NativeName("glDrawBuffersARB")]
         [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
         [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
         static abstract void DrawBuffersARB(uint n, Ref<GLEnum> bufs);
 
-        [NativeName("glDrawBuffersARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
-        static abstract void DrawBuffersARB(GLEnum bufs);
-
         [NativeName("glDrawBuffersARB")]
         [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
         [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
         static abstract void DrawBuffersARB(uint n, Ref<DrawBufferMode> bufs);
 
-        [NativeName("glDrawBuffersARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
-        static abstract void DrawBuffersARB(DrawBufferMode bufs);
-
         [NativeName("glDrawBuffersATI")]
         [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
         [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
@@ -18689,31 +18714,16 @@ uint primcount
         [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
         static abstract void DrawBuffersATI(uint n, Ref<uint> bufs);
 
-        [NativeName("glDrawBuffersATI")]
-        [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
-        static abstract void DrawBuffersATI(uint bufs);
-
         [NativeName("glDrawBuffersATI")]
         [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
         [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
         static abstract void DrawBuffersATI(uint n, Ref<GLEnum> bufs);
 
-        [NativeName("glDrawBuffersATI")]
-        [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
-        static abstract void DrawBuffersATI(GLEnum bufs);
-
         [NativeName("glDrawBuffersATI")]
         [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
         [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
         static abstract void DrawBuffersATI(uint n, Ref<DrawBufferMode> bufs);
 
-        [NativeName("glDrawBuffersATI")]
-        [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
-        static abstract void DrawBuffersATI(DrawBufferMode bufs);
-
         [NativeName("glDrawBuffersEXT")]
         [SupportedApiProfile("gles2", ["GL_EXT_draw_buffers"])]
         [NativeFunction("opengl", EntryPoint = "glDrawBuffersEXT")]
@@ -18724,11 +18734,6 @@ uint primcount
         [NativeFunction("opengl", EntryPoint = "glDrawBuffersEXT")]
         static abstract void DrawBuffersEXT(uint n, Ref<uint> bufs);
 
-        [NativeName("glDrawBuffersEXT")]
-        [SupportedApiProfile("gles2", ["GL_EXT_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersEXT")]
-        static abstract void DrawBuffersEXT(uint bufs);
-
         [NativeName("glDrawBuffersIndexedEXT")]
         [SupportedApiProfile("gles2", ["GL_EXT_multiview_draw_buffers"])]
         [NativeFunction("opengl", EntryPoint = "glDrawBuffersIndexedEXT")]
@@ -18749,11 +18754,6 @@ uint primcount
         [NativeFunction("opengl", EntryPoint = "glDrawBuffersNV")]
         static abstract void DrawBuffersNV(uint n, Ref<uint> bufs);
 
-        [NativeName("glDrawBuffersNV")]
-        [SupportedApiProfile("gles2", ["GL_NV_draw_buffers"])]
-        [NativeFunction("opengl", EntryPoint = "glDrawBuffersNV")]
-        static abstract void DrawBuffersNV(uint bufs);
-
         [NativeName("glDrawCommandsAddressNV")]
         [SupportedApiProfile("gl", ["GL_NV_command_list"])]
         [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
@@ -22322,6 +22322,12 @@ Ref<float> @params
         [NativeFunction("opengl", EntryPoint = "glExtGetBufferPointervQCOM")]
         static abstract void ExtGetBufferPointerQCOM(uint target, Ref2D @params);
 
+        [NativeName("glExtGetBuffersQCOM")]
+        [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
+        [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
+        [NativeFunction("opengl", EntryPoint = "glExtGetBuffersQCOM")]
+        static abstract uint ExtGetBufferQCOM(Ref<int> numBuffers);
+
         [NativeName("glExtGetBuffersQCOM")]
         [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
         [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
@@ -22338,11 +22344,11 @@ static abstract void ExtGetBuffersQCOM(
             Ref<int> numBuffers
         );
 
-        [NativeName("glExtGetBuffersQCOM")]
+        [NativeName("glExtGetFramebuffersQCOM")]
         [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
         [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
-        [NativeFunction("opengl", EntryPoint = "glExtGetBuffersQCOM")]
-        static abstract uint ExtGetBuffersQCOM(Ref<int> numBuffers);
+        [NativeFunction("opengl", EntryPoint = "glExtGetFramebuffersQCOM")]
+        static abstract uint ExtGetFramebufferQCOM(Ref<int> numFramebuffers);
 
         [NativeName("glExtGetFramebuffersQCOM")]
         [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
@@ -22364,12 +22370,6 @@ static abstract void ExtGetFramebuffersQCOM(
             Ref<int> numFramebuffers
         );
 
-        [NativeName("glExtGetFramebuffersQCOM")]
-        [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
-        [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
-        [NativeFunction("opengl", EntryPoint = "glExtGetFramebuffersQCOM")]
-        static abstract uint ExtGetFramebuffersQCOM(Ref<int> numFramebuffers);
-
         [NativeName("glExtGetProgramBinarySourceQCOM")]
         [SupportedApiProfile("gles2", ["GL_QCOM_extended_get2"])]
         [SupportedApiProfile("gles1", ["GL_QCOM_extended_get2"])]
@@ -22414,6 +22414,12 @@ Ref<int> numPrograms
         [NativeFunction("opengl", EntryPoint = "glExtGetProgramsQCOM")]
         static abstract uint ExtGetProgramQCOM(Ref<int> numPrograms);
 
+        [NativeName("glExtGetRenderbuffersQCOM")]
+        [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
+        [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
+        [NativeFunction("opengl", EntryPoint = "glExtGetRenderbuffersQCOM")]
+        static abstract uint ExtGetRenderbufferQCOM(Ref<int> numRenderbuffers);
+
         [NativeName("glExtGetRenderbuffersQCOM")]
         [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
         [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
@@ -22434,11 +22440,11 @@ static abstract void ExtGetRenderbuffersQCOM(
             Ref<int> numRenderbuffers
         );
 
-        [NativeName("glExtGetRenderbuffersQCOM")]
-        [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
-        [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
-        [NativeFunction("opengl", EntryPoint = "glExtGetRenderbuffersQCOM")]
-        static abstract uint ExtGetRenderbuffersQCOM(Ref<int> numRenderbuffers);
+        [NativeName("glExtGetShadersQCOM")]
+        [SupportedApiProfile("gles2", ["GL_QCOM_extended_get2"])]
+        [SupportedApiProfile("gles1", ["GL_QCOM_extended_get2"])]
+        [NativeFunction("opengl", EntryPoint = "glExtGetShadersQCOM")]
+        static abstract uint ExtGetShaderQCOM(Ref<int> numShaders);
 
         [NativeName("glExtGetShadersQCOM")]
         [SupportedApiProfile("gles2", ["GL_QCOM_extended_get2"])]
@@ -22456,12 +22462,6 @@ static abstract void ExtGetShadersQCOM(
             Ref<int> numShaders
         );
 
-        [NativeName("glExtGetShadersQCOM")]
-        [SupportedApiProfile("gles2", ["GL_QCOM_extended_get2"])]
-        [SupportedApiProfile("gles1", ["GL_QCOM_extended_get2"])]
-        [NativeFunction("opengl", EntryPoint = "glExtGetShadersQCOM")]
-        static abstract uint ExtGetShadersQCOM(Ref<int> numShaders);
-
         [NativeName("glExtGetTexLevelParameterivQCOM")]
         [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
         [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
@@ -23957,31 +23957,31 @@ Constant<uint, GLEnum, DrawBufferMode> mode
         [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
         [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
         [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
-        static abstract void FramebufferDrawBuffersEXT(uint framebuffer, uint n, uint* bufs);
+        static abstract void FramebufferDrawBufferEXT(uint framebuffer, GLEnum bufs);
 
         [NativeName("glFramebufferDrawBuffersEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
         [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
         [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
-        static abstract void FramebufferDrawBuffersEXT(uint framebuffer, uint n, Ref<uint> bufs);
+        static abstract void FramebufferDrawBufferEXT(uint framebuffer, DrawBufferMode bufs);
 
         [NativeName("glFramebufferDrawBuffersEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
         [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
         [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
-        static abstract void FramebufferDrawBuffersEXT(uint framebuffer, uint bufs);
+        static abstract void FramebufferDrawBuffersEXT(uint framebuffer, uint n, uint* bufs);
 
         [NativeName("glFramebufferDrawBuffersEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
         [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
         [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
-        static abstract void FramebufferDrawBuffersEXT(uint framebuffer, uint n, Ref<GLEnum> bufs);
+        static abstract void FramebufferDrawBuffersEXT(uint framebuffer, uint n, Ref<uint> bufs);
 
         [NativeName("glFramebufferDrawBuffersEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
         [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
         [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
-        static abstract void FramebufferDrawBuffersEXT(uint framebuffer, GLEnum bufs);
+        static abstract void FramebufferDrawBuffersEXT(uint framebuffer, uint n, Ref<GLEnum> bufs);
 
         [NativeName("glFramebufferDrawBuffersEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
@@ -23993,12 +23993,6 @@ static abstract void FramebufferDrawBuffersEXT(
             Ref<DrawBufferMode> bufs
         );
 
-        [NativeName("glFramebufferDrawBuffersEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
-        [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
-        [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
-        static abstract void FramebufferDrawBuffersEXT(uint framebuffer, DrawBufferMode bufs);
-
         [NativeName("glFramebufferFetchBarrierEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_shader_framebuffer_fetch_non_coherent"])]
         [SupportedApiProfile("glcore", ["GL_EXT_shader_framebuffer_fetch_non_coherent"])]
@@ -25517,6 +25511,11 @@ double zFar
         [NativeFunction("opengl", EntryPoint = "glGenBuffers")]
         static abstract uint GenBuffer();
 
+        [NativeName("glGenBuffersARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenBuffersARB")]
+        static abstract uint GenBufferARB();
+
         [NativeName("glGenBuffers")]
         [SupportedApiProfile(
             "gl",
@@ -25627,11 +25626,6 @@ double zFar
         [NativeFunction("opengl", EntryPoint = "glGenBuffersARB")]
         static abstract void GenBuffersARB(uint n, Ref<uint> buffers);
 
-        [NativeName("glGenBuffersARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenBuffersARB")]
-        static abstract uint GenBuffersARB();
-
         [NativeName("glGenerateMipmap")]
         [SupportedApiProfile(
             "gl",
@@ -25789,17 +25783,24 @@ Constant<uint, GLEnum, TextureTarget> target
         [NativeName("glGenFencesAPPLE")]
         [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
         [NativeFunction("opengl", EntryPoint = "glGenFencesAPPLE")]
-        static abstract void GenFencesAPPLE(uint n, uint* fences);
+        static abstract uint GenFenceAPPLE();
+
+        [NativeName("glGenFencesNV")]
+        [SupportedApiProfile("gl", ["GL_NV_fence"])]
+        [SupportedApiProfile("gles2", ["GL_NV_fence"])]
+        [SupportedApiProfile("gles1", ["GL_NV_fence"])]
+        [NativeFunction("opengl", EntryPoint = "glGenFencesNV")]
+        static abstract uint GenFenceNV();
 
         [NativeName("glGenFencesAPPLE")]
         [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
         [NativeFunction("opengl", EntryPoint = "glGenFencesAPPLE")]
-        static abstract void GenFencesAPPLE(uint n, Ref<uint> fences);
+        static abstract void GenFencesAPPLE(uint n, uint* fences);
 
         [NativeName("glGenFencesAPPLE")]
         [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
         [NativeFunction("opengl", EntryPoint = "glGenFencesAPPLE")]
-        static abstract uint GenFencesAPPLE();
+        static abstract void GenFencesAPPLE(uint n, Ref<uint> fences);
 
         [NativeName("glGenFencesNV")]
         [SupportedApiProfile("gl", ["GL_NV_fence"])]
@@ -25815,13 +25816,6 @@ Constant<uint, GLEnum, TextureTarget> target
         [NativeFunction("opengl", EntryPoint = "glGenFencesNV")]
         static abstract void GenFencesNV(uint n, Ref<uint> fences);
 
-        [NativeName("glGenFencesNV")]
-        [SupportedApiProfile("gl", ["GL_NV_fence"])]
-        [SupportedApiProfile("gles2", ["GL_NV_fence"])]
-        [SupportedApiProfile("gles1", ["GL_NV_fence"])]
-        [NativeFunction("opengl", EntryPoint = "glGenFencesNV")]
-        static abstract uint GenFencesNV();
-
         [NativeName("glGenFragmentShadersATI")]
         [SupportedApiProfile("gl", ["GL_ATI_fragment_shader"])]
         [NativeFunction("opengl", EntryPoint = "glGenFragmentShadersATI")]
@@ -25872,6 +25866,16 @@ Constant<uint, GLEnum, TextureTarget> target
         [NativeFunction("opengl", EntryPoint = "glGenFramebuffers")]
         static abstract uint GenFramebuffer();
 
+        [NativeName("glGenFramebuffersEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenFramebuffersEXT")]
+        static abstract uint GenFramebufferEXT();
+
+        [NativeName("glGenFramebuffersOES")]
+        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")]
+        static abstract uint GenFramebufferOES();
+
         [NativeName("glGenFramebuffers")]
         [SupportedApiProfile(
             "gl",
@@ -25972,11 +25976,6 @@ Constant<uint, GLEnum, TextureTarget> target
         [NativeFunction("opengl", EntryPoint = "glGenFramebuffersEXT")]
         static abstract void GenFramebuffersEXT(uint n, Ref<uint> framebuffers);
 
-        [NativeName("glGenFramebuffersEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenFramebuffersEXT")]
-        static abstract uint GenFramebuffersEXT();
-
         [NativeName("glGenFramebuffersOES")]
         [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
         [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")]
@@ -25987,11 +25986,6 @@ Constant<uint, GLEnum, TextureTarget> target
         [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")]
         static abstract void GenFramebuffersOES(uint n, Ref<uint> framebuffers);
 
-        [NativeName("glGenFramebuffersOES")]
-        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")]
-        static abstract uint GenFramebuffersOES();
-
         [NativeName("glGenLists")]
         [SupportedApiProfile(
             "gl",
@@ -26024,17 +26018,17 @@ Constant<uint, GLEnum, TextureTarget> target
         [NativeName("glGenNamesAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
         [NativeFunction("opengl", EntryPoint = "glGenNamesAMD")]
-        static abstract void GenNamesAMD(uint identifier, uint num, uint* names);
+        static abstract uint GenNameAMD(uint identifier);
 
         [NativeName("glGenNamesAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
         [NativeFunction("opengl", EntryPoint = "glGenNamesAMD")]
-        static abstract void GenNamesAMD(uint identifier, uint num, Ref<uint> names);
+        static abstract void GenNamesAMD(uint identifier, uint num, uint* names);
 
         [NativeName("glGenNamesAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
         [NativeFunction("opengl", EntryPoint = "glGenNamesAMD")]
-        static abstract uint GenNamesAMD(uint identifier);
+        static abstract void GenNamesAMD(uint identifier, uint num, Ref<uint> names);
 
         [NativeName("glGenOcclusionQueriesNV")]
         [SupportedApiProfile("gl", ["GL_NV_occlusion_query"])]
@@ -26049,7 +26043,7 @@ Constant<uint, GLEnum, TextureTarget> target
         [NativeName("glGenOcclusionQueriesNV")]
         [SupportedApiProfile("gl", ["GL_NV_occlusion_query"])]
         [NativeFunction("opengl", EntryPoint = "glGenOcclusionQueriesNV")]
-        static abstract uint GenOcclusionQueriesNV();
+        static abstract uint GenOcclusionQueryNV();
 
         [NativeName("glGenPathsNV")]
         [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
@@ -26063,21 +26057,21 @@ Constant<uint, GLEnum, TextureTarget> target
         [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
         [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
         [NativeFunction("opengl", EntryPoint = "glGenPerfMonitorsAMD")]
-        static abstract void GenPerfMonitorsAMD(uint n, uint* monitors);
+        static abstract uint GenPerfMonitorAMD();
 
         [NativeName("glGenPerfMonitorsAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
         [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
         [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
         [NativeFunction("opengl", EntryPoint = "glGenPerfMonitorsAMD")]
-        static abstract void GenPerfMonitorsAMD(uint n, Ref<uint> monitors);
+        static abstract void GenPerfMonitorsAMD(uint n, uint* monitors);
 
         [NativeName("glGenPerfMonitorsAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
         [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
         [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
         [NativeFunction("opengl", EntryPoint = "glGenPerfMonitorsAMD")]
-        static abstract uint GenPerfMonitorsAMD();
+        static abstract void GenPerfMonitorsAMD(uint n, Ref<uint> monitors);
 
         [NativeName("glGenProgramPipelines")]
         [SupportedApiProfile(
@@ -26109,6 +26103,11 @@ Constant<uint, GLEnum, TextureTarget> target
         [NativeFunction("opengl", EntryPoint = "glGenProgramPipelines")]
         static abstract uint GenProgramPipeline();
 
+        [NativeName("glGenProgramPipelinesEXT")]
+        [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])]
+        [NativeFunction("opengl", EntryPoint = "glGenProgramPipelinesEXT")]
+        static abstract uint GenProgramPipelineEXT();
+
         [NativeName("glGenProgramPipelines")]
         [SupportedApiProfile(
             "gl",
@@ -26179,11 +26178,6 @@ Constant<uint, GLEnum, TextureTarget> target
         [NativeFunction("opengl", EntryPoint = "glGenProgramPipelinesEXT")]
         static abstract void GenProgramPipelinesEXT(uint n, Ref<uint> pipelines);
 
-        [NativeName("glGenProgramPipelinesEXT")]
-        [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])]
-        [NativeFunction("opengl", EntryPoint = "glGenProgramPipelinesEXT")]
-        static abstract uint GenProgramPipelinesEXT();
-
         [NativeName("glGenProgramsARB")]
         [SupportedApiProfile("gl", ["GL_ARB_fragment_program", "GL_ARB_vertex_program"])]
         [NativeFunction("opengl", EntryPoint = "glGenProgramsARB")]
@@ -26312,11 +26306,6 @@ Constant<uint, GLEnum, TextureTarget> target
         [NativeFunction("opengl", EntryPoint = "glGenQueriesARB")]
         static abstract void GenQueriesARB(uint n, Ref<uint> ids);
 
-        [NativeName("glGenQueriesARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
-        [NativeFunction("opengl", EntryPoint = "glGenQueriesARB")]
-        static abstract uint GenQueriesARB();
-
         [NativeName("glGenQueriesEXT")]
         [SupportedApiProfile(
             "gles2",
@@ -26333,14 +26322,6 @@ Constant<uint, GLEnum, TextureTarget> target
         [NativeFunction("opengl", EntryPoint = "glGenQueriesEXT")]
         static abstract void GenQueriesEXT(uint n, Ref<uint> ids);
 
-        [NativeName("glGenQueriesEXT")]
-        [SupportedApiProfile(
-            "gles2",
-            ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
-        )]
-        [NativeFunction("opengl", EntryPoint = "glGenQueriesEXT")]
-        static abstract uint GenQueriesEXT();
-
         [NativeName("glGenQueries")]
         [SupportedApiProfile(
             "gl",
@@ -26385,6 +26366,19 @@ Constant<uint, GLEnum, TextureTarget> target
         [NativeFunction("opengl", EntryPoint = "glGenQueries")]
         static abstract uint GenQuery();
 
+        [NativeName("glGenQueriesARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
+        [NativeFunction("opengl", EntryPoint = "glGenQueriesARB")]
+        static abstract uint GenQueryARB();
+
+        [NativeName("glGenQueriesEXT")]
+        [SupportedApiProfile(
+            "gles2",
+            ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
+        )]
+        [NativeFunction("opengl", EntryPoint = "glGenQueriesEXT")]
+        static abstract uint GenQueryEXT();
+
         [NativeName("glGenQueryResourceTagNV")]
         [SupportedApiProfile("gl", ["GL_NV_query_resource_tag"])]
         [NativeFunction("opengl", EntryPoint = "glGenQueryResourceTagNV")]
@@ -26445,6 +26439,16 @@ Constant<uint, GLEnum, TextureTarget> target
         [NativeFunction("opengl", EntryPoint = "glGenRenderbuffers")]
         static abstract uint GenRenderbuffer();
 
+        [NativeName("glGenRenderbuffersEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersEXT")]
+        static abstract uint GenRenderbufferEXT();
+
+        [NativeName("glGenRenderbuffersOES")]
+        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")]
+        static abstract uint GenRenderbufferOES();
+
         [NativeName("glGenRenderbuffers")]
         [SupportedApiProfile(
             "gl",
@@ -26545,11 +26549,6 @@ Constant<uint, GLEnum, TextureTarget> target
         [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersEXT")]
         static abstract void GenRenderbuffersEXT(uint n, Ref<uint> renderbuffers);
 
-        [NativeName("glGenRenderbuffersEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersEXT")]
-        static abstract uint GenRenderbuffersEXT();
-
         [NativeName("glGenRenderbuffersOES")]
         [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
         [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")]
@@ -26560,11 +26559,6 @@ Constant<uint, GLEnum, TextureTarget> target
         [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")]
         static abstract void GenRenderbuffersOES(uint n, Ref<uint> renderbuffers);
 
-        [NativeName("glGenRenderbuffersOES")]
-        [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")]
-        static abstract uint GenRenderbuffersOES();
-
         [NativeName("glGenSamplers")]
         [SupportedApiProfile(
             "gl",
@@ -26701,19 +26695,19 @@ Constant<uint, GLEnum, TextureTarget> target
         [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
         [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])]
         [NativeFunction("opengl", EntryPoint = "glGenSemaphoresEXT")]
-        static abstract void GenSemaphoresEXT(uint n, uint* semaphores);
+        static abstract uint GenSemaphoreEXT();
 
         [NativeName("glGenSemaphoresEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
         [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])]
         [NativeFunction("opengl", EntryPoint = "glGenSemaphoresEXT")]
-        static abstract void GenSemaphoresEXT(uint n, Ref<uint> semaphores);
+        static abstract void GenSemaphoresEXT(uint n, uint* semaphores);
 
         [NativeName("glGenSemaphoresEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
         [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])]
         [NativeFunction("opengl", EntryPoint = "glGenSemaphoresEXT")]
-        static abstract uint GenSemaphoresEXT();
+        static abstract void GenSemaphoresEXT(uint n, Ref<uint> semaphores);
 
         [NativeName("glGenSymbolsEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])]
@@ -26793,6 +26787,11 @@ uint components
         [NativeFunction("opengl", EntryPoint = "glGenTextures")]
         static abstract uint GenTexture();
 
+        [NativeName("glGenTexturesEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_texture_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenTexturesEXT")]
+        static abstract uint GenTextureEXT();
+
         [NativeName("glGenTextures")]
         [SupportedApiProfile(
             "gl",
@@ -26919,11 +26918,6 @@ uint components
         [NativeFunction("opengl", EntryPoint = "glGenTexturesEXT")]
         static abstract void GenTexturesEXT(uint n, Ref<uint> textures);
 
-        [NativeName("glGenTexturesEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_texture_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenTexturesEXT")]
-        static abstract uint GenTexturesEXT();
-
         [NativeName("glGenTransformFeedbacks")]
         [SupportedApiProfile(
             "gl",
@@ -26956,6 +26950,11 @@ uint components
         [NativeFunction("opengl", EntryPoint = "glGenTransformFeedbacks")]
         static abstract uint GenTransformFeedback();
 
+        [NativeName("glGenTransformFeedbacksNV")]
+        [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])]
+        [NativeFunction("opengl", EntryPoint = "glGenTransformFeedbacksNV")]
+        static abstract uint GenTransformFeedbackNV();
+
         [NativeName("glGenTransformFeedbacks")]
         [SupportedApiProfile(
             "gl",
@@ -27030,11 +27029,6 @@ uint components
         [NativeFunction("opengl", EntryPoint = "glGenTransformFeedbacksNV")]
         static abstract void GenTransformFeedbacksNV(uint n, Ref<uint> ids);
 
-        [NativeName("glGenTransformFeedbacksNV")]
-        [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])]
-        [NativeFunction("opengl", EntryPoint = "glGenTransformFeedbacksNV")]
-        static abstract uint GenTransformFeedbacksNV();
-
         [NativeName("glGenVertexArrays")]
         [SupportedApiProfile(
             "gl",
@@ -27075,6 +27069,17 @@ uint components
         [NativeFunction("opengl", EntryPoint = "glGenVertexArrays")]
         static abstract uint GenVertexArray();
 
+        [NativeName("glGenVertexArraysAPPLE")]
+        [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenVertexArraysAPPLE")]
+        static abstract uint GenVertexArrayAPPLE();
+
+        [NativeName("glGenVertexArraysOES")]
+        [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
+        [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
+        [NativeFunction("opengl", EntryPoint = "glGenVertexArraysOES")]
+        static abstract uint GenVertexArrayOES();
+
         [NativeName("glGenVertexArrays")]
         [SupportedApiProfile(
             "gl",
@@ -27165,11 +27170,6 @@ uint components
         [NativeFunction("opengl", EntryPoint = "glGenVertexArraysAPPLE")]
         static abstract void GenVertexArraysAPPLE(uint n, Ref<uint> arrays);
 
-        [NativeName("glGenVertexArraysAPPLE")]
-        [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenVertexArraysAPPLE")]
-        static abstract uint GenVertexArraysAPPLE();
-
         [NativeName("glGenVertexArraysOES")]
         [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
         [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
@@ -27182,12 +27182,6 @@ uint components
         [NativeFunction("opengl", EntryPoint = "glGenVertexArraysOES")]
         static abstract void GenVertexArraysOES(uint n, Ref<uint> arrays);
 
-        [NativeName("glGenVertexArraysOES")]
-        [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
-        [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
-        [NativeFunction("opengl", EntryPoint = "glGenVertexArraysOES")]
-        static abstract uint GenVertexArraysOES();
-
         [NativeName("glGenVertexShadersEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])]
         [NativeFunction("opengl", EntryPoint = "glGenVertexShadersEXT")]
@@ -29049,6 +29043,11 @@ static abstract int GetArrayObjectivATI(
             Constant<uint, GLEnum, ArrayObjectPNameATI> pname
         );
 
+        [NativeName("glGetAttachedObjectsARB")]
+        [SupportedApiProfile("gl", ["GL_ARB_shader_objects"])]
+        [NativeFunction("opengl", EntryPoint = "glGetAttachedObjectsARB")]
+        static abstract uint GetAttachedObjectARB(uint containerObj, Ref<uint> count);
+
         [NativeName("glGetAttachedObjectsARB")]
         [SupportedApiProfile("gl", ["GL_ARB_shader_objects"])]
         [NativeFunction("opengl", EntryPoint = "glGetAttachedObjectsARB")]
@@ -29069,11 +29068,6 @@ static abstract void GetAttachedObjectsARB(
             Ref<uint> obj
         );
 
-        [NativeName("glGetAttachedObjectsARB")]
-        [SupportedApiProfile("gl", ["GL_ARB_shader_objects"])]
-        [NativeFunction("opengl", EntryPoint = "glGetAttachedObjectsARB")]
-        static abstract uint GetAttachedObjectsARB(uint containerObj, Ref<uint> count);
-
         [NativeName("glGetAttachedShaders")]
         [SupportedApiProfile(
             "gl",
@@ -31978,6 +31972,11 @@ static abstract void GetFragmentMaterialSGIX(
             Ref<int> @params
         );
 
+        [NativeName("glGetFragmentShadingRatesEXT")]
+        [SupportedApiProfile("gles2", ["GL_EXT_fragment_shading_rate"])]
+        [NativeFunction("opengl", EntryPoint = "glGetFragmentShadingRatesEXT")]
+        static abstract uint GetFragmentShadingRateEXT(uint samples, Ref<uint> count);
+
         [NativeName("glGetFragmentShadingRatesEXT")]
         [SupportedApiProfile("gles2", ["GL_EXT_fragment_shading_rate"])]
         [NativeFunction("opengl", EntryPoint = "glGetFragmentShadingRatesEXT")]
@@ -31998,11 +31997,6 @@ static abstract void GetFragmentShadingRatesEXT(
             Ref<uint> shadingRates
         );
 
-        [NativeName("glGetFragmentShadingRatesEXT")]
-        [SupportedApiProfile("gles2", ["GL_EXT_fragment_shading_rate"])]
-        [NativeFunction("opengl", EntryPoint = "glGetFragmentShadingRatesEXT")]
-        static abstract uint GetFragmentShadingRatesEXT(uint samples, Ref<uint> count);
-
         [NativeName("glGetFragmentShadingRatesEXT")]
         [SupportedApiProfile("gles2", ["GL_EXT_fragment_shading_rate"])]
         [NativeFunction("opengl", EntryPoint = "glGetFragmentShadingRatesEXT")]
@@ -36473,21 +36467,21 @@ Ref<int> value
         [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
         [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])]
         [NativeFunction("opengl", EntryPoint = "glGetPathCommandsNV")]
-        static abstract void GetPathCommandsNV(uint path, byte* commands);
+        static abstract byte GetPathCommandNV();
 
         [NativeName("glGetPathCommandsNV")]
         [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
         [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
         [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])]
         [NativeFunction("opengl", EntryPoint = "glGetPathCommandsNV")]
-        static abstract void GetPathCommandsNV(uint path, Ref<byte> commands);
+        static abstract void GetPathCommandsNV(uint path, byte* commands);
 
         [NativeName("glGetPathCommandsNV")]
         [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
         [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
         [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])]
         [NativeFunction("opengl", EntryPoint = "glGetPathCommandsNV")]
-        static abstract byte GetPathCommandsNV();
+        static abstract void GetPathCommandsNV(uint path, Ref<byte> commands);
 
         [NativeName("glGetPathCommandsNV")]
         [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
@@ -36501,21 +36495,21 @@ Ref<int> value
         [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
         [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])]
         [NativeFunction("opengl", EntryPoint = "glGetPathCoordsNV")]
-        static abstract void GetPathCoordsNV(uint path, float* coords);
+        static abstract float GetPathCoordNV();
 
         [NativeName("glGetPathCoordsNV")]
         [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
         [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
         [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])]
         [NativeFunction("opengl", EntryPoint = "glGetPathCoordsNV")]
-        static abstract void GetPathCoordsNV(uint path, Ref<float> coords);
+        static abstract void GetPathCoordsNV(uint path, float* coords);
 
         [NativeName("glGetPathCoordsNV")]
         [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
         [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
         [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])]
         [NativeFunction("opengl", EntryPoint = "glGetPathCoordsNV")]
-        static abstract float GetPathCoordsNV();
+        static abstract void GetPathCoordsNV(uint path, Ref<float> coords);
 
         [NativeName("glGetPathDashArrayNV")]
         [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
@@ -36737,6 +36731,17 @@ static abstract void GetPerfCounterInfoINTEL(
             Ref<ulong> rawCounterMaxValue
         );
 
+        [NativeName("glGetPerfMonitorCountersAMD")]
+        [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
+        [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
+        [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
+        [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorCountersAMD")]
+        static abstract uint GetPerfMonitorCounterAMD(
+            uint group,
+            Ref<int> numCounters,
+            Ref<int> maxActiveCounters
+        );
+
         [NativeName("glGetPerfMonitorCounterDataAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
         [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
@@ -36768,7 +36773,7 @@ Ref<int> bytesWritten
         [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
         [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
         [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorCounterDataAMD")]
-        static abstract int GetPerfMonitorCounterDataAMD(
+        static abstract int GetPerfMonitorCounterDatumAMD(
             uint monitor,
             uint pname,
             uint dataSize,
@@ -36825,17 +36830,6 @@ static abstract void GetPerfMonitorCountersAMD(
             Ref<uint> counters
         );
 
-        [NativeName("glGetPerfMonitorCountersAMD")]
-        [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
-        [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
-        [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
-        [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorCountersAMD")]
-        static abstract uint GetPerfMonitorCountersAMD(
-            uint group,
-            Ref<int> numCounters,
-            Ref<int> maxActiveCounters
-        );
-
         [NativeName("glGetPerfMonitorCounterStringAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
         [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
@@ -36878,25 +36872,25 @@ Ref<uint> length
         [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
         [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
         [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorGroupsAMD")]
-        static abstract void GetPerfMonitorGroupsAMD(int* numGroups, uint groupsSize, uint* groups);
+        static abstract uint GetPerfMonitorGroupAMD(Ref<int> numGroups);
 
         [NativeName("glGetPerfMonitorGroupsAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
         [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
         [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
         [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorGroupsAMD")]
-        static abstract void GetPerfMonitorGroupsAMD(
-            Ref<int> numGroups,
-            uint groupsSize,
-            Ref<uint> groups
-        );
+        static abstract void GetPerfMonitorGroupsAMD(int* numGroups, uint groupsSize, uint* groups);
 
         [NativeName("glGetPerfMonitorGroupsAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
         [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
         [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
         [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorGroupsAMD")]
-        static abstract uint GetPerfMonitorGroupsAMD(Ref<int> numGroups);
+        static abstract void GetPerfMonitorGroupsAMD(
+            Ref<int> numGroups,
+            uint groupsSize,
+            Ref<uint> groups
+        );
 
         [NativeName("glGetPerfMonitorGroupStringAMD")]
         [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
@@ -64153,23 +64147,22 @@ int length
         [NativeName("glProgramBufferParametersfvNV")]
         [SupportedApiProfile("gl", ["GL_NV_parameter_buffer_object"])]
         [NativeFunction("opengl", EntryPoint = "glProgramBufferParametersfvNV")]
-        static abstract void ProgramBufferParametersNV(
-            uint target,
+        static abstract void ProgramBufferParameterNV(
+            Constant<uint, GLEnum, ProgramTarget> target,
             uint bindingIndex,
             uint wordIndex,
-            uint count,
-            float* @params
+            float @params
         );
 
         [NativeName("glProgramBufferParametersfvNV")]
         [SupportedApiProfile("gl", ["GL_NV_parameter_buffer_object"])]
         [NativeFunction("opengl", EntryPoint = "glProgramBufferParametersfvNV")]
         static abstract void ProgramBufferParametersNV(
-            Constant<uint, GLEnum, ProgramTarget> target,
+            uint target,
             uint bindingIndex,
             uint wordIndex,
             uint count,
-            Ref<float> @params
+            float* @params
         );
 
         [NativeName("glProgramBufferParametersfvNV")]
@@ -64179,7 +64172,8 @@ static abstract void ProgramBufferParametersNV(
             Constant<uint, GLEnum, ProgramTarget> target,
             uint bindingIndex,
             uint wordIndex,
-            float @params
+            uint count,
+            Ref<float> @params
         );
 
         [NativeName("glProgramBufferParametersIivNV")]
@@ -65052,7 +65046,7 @@ Ref<uint> @params
         [NativeName("glProgramSubroutineParametersuivNV")]
         [SupportedApiProfile("gl", ["GL_NV_gpu_program5"])]
         [NativeFunction("opengl", EntryPoint = "glProgramSubroutineParametersuivNV")]
-        static abstract void ProgramSubroutineParametersNV(uint target, uint @params);
+        static abstract void ProgramSubroutineParameterNV(uint target, uint @params);
 
         [NativeName("glProgramUniform1d")]
         [SupportedApiProfile(
@@ -76145,12 +76139,10 @@ int ptrstride
         [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
         [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
         [NativeFunction("opengl", EntryPoint = "glSelectPerfMonitorCountersAMD")]
-        static abstract void SelectPerfMonitorCountersAMD(
+        static abstract uint SelectPerfMonitorCounterAMD(
             uint monitor,
-            uint enable,
-            uint group,
-            int numCounters,
-            uint* counterList
+            MaybeBool<uint> enable,
+            uint group
         );
 
         [NativeName("glSelectPerfMonitorCountersAMD")]
@@ -76160,10 +76152,10 @@ static abstract void SelectPerfMonitorCountersAMD(
         [NativeFunction("opengl", EntryPoint = "glSelectPerfMonitorCountersAMD")]
         static abstract void SelectPerfMonitorCountersAMD(
             uint monitor,
-            MaybeBool<uint> enable,
+            uint enable,
             uint group,
             int numCounters,
-            Ref<uint> counterList
+            uint* counterList
         );
 
         [NativeName("glSelectPerfMonitorCountersAMD")]
@@ -76171,10 +76163,12 @@ Ref<uint> counterList
         [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
         [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
         [NativeFunction("opengl", EntryPoint = "glSelectPerfMonitorCountersAMD")]
-        static abstract uint SelectPerfMonitorCountersAMD(
+        static abstract void SelectPerfMonitorCountersAMD(
             uint monitor,
             MaybeBool<uint> enable,
-            uint group
+            uint group,
+            int numCounters,
+            Ref<uint> counterList
         );
 
         [NativeName("glSemaphoreParameterivNV")]
@@ -80892,16 +80886,17 @@ uint mask
         [NativeName("glTexFilterFuncSGIS")]
         [SupportedApiProfile("gl", ["GL_SGIS_texture_filter4"])]
         [NativeFunction("opengl", EntryPoint = "glTexFilterFuncSGIS")]
-        static abstract void TexFilterFuncSgiSGIS(
-            Constant<uint, GLEnum, TextureTarget> target,
-            Constant<uint, GLEnum, TextureFilterSGIS> filter,
-            float weights
-        );
+        static abstract void TexFilterFuncSGIS(uint target, uint filter, uint n, float* weights);
 
         [NativeName("glTexFilterFuncSGIS")]
         [SupportedApiProfile("gl", ["GL_SGIS_texture_filter4"])]
         [NativeFunction("opengl", EntryPoint = "glTexFilterFuncSGIS")]
-        static abstract void TexFilterFuncSGIS(uint target, uint filter, uint n, float* weights);
+        static abstract void TexFilterFuncSGIS(
+            Constant<uint, GLEnum, TextureTarget> target,
+            Constant<uint, GLEnum, TextureFilterSGIS> filter,
+            uint n,
+            Ref<float> weights
+        );
 
         [NativeName("glTexFilterFuncSGIS")]
         [SupportedApiProfile("gl", ["GL_SGIS_texture_filter4"])]
@@ -80909,8 +80904,7 @@ float weights
         static abstract void TexFilterFuncSGIS(
             Constant<uint, GLEnum, TextureTarget> target,
             Constant<uint, GLEnum, TextureFilterSGIS> filter,
-            uint n,
-            Ref<float> weights
+            float weights
         );
 
         [NativeName("glTexGend")]
@@ -86108,6 +86102,42 @@ static abstract void TransformFeedbackVarying(
             Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
         );
 
+        [NativeName("glTransformFeedbackVaryingsEXT")]
+        [SupportedApiProfile("gl", ["GL_EXT_transform_feedback"])]
+        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsEXT")]
+        static abstract void TransformFeedbackVaryingEXT(
+            uint program,
+            Ref<sbyte> varyings,
+            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
+        );
+
+        [NativeName("glTransformFeedbackVaryingsNV")]
+        [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
+        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
+        static abstract void TransformFeedbackVaryingNV(
+            uint program,
+            int locations,
+            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
+        );
+
+        [NativeName("glTransformFeedbackVaryingsNV")]
+        [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
+        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
+        static abstract void TransformFeedbackVaryingNV(
+            uint program,
+            GLEnum locations,
+            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
+        );
+
+        [NativeName("glTransformFeedbackVaryingsNV")]
+        [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
+        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
+        static abstract void TransformFeedbackVaryingNV(
+            uint program,
+            TransformFeedbackTokenNV locations,
+            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
+        );
+
         [NativeName("glTransformFeedbackVaryings")]
         [SupportedApiProfile(
             "gl",
@@ -86214,15 +86244,6 @@ static abstract void TransformFeedbackVaryingsEXT(
             Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
         );
 
-        [NativeName("glTransformFeedbackVaryingsEXT")]
-        [SupportedApiProfile("gl", ["GL_EXT_transform_feedback"])]
-        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsEXT")]
-        static abstract void TransformFeedbackVaryingsEXT(
-            uint program,
-            Ref<sbyte> varyings,
-            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
-        );
-
         [NativeName("glTransformFeedbackVaryingsNV")]
         [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
         [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
@@ -86243,15 +86264,6 @@ static abstract void TransformFeedbackVaryingsNV(
             Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
         );
 
-        [NativeName("glTransformFeedbackVaryingsNV")]
-        [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
-        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
-        static abstract void TransformFeedbackVaryingsNV(
-            uint program,
-            int locations,
-            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
-        );
-
         [NativeName("glTransformFeedbackVaryingsNV")]
         [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
         [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
@@ -86262,15 +86274,6 @@ static abstract void TransformFeedbackVaryingsNV(
             Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
         );
 
-        [NativeName("glTransformFeedbackVaryingsNV")]
-        [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
-        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
-        static abstract void TransformFeedbackVaryingsNV(
-            uint program,
-            GLEnum locations,
-            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
-        );
-
         [NativeName("glTransformFeedbackVaryingsNV")]
         [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
         [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
@@ -86281,15 +86284,6 @@ static abstract void TransformFeedbackVaryingsNV(
             Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
         );
 
-        [NativeName("glTransformFeedbackVaryingsNV")]
-        [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
-        [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
-        static abstract void TransformFeedbackVaryingsNV(
-            uint program,
-            TransformFeedbackTokenNV locations,
-            Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
-        );
-
         [NativeName("glTransformPathNV")]
         [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
         [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
@@ -90744,7 +90738,7 @@ Ref<uint> indices
             MinVersion = "4.0"
         )]
         [NativeFunction("opengl", EntryPoint = "glUniformSubroutinesuiv")]
-        static abstract void UniformSubroutines(
+        static abstract void UniformSubroutine(
             Constant<uint, GLEnum, ShaderType> shadertype,
             uint indices
         );
@@ -91394,17 +91388,17 @@ Ref<int> values
         [NativeName("glVDPAUMapSurfacesNV")]
         [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
         [NativeFunction("opengl", EntryPoint = "glVDPAUMapSurfacesNV")]
-        static abstract void VdpauMapSurfacesNV(uint numSurfaces, nint* surfaces);
+        static abstract void VdpauMapSurfaceNV(nint surfaces);
 
         [NativeName("glVDPAUMapSurfacesNV")]
         [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
         [NativeFunction("opengl", EntryPoint = "glVDPAUMapSurfacesNV")]
-        static abstract void VdpauMapSurfacesNV(uint numSurfaces, Ref<nint> surfaces);
+        static abstract void VdpauMapSurfacesNV(uint numSurfaces, nint* surfaces);
 
         [NativeName("glVDPAUMapSurfacesNV")]
         [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
         [NativeFunction("opengl", EntryPoint = "glVDPAUMapSurfacesNV")]
-        static abstract void VdpauMapSurfacesNV(nint surfaces);
+        static abstract void VdpauMapSurfacesNV(uint numSurfaces, Ref<nint> surfaces);
 
         [NativeName("glVDPAURegisterOutputSurfaceNV")]
         [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
@@ -91476,17 +91470,17 @@ MaybeBool<uint> isFrameStructure
         [NativeName("glVDPAUUnmapSurfacesNV")]
         [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
         [NativeFunction("opengl", EntryPoint = "glVDPAUUnmapSurfacesNV")]
-        static abstract void VdpauUnmapSurfacesNV(uint numSurface, nint* surfaces);
+        static abstract void VdpauUnmapSurfaceNV(nint surfaces);
 
         [NativeName("glVDPAUUnmapSurfacesNV")]
         [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
         [NativeFunction("opengl", EntryPoint = "glVDPAUUnmapSurfacesNV")]
-        static abstract void VdpauUnmapSurfacesNV(uint numSurface, Ref<nint> surfaces);
+        static abstract void VdpauUnmapSurfacesNV(uint numSurface, nint* surfaces);
 
         [NativeName("glVDPAUUnmapSurfacesNV")]
         [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
         [NativeFunction("opengl", EntryPoint = "glVDPAUUnmapSurfacesNV")]
-        static abstract void VdpauUnmapSurfacesNV(nint surfaces);
+        static abstract void VdpauUnmapSurfacesNV(uint numSurface, Ref<nint> surfaces);
 
         [NativeName("glVDPAUUnregisterSurfaceNV")]
         [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
@@ -102890,21 +102884,21 @@ Ref pointer
         [SupportedApiProfile("glcore", ["GL_EXT_window_rectangles"])]
         [SupportedApiProfile("gles2", ["GL_EXT_window_rectangles"])]
         [NativeFunction("opengl", EntryPoint = "glWindowRectanglesEXT")]
-        static abstract void WindowRectanglesEXT(uint mode, uint count, int* box);
+        static abstract void WindowRectangleEXT(uint mode, int box);
 
         [NativeName("glWindowRectanglesEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_window_rectangles"])]
         [SupportedApiProfile("glcore", ["GL_EXT_window_rectangles"])]
         [SupportedApiProfile("gles2", ["GL_EXT_window_rectangles"])]
         [NativeFunction("opengl", EntryPoint = "glWindowRectanglesEXT")]
-        static abstract void WindowRectanglesEXT(uint mode, uint count, Ref<int> box);
+        static abstract void WindowRectanglesEXT(uint mode, uint count, int* box);
 
         [NativeName("glWindowRectanglesEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_window_rectangles"])]
         [SupportedApiProfile("glcore", ["GL_EXT_window_rectangles"])]
         [SupportedApiProfile("gles2", ["GL_EXT_window_rectangles"])]
         [NativeFunction("opengl", EntryPoint = "glWindowRectanglesEXT")]
-        static abstract void WindowRectanglesEXT(uint mode, int box);
+        static abstract void WindowRectanglesEXT(uint mode, uint count, Ref<int> box);
 
         [NativeName("glWriteMaskEXT")]
         [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])]
@@ -115913,19 +115907,19 @@ Ref<float> transformValues
     [SupportedApiProfile("gl", ["GL_NV_command_list"])]
     [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
     [NativeFunction("opengl", EntryPoint = "glCreateCommandListsNV")]
-    void CreateCommandListsNV(uint n, uint* lists);
+    uint CreateCommandListNV();
 
     [NativeName("glCreateCommandListsNV")]
     [SupportedApiProfile("gl", ["GL_NV_command_list"])]
     [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
     [NativeFunction("opengl", EntryPoint = "glCreateCommandListsNV")]
-    void CreateCommandListsNV(uint n, Ref<uint> lists);
+    void CreateCommandListsNV(uint n, uint* lists);
 
     [NativeName("glCreateCommandListsNV")]
     [SupportedApiProfile("gl", ["GL_NV_command_list"])]
     [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
     [NativeFunction("opengl", EntryPoint = "glCreateCommandListsNV")]
-    uint CreateCommandListsNV();
+    void CreateCommandListsNV(uint n, Ref<uint> lists);
 
     [NativeName("glCreateFramebuffers")]
     [SupportedApiProfile(
@@ -115973,19 +115967,19 @@ Ref<float> transformValues
     [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
     [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])]
     [NativeFunction("opengl", EntryPoint = "glCreateMemoryObjectsEXT")]
-    void CreateMemoryObjectsEXT(uint n, uint* memoryObjects);
+    uint CreateMemoryObjectEXT();
 
     [NativeName("glCreateMemoryObjectsEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
     [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])]
     [NativeFunction("opengl", EntryPoint = "glCreateMemoryObjectsEXT")]
-    void CreateMemoryObjectsEXT(uint n, Ref<uint> memoryObjects);
+    void CreateMemoryObjectsEXT(uint n, uint* memoryObjects);
 
     [NativeName("glCreateMemoryObjectsEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
     [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])]
     [NativeFunction("opengl", EntryPoint = "glCreateMemoryObjectsEXT")]
-    uint CreateMemoryObjectsEXT();
+    void CreateMemoryObjectsEXT(uint n, Ref<uint> memoryObjects);
 
     [NativeName("glCreatePerfQueryINTEL")]
     [SupportedApiProfile("gl", ["GL_INTEL_performance_query"])]
@@ -116237,19 +116231,19 @@ Ref<float> transformValues
     [SupportedApiProfile("gl", ["GL_NV_timeline_semaphore"])]
     [SupportedApiProfile("gles2", ["GL_NV_timeline_semaphore"])]
     [NativeFunction("opengl", EntryPoint = "glCreateSemaphoresNV")]
-    void CreateSemaphoresNV(uint n, uint* semaphores);
+    uint CreateSemaphoreNV();
 
     [NativeName("glCreateSemaphoresNV")]
     [SupportedApiProfile("gl", ["GL_NV_timeline_semaphore"])]
     [SupportedApiProfile("gles2", ["GL_NV_timeline_semaphore"])]
     [NativeFunction("opengl", EntryPoint = "glCreateSemaphoresNV")]
-    void CreateSemaphoresNV(uint n, Ref<uint> semaphores);
+    void CreateSemaphoresNV(uint n, uint* semaphores);
 
     [NativeName("glCreateSemaphoresNV")]
     [SupportedApiProfile("gl", ["GL_NV_timeline_semaphore"])]
     [SupportedApiProfile("gles2", ["GL_NV_timeline_semaphore"])]
     [NativeFunction("opengl", EntryPoint = "glCreateSemaphoresNV")]
-    uint CreateSemaphoresNV();
+    void CreateSemaphoresNV(uint n, Ref<uint> semaphores);
 
     [NativeName("glCreateShader")]
     [SupportedApiProfile(
@@ -116449,19 +116443,19 @@ Ref2D<sbyte> strings
     [SupportedApiProfile("gl", ["GL_NV_command_list"])]
     [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
     [NativeFunction("opengl", EntryPoint = "glCreateStatesNV")]
-    void CreateStatesNV(uint n, uint* states);
+    uint CreateStateNV();
 
     [NativeName("glCreateStatesNV")]
     [SupportedApiProfile("gl", ["GL_NV_command_list"])]
     [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
     [NativeFunction("opengl", EntryPoint = "glCreateStatesNV")]
-    void CreateStatesNV(uint n, Ref<uint> states);
+    void CreateStatesNV(uint n, uint* states);
 
     [NativeName("glCreateStatesNV")]
     [SupportedApiProfile("gl", ["GL_NV_command_list"])]
     [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
     [NativeFunction("opengl", EntryPoint = "glCreateStatesNV")]
-    uint CreateStatesNV();
+    void CreateStatesNV(uint n, Ref<uint> states);
 
     [NativeName("glCreateSyncFromCLeventARB")]
     [SupportedApiProfile("gl", ["GL_ARB_cl_event"])]
@@ -117260,6 +117254,11 @@ Ref<float> points
     [NativeFunction("opengl", EntryPoint = "glDeleteBuffers")]
     void DeleteBuffer(uint buffers);
 
+    [NativeName("glDeleteBuffersARB")]
+    [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteBuffersARB")]
+    void DeleteBufferARB(uint buffers);
+
     [NativeName("glDeleteBuffers")]
     [SupportedApiProfile(
         "gl",
@@ -117370,43 +117369,45 @@ Ref<float> points
     [NativeFunction("opengl", EntryPoint = "glDeleteBuffersARB")]
     void DeleteBuffersARB(uint n, Ref<uint> buffers);
 
-    [NativeName("glDeleteBuffersARB")]
-    [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteBuffersARB")]
-    void DeleteBuffersARB(uint buffers);
-
     [NativeName("glDeleteCommandListsNV")]
     [SupportedApiProfile("gl", ["GL_NV_command_list"])]
     [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteCommandListsNV")]
-    void DeleteCommandListsNV(uint n, uint* lists);
+    void DeleteCommandListNV(uint lists);
 
     [NativeName("glDeleteCommandListsNV")]
     [SupportedApiProfile("gl", ["GL_NV_command_list"])]
     [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteCommandListsNV")]
-    void DeleteCommandListsNV(uint n, Ref<uint> lists);
+    void DeleteCommandListsNV(uint n, uint* lists);
 
     [NativeName("glDeleteCommandListsNV")]
     [SupportedApiProfile("gl", ["GL_NV_command_list"])]
     [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteCommandListsNV")]
-    void DeleteCommandListsNV(uint lists);
+    void DeleteCommandListsNV(uint n, Ref<uint> lists);
 
     [NativeName("glDeleteFencesAPPLE")]
     [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteFencesAPPLE")]
-    void DeleteFencesAPPLE(uint n, uint* fences);
+    void DeleteFenceAPPLE(uint fences);
+
+    [NativeName("glDeleteFencesNV")]
+    [SupportedApiProfile("gl", ["GL_NV_fence"])]
+    [SupportedApiProfile("gles2", ["GL_NV_fence"])]
+    [SupportedApiProfile("gles1", ["GL_NV_fence"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteFencesNV")]
+    void DeleteFenceNV(uint fences);
 
     [NativeName("glDeleteFencesAPPLE")]
     [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteFencesAPPLE")]
-    void DeleteFencesAPPLE(uint n, Ref<uint> fences);
+    void DeleteFencesAPPLE(uint n, uint* fences);
 
     [NativeName("glDeleteFencesAPPLE")]
     [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteFencesAPPLE")]
-    void DeleteFencesAPPLE(uint fences);
+    void DeleteFencesAPPLE(uint n, Ref<uint> fences);
 
     [NativeName("glDeleteFencesNV")]
     [SupportedApiProfile("gl", ["GL_NV_fence"])]
@@ -117422,13 +117423,6 @@ Ref<float> points
     [NativeFunction("opengl", EntryPoint = "glDeleteFencesNV")]
     void DeleteFencesNV(uint n, Ref<uint> fences);
 
-    [NativeName("glDeleteFencesNV")]
-    [SupportedApiProfile("gl", ["GL_NV_fence"])]
-    [SupportedApiProfile("gles2", ["GL_NV_fence"])]
-    [SupportedApiProfile("gles1", ["GL_NV_fence"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteFencesNV")]
-    void DeleteFencesNV(uint fences);
-
     [NativeName("glDeleteFragmentShaderATI")]
     [SupportedApiProfile("gl", ["GL_ATI_fragment_shader"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteFragmentShaderATI")]
@@ -117479,6 +117473,16 @@ Ref<float> points
     [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffers")]
     void DeleteFramebuffer(uint framebuffers);
 
+    [NativeName("glDeleteFramebuffersEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersEXT")]
+    void DeleteFramebufferEXT(uint framebuffers);
+
+    [NativeName("glDeleteFramebuffersOES")]
+    [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")]
+    void DeleteFramebufferOES(uint framebuffers);
+
     [NativeName("glDeleteFramebuffers")]
     [SupportedApiProfile(
         "gl",
@@ -117579,11 +117583,6 @@ Ref<float> points
     [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersEXT")]
     void DeleteFramebuffersEXT(uint n, Ref<uint> framebuffers);
 
-    [NativeName("glDeleteFramebuffersEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersEXT")]
-    void DeleteFramebuffersEXT(uint framebuffers);
-
     [NativeName("glDeleteFramebuffersOES")]
     [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")]
@@ -117594,11 +117593,6 @@ Ref<float> points
     [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")]
     void DeleteFramebuffersOES(uint n, Ref<uint> framebuffers);
 
-    [NativeName("glDeleteFramebuffersOES")]
-    [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteFramebuffersOES")]
-    void DeleteFramebuffersOES(uint framebuffers);
-
     [NativeName("glDeleteLists")]
     [SupportedApiProfile(
         "gl",
@@ -117632,19 +117626,24 @@ Ref<float> points
     [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
     [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteMemoryObjectsEXT")]
-    void DeleteMemoryObjectsEXT(uint n, uint* memoryObjects);
+    void DeleteMemoryObjectEXT(uint memoryObjects);
 
     [NativeName("glDeleteMemoryObjectsEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
     [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteMemoryObjectsEXT")]
-    void DeleteMemoryObjectsEXT(uint n, Ref<uint> memoryObjects);
+    void DeleteMemoryObjectsEXT(uint n, uint* memoryObjects);
 
     [NativeName("glDeleteMemoryObjectsEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_memory_object"])]
     [SupportedApiProfile("gles2", ["GL_EXT_memory_object"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteMemoryObjectsEXT")]
-    void DeleteMemoryObjectsEXT(uint memoryObjects);
+    void DeleteMemoryObjectsEXT(uint n, Ref<uint> memoryObjects);
+
+    [NativeName("glDeleteNamesAMD")]
+    [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteNamesAMD")]
+    void DeleteNameAMD(uint identifier, uint names);
 
     [NativeName("glDeleteNamedStringARB")]
     [SupportedApiProfile("gl", ["GL_ARB_shading_language_include"])]
@@ -117674,11 +117673,6 @@ Ref<float> points
     [NativeFunction("opengl", EntryPoint = "glDeleteNamesAMD")]
     void DeleteNamesAMD(uint identifier, uint num, Ref<uint> names);
 
-    [NativeName("glDeleteNamesAMD")]
-    [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteNamesAMD")]
-    void DeleteNamesAMD(uint identifier, uint names);
-
     [NativeName("glDeleteObjectARB")]
     [SupportedApiProfile("gl", ["GL_ARB_shader_objects"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteObjectARB")]
@@ -117697,7 +117691,7 @@ Ref<float> points
     [NativeName("glDeleteOcclusionQueriesNV")]
     [SupportedApiProfile("gl", ["GL_NV_occlusion_query"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteOcclusionQueriesNV")]
-    void DeleteOcclusionQueriesNV(uint ids);
+    void DeleteOcclusionQueryNV(uint ids);
 
     [NativeName("glDeletePathsNV")]
     [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
@@ -117711,21 +117705,21 @@ Ref<float> points
     [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
     [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
     [NativeFunction("opengl", EntryPoint = "glDeletePerfMonitorsAMD")]
-    void DeletePerfMonitorsAMD(uint n, uint* monitors);
+    uint DeletePerfMonitorAMD();
 
     [NativeName("glDeletePerfMonitorsAMD")]
     [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
     [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
     [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
     [NativeFunction("opengl", EntryPoint = "glDeletePerfMonitorsAMD")]
-    void DeletePerfMonitorsAMD(uint n, Ref<uint> monitors);
+    void DeletePerfMonitorsAMD(uint n, uint* monitors);
 
     [NativeName("glDeletePerfMonitorsAMD")]
     [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
     [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
     [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
     [NativeFunction("opengl", EntryPoint = "glDeletePerfMonitorsAMD")]
-    uint DeletePerfMonitorsAMD();
+    void DeletePerfMonitorsAMD(uint n, Ref<uint> monitors);
 
     [NativeName("glDeletePerfQueryINTEL")]
     [SupportedApiProfile("gl", ["GL_INTEL_performance_query"])]
@@ -117811,6 +117805,11 @@ Ref<float> points
     [NativeFunction("opengl", EntryPoint = "glDeleteProgramPipelines")]
     void DeleteProgramPipeline(uint pipelines);
 
+    [NativeName("glDeleteProgramPipelinesEXT")]
+    [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteProgramPipelinesEXT")]
+    void DeleteProgramPipelineEXT(uint pipelines);
+
     [NativeName("glDeleteProgramPipelines")]
     [SupportedApiProfile(
         "gl",
@@ -117881,11 +117880,6 @@ Ref<float> points
     [NativeFunction("opengl", EntryPoint = "glDeleteProgramPipelinesEXT")]
     void DeleteProgramPipelinesEXT(uint n, Ref<uint> pipelines);
 
-    [NativeName("glDeleteProgramPipelinesEXT")]
-    [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteProgramPipelinesEXT")]
-    void DeleteProgramPipelinesEXT(uint pipelines);
-
     [NativeName("glDeleteProgramsARB")]
     [SupportedApiProfile("gl", ["GL_ARB_fragment_program", "GL_ARB_vertex_program"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteProgramsARB")]
@@ -118002,22 +117996,82 @@ Ref<float> points
         MinVersion = "1.5"
     )]
     [NativeFunction("opengl", EntryPoint = "glDeleteQueries")]
-    void DeleteQueries(uint n, Ref<uint> ids);
-
-    [NativeName("glDeleteQueriesARB")]
-    [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteQueriesARB")]
-    void DeleteQueriesARB(uint n, uint* ids);
-
-    [NativeName("glDeleteQueriesARB")]
-    [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteQueriesARB")]
-    void DeleteQueriesARB(uint n, Ref<uint> ids);
+    void DeleteQueries(uint n, Ref<uint> ids);
+
+    [NativeName("glDeleteQueriesARB")]
+    [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteQueriesARB")]
+    void DeleteQueriesARB(uint n, uint* ids);
+
+    [NativeName("glDeleteQueriesARB")]
+    [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteQueriesARB")]
+    void DeleteQueriesARB(uint n, Ref<uint> ids);
+
+    [NativeName("glDeleteQueriesEXT")]
+    [SupportedApiProfile(
+        "gles2",
+        ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
+    )]
+    [NativeFunction("opengl", EntryPoint = "glDeleteQueriesEXT")]
+    void DeleteQueriesEXT(uint n, uint* ids);
+
+    [NativeName("glDeleteQueriesEXT")]
+    [SupportedApiProfile(
+        "gles2",
+        ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
+    )]
+    [NativeFunction("opengl", EntryPoint = "glDeleteQueriesEXT")]
+    void DeleteQueriesEXT(uint n, Ref<uint> ids);
+
+    [NativeName("glDeleteQueries")]
+    [SupportedApiProfile(
+        "gl",
+        [
+            "GL_VERSION_1_5",
+            "GL_VERSION_2_0",
+            "GL_VERSION_2_1",
+            "GL_VERSION_3_0",
+            "GL_VERSION_3_1",
+            "GL_VERSION_3_2",
+            "GL_VERSION_3_3",
+            "GL_VERSION_4_0",
+            "GL_VERSION_4_1",
+            "GL_VERSION_4_2",
+            "GL_VERSION_4_3",
+            "GL_VERSION_4_4",
+            "GL_VERSION_4_5",
+            "GL_VERSION_4_6",
+        ],
+        MinVersion = "1.5"
+    )]
+    [SupportedApiProfile(
+        "glcore",
+        [
+            "GL_VERSION_1_5",
+            "GL_VERSION_2_0",
+            "GL_VERSION_2_1",
+            "GL_VERSION_3_0",
+            "GL_VERSION_3_1",
+            "GL_VERSION_3_2",
+            "GL_VERSION_3_3",
+            "GL_VERSION_4_0",
+            "GL_VERSION_4_1",
+            "GL_VERSION_4_2",
+            "GL_VERSION_4_3",
+            "GL_VERSION_4_4",
+            "GL_VERSION_4_5",
+            "GL_VERSION_4_6",
+        ],
+        MinVersion = "1.5"
+    )]
+    [NativeFunction("opengl", EntryPoint = "glDeleteQueries")]
+    void DeleteQuery(uint ids);
 
     [NativeName("glDeleteQueriesARB")]
     [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteQueriesARB")]
-    void DeleteQueriesARB(uint ids);
+    void DeleteQueryARB(uint ids);
 
     [NativeName("glDeleteQueriesEXT")]
     [SupportedApiProfile(
@@ -118025,67 +118079,7 @@ Ref<float> points
         ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
     )]
     [NativeFunction("opengl", EntryPoint = "glDeleteQueriesEXT")]
-    void DeleteQueriesEXT(uint n, uint* ids);
-
-    [NativeName("glDeleteQueriesEXT")]
-    [SupportedApiProfile(
-        "gles2",
-        ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
-    )]
-    [NativeFunction("opengl", EntryPoint = "glDeleteQueriesEXT")]
-    void DeleteQueriesEXT(uint n, Ref<uint> ids);
-
-    [NativeName("glDeleteQueriesEXT")]
-    [SupportedApiProfile(
-        "gles2",
-        ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
-    )]
-    [NativeFunction("opengl", EntryPoint = "glDeleteQueriesEXT")]
-    void DeleteQueriesEXT(uint ids);
-
-    [NativeName("glDeleteQueries")]
-    [SupportedApiProfile(
-        "gl",
-        [
-            "GL_VERSION_1_5",
-            "GL_VERSION_2_0",
-            "GL_VERSION_2_1",
-            "GL_VERSION_3_0",
-            "GL_VERSION_3_1",
-            "GL_VERSION_3_2",
-            "GL_VERSION_3_3",
-            "GL_VERSION_4_0",
-            "GL_VERSION_4_1",
-            "GL_VERSION_4_2",
-            "GL_VERSION_4_3",
-            "GL_VERSION_4_4",
-            "GL_VERSION_4_5",
-            "GL_VERSION_4_6",
-        ],
-        MinVersion = "1.5"
-    )]
-    [SupportedApiProfile(
-        "glcore",
-        [
-            "GL_VERSION_1_5",
-            "GL_VERSION_2_0",
-            "GL_VERSION_2_1",
-            "GL_VERSION_3_0",
-            "GL_VERSION_3_1",
-            "GL_VERSION_3_2",
-            "GL_VERSION_3_3",
-            "GL_VERSION_4_0",
-            "GL_VERSION_4_1",
-            "GL_VERSION_4_2",
-            "GL_VERSION_4_3",
-            "GL_VERSION_4_4",
-            "GL_VERSION_4_5",
-            "GL_VERSION_4_6",
-        ],
-        MinVersion = "1.5"
-    )]
-    [NativeFunction("opengl", EntryPoint = "glDeleteQueries")]
-    void DeleteQuery(uint ids);
+    void DeleteQueryEXT(uint ids);
 
     [NativeName("glDeleteQueryResourceTagNV")]
     [SupportedApiProfile("gl", ["GL_NV_query_resource_tag"])]
@@ -118147,6 +118141,16 @@ Ref<float> points
     [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffers")]
     void DeleteRenderbuffer(uint renderbuffers);
 
+    [NativeName("glDeleteRenderbuffersEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersEXT")]
+    void DeleteRenderbufferEXT(uint renderbuffers);
+
+    [NativeName("glDeleteRenderbuffersOES")]
+    [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")]
+    void DeleteRenderbufferOES(uint renderbuffers);
+
     [NativeName("glDeleteRenderbuffers")]
     [SupportedApiProfile(
         "gl",
@@ -118247,11 +118251,6 @@ Ref<float> points
     [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersEXT")]
     void DeleteRenderbuffersEXT(uint n, Ref<uint> renderbuffers);
 
-    [NativeName("glDeleteRenderbuffersEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersEXT")]
-    void DeleteRenderbuffersEXT(uint renderbuffers);
-
     [NativeName("glDeleteRenderbuffersOES")]
     [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")]
@@ -118262,11 +118261,6 @@ Ref<float> points
     [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")]
     void DeleteRenderbuffersOES(uint n, Ref<uint> renderbuffers);
 
-    [NativeName("glDeleteRenderbuffersOES")]
-    [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteRenderbuffersOES")]
-    void DeleteRenderbuffersOES(uint renderbuffers);
-
     [NativeName("glDeleteSamplers")]
     [SupportedApiProfile(
         "gl",
@@ -118388,19 +118382,19 @@ Ref<float> points
     [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
     [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteSemaphoresEXT")]
-    void DeleteSemaphoresEXT(uint n, uint* semaphores);
+    void DeleteSemaphoreEXT(uint semaphores);
 
     [NativeName("glDeleteSemaphoresEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
     [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteSemaphoresEXT")]
-    void DeleteSemaphoresEXT(uint n, Ref<uint> semaphores);
+    void DeleteSemaphoresEXT(uint n, uint* semaphores);
 
     [NativeName("glDeleteSemaphoresEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
     [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteSemaphoresEXT")]
-    void DeleteSemaphoresEXT(uint semaphores);
+    void DeleteSemaphoresEXT(uint n, Ref<uint> semaphores);
 
     [NativeName("glDeleteShader")]
     [SupportedApiProfile(
@@ -118453,19 +118447,19 @@ Ref<float> points
     [SupportedApiProfile("gl", ["GL_NV_command_list"])]
     [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteStatesNV")]
-    void DeleteStatesNV(uint n, uint* states);
+    void DeleteStateNV(uint states);
 
     [NativeName("glDeleteStatesNV")]
     [SupportedApiProfile("gl", ["GL_NV_command_list"])]
     [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteStatesNV")]
-    void DeleteStatesNV(uint n, Ref<uint> states);
+    void DeleteStatesNV(uint n, uint* states);
 
     [NativeName("glDeleteStatesNV")]
     [SupportedApiProfile("gl", ["GL_NV_command_list"])]
     [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteStatesNV")]
-    void DeleteStatesNV(uint states);
+    void DeleteStatesNV(uint n, Ref<uint> states);
 
     [NativeName("glDeleteSync")]
     [SupportedApiProfile(
@@ -118609,6 +118603,11 @@ Ref<float> points
     [NativeFunction("opengl", EntryPoint = "glDeleteTextures")]
     void DeleteTexture(uint textures);
 
+    [NativeName("glDeleteTexturesEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_texture_object"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteTexturesEXT")]
+    void DeleteTextureEXT(uint textures);
+
     [NativeName("glDeleteTextures")]
     [SupportedApiProfile(
         "gl",
@@ -118735,11 +118734,6 @@ Ref<float> points
     [NativeFunction("opengl", EntryPoint = "glDeleteTexturesEXT")]
     void DeleteTexturesEXT(uint n, Ref<uint> textures);
 
-    [NativeName("glDeleteTexturesEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_texture_object"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteTexturesEXT")]
-    void DeleteTexturesEXT(uint textures);
-
     [NativeName("glDeleteTransformFeedbacks")]
     [SupportedApiProfile(
         "gl",
@@ -118772,6 +118766,11 @@ Ref<float> points
     [NativeFunction("opengl", EntryPoint = "glDeleteTransformFeedbacks")]
     void DeleteTransformFeedback(uint ids);
 
+    [NativeName("glDeleteTransformFeedbacksNV")]
+    [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteTransformFeedbacksNV")]
+    void DeleteTransformFeedbackNV(uint ids);
+
     [NativeName("glDeleteTransformFeedbacks")]
     [SupportedApiProfile(
         "gl",
@@ -118846,11 +118845,6 @@ Ref<float> points
     [NativeFunction("opengl", EntryPoint = "glDeleteTransformFeedbacksNV")]
     void DeleteTransformFeedbacksNV(uint n, Ref<uint> ids);
 
-    [NativeName("glDeleteTransformFeedbacksNV")]
-    [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteTransformFeedbacksNV")]
-    void DeleteTransformFeedbacksNV(uint ids);
-
     [NativeName("glDeleteVertexArrays")]
     [SupportedApiProfile(
         "gl",
@@ -118891,6 +118885,17 @@ Ref<float> points
     [NativeFunction("opengl", EntryPoint = "glDeleteVertexArrays")]
     void DeleteVertexArray(uint arrays);
 
+    [NativeName("glDeleteVertexArraysAPPLE")]
+    [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysAPPLE")]
+    void DeleteVertexArrayAPPLE(uint arrays);
+
+    [NativeName("glDeleteVertexArraysOES")]
+    [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
+    [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
+    [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")]
+    void DeleteVertexArrayOES(uint arrays);
+
     [NativeName("glDeleteVertexArrays")]
     [SupportedApiProfile(
         "gl",
@@ -118981,11 +118986,6 @@ Ref<float> points
     [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysAPPLE")]
     void DeleteVertexArraysAPPLE(uint n, Ref<uint> arrays);
 
-    [NativeName("glDeleteVertexArraysAPPLE")]
-    [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysAPPLE")]
-    void DeleteVertexArraysAPPLE(uint arrays);
-
     [NativeName("glDeleteVertexArraysOES")]
     [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
     [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
@@ -118998,12 +118998,6 @@ Ref<float> points
     [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")]
     void DeleteVertexArraysOES(uint n, Ref<uint> arrays);
 
-    [NativeName("glDeleteVertexArraysOES")]
-    [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
-    [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
-    [NativeFunction("opengl", EntryPoint = "glDeleteVertexArraysOES")]
-    void DeleteVertexArraysOES(uint arrays);
-
     [NativeName("glDeleteVertexShaderEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])]
     [NativeFunction("opengl", EntryPoint = "glDeleteVertexShaderEXT")]
@@ -120763,6 +120757,46 @@ uint primcount
     [NativeFunction("opengl", EntryPoint = "glDrawBuffers")]
     void DrawBuffer(DrawBufferMode bufs);
 
+    [NativeName("glDrawBuffersARB")]
+    [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
+    [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
+    void DrawBufferARB(uint bufs);
+
+    [NativeName("glDrawBuffersARB")]
+    [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
+    [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
+    void DrawBufferARB(GLEnum bufs);
+
+    [NativeName("glDrawBuffersARB")]
+    [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
+    [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
+    void DrawBufferARB(DrawBufferMode bufs);
+
+    [NativeName("glDrawBuffersATI")]
+    [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
+    [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
+    void DrawBufferATI(uint bufs);
+
+    [NativeName("glDrawBuffersATI")]
+    [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
+    [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
+    void DrawBufferATI(GLEnum bufs);
+
+    [NativeName("glDrawBuffersATI")]
+    [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
+    [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
+    void DrawBufferATI(DrawBufferMode bufs);
+
+    [NativeName("glDrawBuffersEXT")]
+    [SupportedApiProfile("gles2", ["GL_EXT_draw_buffers"])]
+    [NativeFunction("opengl", EntryPoint = "glDrawBuffersEXT")]
+    void DrawBufferEXT(uint bufs);
+
+    [NativeName("glDrawBuffersNV")]
+    [SupportedApiProfile("gles2", ["GL_NV_draw_buffers"])]
+    [NativeFunction("opengl", EntryPoint = "glDrawBuffersNV")]
+    void DrawBufferNV(uint bufs);
+
     [NativeName("glDrawBuffers")]
     [SupportedApiProfile(
         "gl",
@@ -120941,31 +120975,16 @@ uint primcount
     [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
     void DrawBuffersARB(uint n, Ref<uint> bufs);
 
-    [NativeName("glDrawBuffersARB")]
-    [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
-    [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
-    void DrawBuffersARB(uint bufs);
-
     [NativeName("glDrawBuffersARB")]
     [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
     [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
     void DrawBuffersARB(uint n, Ref<GLEnum> bufs);
 
-    [NativeName("glDrawBuffersARB")]
-    [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
-    [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
-    void DrawBuffersARB(GLEnum bufs);
-
     [NativeName("glDrawBuffersARB")]
     [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
     [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
     void DrawBuffersARB(uint n, Ref<DrawBufferMode> bufs);
 
-    [NativeName("glDrawBuffersARB")]
-    [SupportedApiProfile("gl", ["GL_ARB_draw_buffers"])]
-    [NativeFunction("opengl", EntryPoint = "glDrawBuffersARB")]
-    void DrawBuffersARB(DrawBufferMode bufs);
-
     [NativeName("glDrawBuffersATI")]
     [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
     [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
@@ -120976,31 +120995,16 @@ uint primcount
     [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
     void DrawBuffersATI(uint n, Ref<uint> bufs);
 
-    [NativeName("glDrawBuffersATI")]
-    [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
-    [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
-    void DrawBuffersATI(uint bufs);
-
     [NativeName("glDrawBuffersATI")]
     [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
     [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
     void DrawBuffersATI(uint n, Ref<GLEnum> bufs);
 
-    [NativeName("glDrawBuffersATI")]
-    [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
-    [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
-    void DrawBuffersATI(GLEnum bufs);
-
     [NativeName("glDrawBuffersATI")]
     [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
     [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
     void DrawBuffersATI(uint n, Ref<DrawBufferMode> bufs);
 
-    [NativeName("glDrawBuffersATI")]
-    [SupportedApiProfile("gl", ["GL_ATI_draw_buffers"])]
-    [NativeFunction("opengl", EntryPoint = "glDrawBuffersATI")]
-    void DrawBuffersATI(DrawBufferMode bufs);
-
     [NativeName("glDrawBuffersEXT")]
     [SupportedApiProfile("gles2", ["GL_EXT_draw_buffers"])]
     [NativeFunction("opengl", EntryPoint = "glDrawBuffersEXT")]
@@ -121011,11 +121015,6 @@ uint primcount
     [NativeFunction("opengl", EntryPoint = "glDrawBuffersEXT")]
     void DrawBuffersEXT(uint n, Ref<uint> bufs);
 
-    [NativeName("glDrawBuffersEXT")]
-    [SupportedApiProfile("gles2", ["GL_EXT_draw_buffers"])]
-    [NativeFunction("opengl", EntryPoint = "glDrawBuffersEXT")]
-    void DrawBuffersEXT(uint bufs);
-
     [NativeName("glDrawBuffersIndexedEXT")]
     [SupportedApiProfile("gles2", ["GL_EXT_multiview_draw_buffers"])]
     [NativeFunction("opengl", EntryPoint = "glDrawBuffersIndexedEXT")]
@@ -121036,11 +121035,6 @@ uint primcount
     [NativeFunction("opengl", EntryPoint = "glDrawBuffersNV")]
     void DrawBuffersNV(uint n, Ref<uint> bufs);
 
-    [NativeName("glDrawBuffersNV")]
-    [SupportedApiProfile("gles2", ["GL_NV_draw_buffers"])]
-    [NativeFunction("opengl", EntryPoint = "glDrawBuffersNV")]
-    void DrawBuffersNV(uint bufs);
-
     [NativeName("glDrawCommandsAddressNV")]
     [SupportedApiProfile("gl", ["GL_NV_command_list"])]
     [SupportedApiProfile("glcore", ["GL_NV_command_list"])]
@@ -124476,19 +124470,25 @@ Ref<float> @params
     [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
     [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
     [NativeFunction("opengl", EntryPoint = "glExtGetBuffersQCOM")]
-    void ExtGetBuffersQCOM(uint* buffers, int maxBuffers, int* numBuffers);
+    uint ExtGetBufferQCOM(Ref<int> numBuffers);
 
     [NativeName("glExtGetBuffersQCOM")]
     [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
     [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
     [NativeFunction("opengl", EntryPoint = "glExtGetBuffersQCOM")]
-    void ExtGetBuffersQCOM(Ref<uint> buffers, int maxBuffers, Ref<int> numBuffers);
+    void ExtGetBuffersQCOM(uint* buffers, int maxBuffers, int* numBuffers);
 
     [NativeName("glExtGetBuffersQCOM")]
     [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
     [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
     [NativeFunction("opengl", EntryPoint = "glExtGetBuffersQCOM")]
-    uint ExtGetBuffersQCOM(Ref<int> numBuffers);
+    void ExtGetBuffersQCOM(Ref<uint> buffers, int maxBuffers, Ref<int> numBuffers);
+
+    [NativeName("glExtGetFramebuffersQCOM")]
+    [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
+    [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
+    [NativeFunction("opengl", EntryPoint = "glExtGetFramebuffersQCOM")]
+    uint ExtGetFramebufferQCOM(Ref<int> numFramebuffers);
 
     [NativeName("glExtGetFramebuffersQCOM")]
     [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
@@ -124506,12 +124506,6 @@ void ExtGetFramebuffersQCOM(
         Ref<int> numFramebuffers
     );
 
-    [NativeName("glExtGetFramebuffersQCOM")]
-    [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
-    [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
-    [NativeFunction("opengl", EntryPoint = "glExtGetFramebuffersQCOM")]
-    uint ExtGetFramebuffersQCOM(Ref<int> numFramebuffers);
-
     [NativeName("glExtGetProgramBinarySourceQCOM")]
     [SupportedApiProfile("gles2", ["GL_QCOM_extended_get2"])]
     [SupportedApiProfile("gles1", ["GL_QCOM_extended_get2"])]
@@ -124547,6 +124541,12 @@ Ref<int> length
     [NativeFunction("opengl", EntryPoint = "glExtGetProgramsQCOM")]
     uint ExtGetProgramQCOM(Ref<int> numPrograms);
 
+    [NativeName("glExtGetRenderbuffersQCOM")]
+    [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
+    [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
+    [NativeFunction("opengl", EntryPoint = "glExtGetRenderbuffersQCOM")]
+    uint ExtGetRenderbufferQCOM(Ref<int> numRenderbuffers);
+
     [NativeName("glExtGetRenderbuffersQCOM")]
     [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
     [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
@@ -124563,29 +124563,23 @@ void ExtGetRenderbuffersQCOM(
         Ref<int> numRenderbuffers
     );
 
-    [NativeName("glExtGetRenderbuffersQCOM")]
-    [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
-    [SupportedApiProfile("gles1", ["GL_QCOM_extended_get"])]
-    [NativeFunction("opengl", EntryPoint = "glExtGetRenderbuffersQCOM")]
-    uint ExtGetRenderbuffersQCOM(Ref<int> numRenderbuffers);
-
     [NativeName("glExtGetShadersQCOM")]
     [SupportedApiProfile("gles2", ["GL_QCOM_extended_get2"])]
     [SupportedApiProfile("gles1", ["GL_QCOM_extended_get2"])]
     [NativeFunction("opengl", EntryPoint = "glExtGetShadersQCOM")]
-    void ExtGetShadersQCOM(uint* shaders, int maxShaders, int* numShaders);
+    uint ExtGetShaderQCOM(Ref<int> numShaders);
 
     [NativeName("glExtGetShadersQCOM")]
     [SupportedApiProfile("gles2", ["GL_QCOM_extended_get2"])]
     [SupportedApiProfile("gles1", ["GL_QCOM_extended_get2"])]
     [NativeFunction("opengl", EntryPoint = "glExtGetShadersQCOM")]
-    void ExtGetShadersQCOM(Ref<uint> shaders, int maxShaders, Ref<int> numShaders);
+    void ExtGetShadersQCOM(uint* shaders, int maxShaders, int* numShaders);
 
     [NativeName("glExtGetShadersQCOM")]
     [SupportedApiProfile("gles2", ["GL_QCOM_extended_get2"])]
     [SupportedApiProfile("gles1", ["GL_QCOM_extended_get2"])]
     [NativeFunction("opengl", EntryPoint = "glExtGetShadersQCOM")]
-    uint ExtGetShadersQCOM(Ref<int> numShaders);
+    void ExtGetShadersQCOM(Ref<uint> shaders, int maxShaders, Ref<int> numShaders);
 
     [NativeName("glExtGetTexLevelParameterivQCOM")]
     [SupportedApiProfile("gles2", ["GL_QCOM_extended_get"])]
@@ -126044,31 +126038,31 @@ Ref<int> @params
     [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
     [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
     [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
-    void FramebufferDrawBuffersEXT(uint framebuffer, uint n, uint* bufs);
+    void FramebufferDrawBufferEXT(uint framebuffer, GLEnum bufs);
 
     [NativeName("glFramebufferDrawBuffersEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
     [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
     [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
-    void FramebufferDrawBuffersEXT(uint framebuffer, uint n, Ref<uint> bufs);
+    void FramebufferDrawBufferEXT(uint framebuffer, DrawBufferMode bufs);
 
     [NativeName("glFramebufferDrawBuffersEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
     [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
     [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
-    void FramebufferDrawBuffersEXT(uint framebuffer, uint bufs);
+    void FramebufferDrawBuffersEXT(uint framebuffer, uint n, uint* bufs);
 
     [NativeName("glFramebufferDrawBuffersEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
     [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
     [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
-    void FramebufferDrawBuffersEXT(uint framebuffer, uint n, Ref<GLEnum> bufs);
+    void FramebufferDrawBuffersEXT(uint framebuffer, uint n, Ref<uint> bufs);
 
     [NativeName("glFramebufferDrawBuffersEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
     [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
     [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
-    void FramebufferDrawBuffersEXT(uint framebuffer, GLEnum bufs);
+    void FramebufferDrawBuffersEXT(uint framebuffer, uint n, Ref<GLEnum> bufs);
 
     [NativeName("glFramebufferDrawBuffersEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
@@ -126076,12 +126070,6 @@ Ref<int> @params
     [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
     void FramebufferDrawBuffersEXT(uint framebuffer, uint n, Ref<DrawBufferMode> bufs);
 
-    [NativeName("glFramebufferDrawBuffersEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_direct_state_access"])]
-    [SupportedApiProfile("glcore", ["GL_EXT_direct_state_access"])]
-    [NativeFunction("opengl", EntryPoint = "glFramebufferDrawBuffersEXT")]
-    void FramebufferDrawBuffersEXT(uint framebuffer, DrawBufferMode bufs);
-
     [NativeName("glFramebufferFetchBarrierEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_shader_framebuffer_fetch_non_coherent"])]
     [SupportedApiProfile("glcore", ["GL_EXT_shader_framebuffer_fetch_non_coherent"])]
@@ -127554,6 +127542,11 @@ int level
     [NativeFunction("opengl", EntryPoint = "glGenBuffers")]
     uint GenBuffer();
 
+    [NativeName("glGenBuffersARB")]
+    [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glGenBuffersARB")]
+    uint GenBufferARB();
+
     [NativeName("glGenBuffers")]
     [SupportedApiProfile(
         "gl",
@@ -127664,11 +127657,6 @@ int level
     [NativeFunction("opengl", EntryPoint = "glGenBuffersARB")]
     void GenBuffersARB(uint n, Ref<uint> buffers);
 
-    [NativeName("glGenBuffersARB")]
-    [SupportedApiProfile("gl", ["GL_ARB_vertex_buffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glGenBuffersARB")]
-    uint GenBuffersARB();
-
     [NativeName("glGenerateMipmap")]
     [SupportedApiProfile(
         "gl",
@@ -127823,17 +127811,24 @@ Constant<uint, GLEnum, TextureTarget> target
     [NativeName("glGenFencesAPPLE")]
     [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
     [NativeFunction("opengl", EntryPoint = "glGenFencesAPPLE")]
-    void GenFencesAPPLE(uint n, uint* fences);
+    uint GenFenceAPPLE();
+
+    [NativeName("glGenFencesNV")]
+    [SupportedApiProfile("gl", ["GL_NV_fence"])]
+    [SupportedApiProfile("gles2", ["GL_NV_fence"])]
+    [SupportedApiProfile("gles1", ["GL_NV_fence"])]
+    [NativeFunction("opengl", EntryPoint = "glGenFencesNV")]
+    uint GenFenceNV();
 
     [NativeName("glGenFencesAPPLE")]
     [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
     [NativeFunction("opengl", EntryPoint = "glGenFencesAPPLE")]
-    void GenFencesAPPLE(uint n, Ref<uint> fences);
+    void GenFencesAPPLE(uint n, uint* fences);
 
     [NativeName("glGenFencesAPPLE")]
     [SupportedApiProfile("gl", ["GL_APPLE_fence"])]
     [NativeFunction("opengl", EntryPoint = "glGenFencesAPPLE")]
-    uint GenFencesAPPLE();
+    void GenFencesAPPLE(uint n, Ref<uint> fences);
 
     [NativeName("glGenFencesNV")]
     [SupportedApiProfile("gl", ["GL_NV_fence"])]
@@ -127849,13 +127844,6 @@ Constant<uint, GLEnum, TextureTarget> target
     [NativeFunction("opengl", EntryPoint = "glGenFencesNV")]
     void GenFencesNV(uint n, Ref<uint> fences);
 
-    [NativeName("glGenFencesNV")]
-    [SupportedApiProfile("gl", ["GL_NV_fence"])]
-    [SupportedApiProfile("gles2", ["GL_NV_fence"])]
-    [SupportedApiProfile("gles1", ["GL_NV_fence"])]
-    [NativeFunction("opengl", EntryPoint = "glGenFencesNV")]
-    uint GenFencesNV();
-
     [NativeName("glGenFragmentShadersATI")]
     [SupportedApiProfile("gl", ["GL_ATI_fragment_shader"])]
     [NativeFunction("opengl", EntryPoint = "glGenFragmentShadersATI")]
@@ -127906,6 +127894,16 @@ Constant<uint, GLEnum, TextureTarget> target
     [NativeFunction("opengl", EntryPoint = "glGenFramebuffers")]
     uint GenFramebuffer();
 
+    [NativeName("glGenFramebuffersEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glGenFramebuffersEXT")]
+    uint GenFramebufferEXT();
+
+    [NativeName("glGenFramebuffersOES")]
+    [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")]
+    uint GenFramebufferOES();
+
     [NativeName("glGenFramebuffers")]
     [SupportedApiProfile(
         "gl",
@@ -128006,11 +128004,6 @@ Constant<uint, GLEnum, TextureTarget> target
     [NativeFunction("opengl", EntryPoint = "glGenFramebuffersEXT")]
     void GenFramebuffersEXT(uint n, Ref<uint> framebuffers);
 
-    [NativeName("glGenFramebuffersEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glGenFramebuffersEXT")]
-    uint GenFramebuffersEXT();
-
     [NativeName("glGenFramebuffersOES")]
     [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
     [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")]
@@ -128021,11 +128014,6 @@ Constant<uint, GLEnum, TextureTarget> target
     [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")]
     void GenFramebuffersOES(uint n, Ref<uint> framebuffers);
 
-    [NativeName("glGenFramebuffersOES")]
-    [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glGenFramebuffersOES")]
-    uint GenFramebuffersOES();
-
     [NativeName("glGenLists")]
     [SupportedApiProfile(
         "gl",
@@ -128058,17 +128046,17 @@ Constant<uint, GLEnum, TextureTarget> target
     [NativeName("glGenNamesAMD")]
     [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
     [NativeFunction("opengl", EntryPoint = "glGenNamesAMD")]
-    void GenNamesAMD(uint identifier, uint num, uint* names);
+    uint GenNameAMD(uint identifier);
 
     [NativeName("glGenNamesAMD")]
     [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
     [NativeFunction("opengl", EntryPoint = "glGenNamesAMD")]
-    void GenNamesAMD(uint identifier, uint num, Ref<uint> names);
+    void GenNamesAMD(uint identifier, uint num, uint* names);
 
     [NativeName("glGenNamesAMD")]
     [SupportedApiProfile("gl", ["GL_AMD_name_gen_delete"])]
     [NativeFunction("opengl", EntryPoint = "glGenNamesAMD")]
-    uint GenNamesAMD(uint identifier);
+    void GenNamesAMD(uint identifier, uint num, Ref<uint> names);
 
     [NativeName("glGenOcclusionQueriesNV")]
     [SupportedApiProfile("gl", ["GL_NV_occlusion_query"])]
@@ -128083,7 +128071,7 @@ Constant<uint, GLEnum, TextureTarget> target
     [NativeName("glGenOcclusionQueriesNV")]
     [SupportedApiProfile("gl", ["GL_NV_occlusion_query"])]
     [NativeFunction("opengl", EntryPoint = "glGenOcclusionQueriesNV")]
-    uint GenOcclusionQueriesNV();
+    uint GenOcclusionQueryNV();
 
     [NativeName("glGenPathsNV")]
     [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
@@ -128097,21 +128085,21 @@ Constant<uint, GLEnum, TextureTarget> target
     [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
     [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
     [NativeFunction("opengl", EntryPoint = "glGenPerfMonitorsAMD")]
-    void GenPerfMonitorsAMD(uint n, uint* monitors);
+    uint GenPerfMonitorAMD();
 
     [NativeName("glGenPerfMonitorsAMD")]
     [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
     [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
     [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
     [NativeFunction("opengl", EntryPoint = "glGenPerfMonitorsAMD")]
-    void GenPerfMonitorsAMD(uint n, Ref<uint> monitors);
+    void GenPerfMonitorsAMD(uint n, uint* monitors);
 
     [NativeName("glGenPerfMonitorsAMD")]
     [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
     [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
     [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
     [NativeFunction("opengl", EntryPoint = "glGenPerfMonitorsAMD")]
-    uint GenPerfMonitorsAMD();
+    void GenPerfMonitorsAMD(uint n, Ref<uint> monitors);
 
     [NativeName("glGenProgramPipelines")]
     [SupportedApiProfile(
@@ -128143,6 +128131,11 @@ Constant<uint, GLEnum, TextureTarget> target
     [NativeFunction("opengl", EntryPoint = "glGenProgramPipelines")]
     uint GenProgramPipeline();
 
+    [NativeName("glGenProgramPipelinesEXT")]
+    [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])]
+    [NativeFunction("opengl", EntryPoint = "glGenProgramPipelinesEXT")]
+    uint GenProgramPipelineEXT();
+
     [NativeName("glGenProgramPipelines")]
     [SupportedApiProfile(
         "gl",
@@ -128213,11 +128206,6 @@ Constant<uint, GLEnum, TextureTarget> target
     [NativeFunction("opengl", EntryPoint = "glGenProgramPipelinesEXT")]
     void GenProgramPipelinesEXT(uint n, Ref<uint> pipelines);
 
-    [NativeName("glGenProgramPipelinesEXT")]
-    [SupportedApiProfile("gles2", ["GL_EXT_separate_shader_objects"])]
-    [NativeFunction("opengl", EntryPoint = "glGenProgramPipelinesEXT")]
-    uint GenProgramPipelinesEXT();
-
     [NativeName("glGenProgramsARB")]
     [SupportedApiProfile("gl", ["GL_ARB_fragment_program", "GL_ARB_vertex_program"])]
     [NativeFunction("opengl", EntryPoint = "glGenProgramsARB")]
@@ -128346,11 +128334,6 @@ Constant<uint, GLEnum, TextureTarget> target
     [NativeFunction("opengl", EntryPoint = "glGenQueriesARB")]
     void GenQueriesARB(uint n, Ref<uint> ids);
 
-    [NativeName("glGenQueriesARB")]
-    [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
-    [NativeFunction("opengl", EntryPoint = "glGenQueriesARB")]
-    uint GenQueriesARB();
-
     [NativeName("glGenQueriesEXT")]
     [SupportedApiProfile(
         "gles2",
@@ -128367,14 +128350,6 @@ Constant<uint, GLEnum, TextureTarget> target
     [NativeFunction("opengl", EntryPoint = "glGenQueriesEXT")]
     void GenQueriesEXT(uint n, Ref<uint> ids);
 
-    [NativeName("glGenQueriesEXT")]
-    [SupportedApiProfile(
-        "gles2",
-        ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
-    )]
-    [NativeFunction("opengl", EntryPoint = "glGenQueriesEXT")]
-    uint GenQueriesEXT();
-
     [NativeName("glGenQueries")]
     [SupportedApiProfile(
         "gl",
@@ -128419,6 +128394,19 @@ Constant<uint, GLEnum, TextureTarget> target
     [NativeFunction("opengl", EntryPoint = "glGenQueries")]
     uint GenQuery();
 
+    [NativeName("glGenQueriesARB")]
+    [SupportedApiProfile("gl", ["GL_ARB_occlusion_query"])]
+    [NativeFunction("opengl", EntryPoint = "glGenQueriesARB")]
+    uint GenQueryARB();
+
+    [NativeName("glGenQueriesEXT")]
+    [SupportedApiProfile(
+        "gles2",
+        ["GL_EXT_disjoint_timer_query", "GL_EXT_occlusion_query_boolean"]
+    )]
+    [NativeFunction("opengl", EntryPoint = "glGenQueriesEXT")]
+    uint GenQueryEXT();
+
     [NativeName("glGenQueryResourceTagNV")]
     [SupportedApiProfile("gl", ["GL_NV_query_resource_tag"])]
     [NativeFunction("opengl", EntryPoint = "glGenQueryResourceTagNV")]
@@ -128479,6 +128467,16 @@ Constant<uint, GLEnum, TextureTarget> target
     [NativeFunction("opengl", EntryPoint = "glGenRenderbuffers")]
     uint GenRenderbuffer();
 
+    [NativeName("glGenRenderbuffersEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersEXT")]
+    uint GenRenderbufferEXT();
+
+    [NativeName("glGenRenderbuffersOES")]
+    [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
+    [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")]
+    uint GenRenderbufferOES();
+
     [NativeName("glGenRenderbuffers")]
     [SupportedApiProfile(
         "gl",
@@ -128579,11 +128577,6 @@ Constant<uint, GLEnum, TextureTarget> target
     [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersEXT")]
     void GenRenderbuffersEXT(uint n, Ref<uint> renderbuffers);
 
-    [NativeName("glGenRenderbuffersEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_framebuffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersEXT")]
-    uint GenRenderbuffersEXT();
-
     [NativeName("glGenRenderbuffersOES")]
     [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
     [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")]
@@ -128594,11 +128587,6 @@ Constant<uint, GLEnum, TextureTarget> target
     [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")]
     void GenRenderbuffersOES(uint n, Ref<uint> renderbuffers);
 
-    [NativeName("glGenRenderbuffersOES")]
-    [SupportedApiProfile("gles1", ["GL_OES_framebuffer_object"])]
-    [NativeFunction("opengl", EntryPoint = "glGenRenderbuffersOES")]
-    uint GenRenderbuffersOES();
-
     [NativeName("glGenSamplers")]
     [SupportedApiProfile(
         "gl",
@@ -128720,19 +128708,19 @@ Constant<uint, GLEnum, TextureTarget> target
     [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
     [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])]
     [NativeFunction("opengl", EntryPoint = "glGenSemaphoresEXT")]
-    void GenSemaphoresEXT(uint n, uint* semaphores);
+    uint GenSemaphoreEXT();
 
     [NativeName("glGenSemaphoresEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
     [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])]
     [NativeFunction("opengl", EntryPoint = "glGenSemaphoresEXT")]
-    void GenSemaphoresEXT(uint n, Ref<uint> semaphores);
+    void GenSemaphoresEXT(uint n, uint* semaphores);
 
     [NativeName("glGenSemaphoresEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_semaphore"])]
     [SupportedApiProfile("gles2", ["GL_EXT_semaphore"])]
     [NativeFunction("opengl", EntryPoint = "glGenSemaphoresEXT")]
-    uint GenSemaphoresEXT();
+    void GenSemaphoresEXT(uint n, Ref<uint> semaphores);
 
     [NativeName("glGenSymbolsEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])]
@@ -128807,6 +128795,11 @@ uint components
     [NativeFunction("opengl", EntryPoint = "glGenTextures")]
     uint GenTexture();
 
+    [NativeName("glGenTexturesEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_texture_object"])]
+    [NativeFunction("opengl", EntryPoint = "glGenTexturesEXT")]
+    uint GenTextureEXT();
+
     [NativeName("glGenTextures")]
     [SupportedApiProfile(
         "gl",
@@ -128933,11 +128926,6 @@ uint components
     [NativeFunction("opengl", EntryPoint = "glGenTexturesEXT")]
     void GenTexturesEXT(uint n, Ref<uint> textures);
 
-    [NativeName("glGenTexturesEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_texture_object"])]
-    [NativeFunction("opengl", EntryPoint = "glGenTexturesEXT")]
-    uint GenTexturesEXT();
-
     [NativeName("glGenTransformFeedbacks")]
     [SupportedApiProfile(
         "gl",
@@ -128970,6 +128958,11 @@ uint components
     [NativeFunction("opengl", EntryPoint = "glGenTransformFeedbacks")]
     uint GenTransformFeedback();
 
+    [NativeName("glGenTransformFeedbacksNV")]
+    [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])]
+    [NativeFunction("opengl", EntryPoint = "glGenTransformFeedbacksNV")]
+    uint GenTransformFeedbackNV();
+
     [NativeName("glGenTransformFeedbacks")]
     [SupportedApiProfile(
         "gl",
@@ -129044,11 +129037,6 @@ uint components
     [NativeFunction("opengl", EntryPoint = "glGenTransformFeedbacksNV")]
     void GenTransformFeedbacksNV(uint n, Ref<uint> ids);
 
-    [NativeName("glGenTransformFeedbacksNV")]
-    [SupportedApiProfile("gl", ["GL_NV_transform_feedback2"])]
-    [NativeFunction("opengl", EntryPoint = "glGenTransformFeedbacksNV")]
-    uint GenTransformFeedbacksNV();
-
     [NativeName("glGenVertexArrays")]
     [SupportedApiProfile(
         "gl",
@@ -129089,6 +129077,17 @@ uint components
     [NativeFunction("opengl", EntryPoint = "glGenVertexArrays")]
     uint GenVertexArray();
 
+    [NativeName("glGenVertexArraysAPPLE")]
+    [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])]
+    [NativeFunction("opengl", EntryPoint = "glGenVertexArraysAPPLE")]
+    uint GenVertexArrayAPPLE();
+
+    [NativeName("glGenVertexArraysOES")]
+    [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
+    [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
+    [NativeFunction("opengl", EntryPoint = "glGenVertexArraysOES")]
+    uint GenVertexArrayOES();
+
     [NativeName("glGenVertexArrays")]
     [SupportedApiProfile(
         "gl",
@@ -129179,11 +129178,6 @@ uint components
     [NativeFunction("opengl", EntryPoint = "glGenVertexArraysAPPLE")]
     void GenVertexArraysAPPLE(uint n, Ref<uint> arrays);
 
-    [NativeName("glGenVertexArraysAPPLE")]
-    [SupportedApiProfile("gl", ["GL_APPLE_vertex_array_object"])]
-    [NativeFunction("opengl", EntryPoint = "glGenVertexArraysAPPLE")]
-    uint GenVertexArraysAPPLE();
-
     [NativeName("glGenVertexArraysOES")]
     [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
     [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
@@ -129196,12 +129190,6 @@ uint components
     [NativeFunction("opengl", EntryPoint = "glGenVertexArraysOES")]
     void GenVertexArraysOES(uint n, Ref<uint> arrays);
 
-    [NativeName("glGenVertexArraysOES")]
-    [SupportedApiProfile("gles2", ["GL_OES_vertex_array_object"])]
-    [SupportedApiProfile("gles1", ["GL_OES_vertex_array_object"])]
-    [NativeFunction("opengl", EntryPoint = "glGenVertexArraysOES")]
-    uint GenVertexArraysOES();
-
     [NativeName("glGenVertexShadersEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])]
     [NativeFunction("opengl", EntryPoint = "glGenVertexShadersEXT")]
@@ -131048,17 +131036,17 @@ Constant<uint, GLEnum, ArrayObjectPNameATI> pname
     [NativeName("glGetAttachedObjectsARB")]
     [SupportedApiProfile("gl", ["GL_ARB_shader_objects"])]
     [NativeFunction("opengl", EntryPoint = "glGetAttachedObjectsARB")]
-    void GetAttachedObjectsARB(uint containerObj, uint maxCount, uint* count, uint* obj);
+    uint GetAttachedObjectARB(uint containerObj, Ref<uint> count);
 
     [NativeName("glGetAttachedObjectsARB")]
     [SupportedApiProfile("gl", ["GL_ARB_shader_objects"])]
     [NativeFunction("opengl", EntryPoint = "glGetAttachedObjectsARB")]
-    void GetAttachedObjectsARB(uint containerObj, uint maxCount, Ref<uint> count, Ref<uint> obj);
+    void GetAttachedObjectsARB(uint containerObj, uint maxCount, uint* count, uint* obj);
 
     [NativeName("glGetAttachedObjectsARB")]
     [SupportedApiProfile("gl", ["GL_ARB_shader_objects"])]
     [NativeFunction("opengl", EntryPoint = "glGetAttachedObjectsARB")]
-    uint GetAttachedObjectsARB(uint containerObj, Ref<uint> count);
+    void GetAttachedObjectsARB(uint containerObj, uint maxCount, Ref<uint> count, Ref<uint> obj);
 
     [NativeName("glGetAttachedShaders")]
     [SupportedApiProfile(
@@ -133794,6 +133782,11 @@ void GetFragmentMaterialSGIX(
         Ref<int> @params
     );
 
+    [NativeName("glGetFragmentShadingRatesEXT")]
+    [SupportedApiProfile("gles2", ["GL_EXT_fragment_shading_rate"])]
+    [NativeFunction("opengl", EntryPoint = "glGetFragmentShadingRatesEXT")]
+    uint GetFragmentShadingRateEXT(uint samples, Ref<uint> count);
+
     [NativeName("glGetFragmentShadingRatesEXT")]
     [SupportedApiProfile("gles2", ["GL_EXT_fragment_shading_rate"])]
     [NativeFunction("opengl", EntryPoint = "glGetFragmentShadingRatesEXT")]
@@ -133809,11 +133802,6 @@ void GetFragmentShadingRatesEXT(
         Ref<uint> shadingRates
     );
 
-    [NativeName("glGetFragmentShadingRatesEXT")]
-    [SupportedApiProfile("gles2", ["GL_EXT_fragment_shading_rate"])]
-    [NativeFunction("opengl", EntryPoint = "glGetFragmentShadingRatesEXT")]
-    uint GetFragmentShadingRatesEXT(uint samples, Ref<uint> count);
-
     [NativeName("glGetFragmentShadingRatesEXT")]
     [SupportedApiProfile("gles2", ["GL_EXT_fragment_shading_rate"])]
     [NativeFunction("opengl", EntryPoint = "glGetFragmentShadingRatesEXT")]
@@ -137746,21 +137734,21 @@ Ref<int> value
     [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
     [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])]
     [NativeFunction("opengl", EntryPoint = "glGetPathCommandsNV")]
-    void GetPathCommandsNV(uint path, byte* commands);
+    byte GetPathCommandNV();
 
     [NativeName("glGetPathCommandsNV")]
     [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
     [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
     [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])]
     [NativeFunction("opengl", EntryPoint = "glGetPathCommandsNV")]
-    void GetPathCommandsNV(uint path, Ref<byte> commands);
+    void GetPathCommandsNV(uint path, byte* commands);
 
     [NativeName("glGetPathCommandsNV")]
     [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
     [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
     [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])]
     [NativeFunction("opengl", EntryPoint = "glGetPathCommandsNV")]
-    byte GetPathCommandsNV();
+    void GetPathCommandsNV(uint path, Ref<byte> commands);
 
     [NativeName("glGetPathCommandsNV")]
     [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
@@ -137774,21 +137762,21 @@ Ref<int> value
     [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
     [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])]
     [NativeFunction("opengl", EntryPoint = "glGetPathCoordsNV")]
-    void GetPathCoordsNV(uint path, float* coords);
+    float GetPathCoordNV();
 
     [NativeName("glGetPathCoordsNV")]
     [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
     [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
     [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])]
     [NativeFunction("opengl", EntryPoint = "glGetPathCoordsNV")]
-    void GetPathCoordsNV(uint path, Ref<float> coords);
+    void GetPathCoordsNV(uint path, float* coords);
 
     [NativeName("glGetPathCoordsNV")]
     [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
     [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
     [SupportedApiProfile("gles2", ["GL_NV_path_rendering"])]
     [NativeFunction("opengl", EntryPoint = "glGetPathCoordsNV")]
-    float GetPathCoordsNV();
+    void GetPathCoordsNV(uint path, Ref<float> coords);
 
     [NativeName("glGetPathDashArrayNV")]
     [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
@@ -138006,6 +137994,13 @@ void GetPerfCounterInfoINTEL(
         Ref<ulong> rawCounterMaxValue
     );
 
+    [NativeName("glGetPerfMonitorCountersAMD")]
+    [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
+    [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
+    [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
+    [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorCountersAMD")]
+    uint GetPerfMonitorCounterAMD(uint group, Ref<int> numCounters, Ref<int> maxActiveCounters);
+
     [NativeName("glGetPerfMonitorCounterDataAMD")]
     [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
     [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
@@ -138037,7 +138032,7 @@ Ref<int> bytesWritten
     [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
     [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
     [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorCounterDataAMD")]
-    int GetPerfMonitorCounterDataAMD(uint monitor, uint pname, uint dataSize, Ref<uint> data);
+    int GetPerfMonitorCounterDatumAMD(uint monitor, uint pname, uint dataSize, Ref<uint> data);
 
     [NativeName("glGetPerfMonitorCounterInfoAMD")]
     [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
@@ -138079,13 +138074,6 @@ void GetPerfMonitorCountersAMD(
         Ref<uint> counters
     );
 
-    [NativeName("glGetPerfMonitorCountersAMD")]
-    [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
-    [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
-    [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
-    [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorCountersAMD")]
-    uint GetPerfMonitorCountersAMD(uint group, Ref<int> numCounters, Ref<int> maxActiveCounters);
-
     [NativeName("glGetPerfMonitorCounterStringAMD")]
     [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
     [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
@@ -138124,21 +138112,21 @@ Ref<sbyte> counterString
     [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
     [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
     [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorGroupsAMD")]
-    void GetPerfMonitorGroupsAMD(int* numGroups, uint groupsSize, uint* groups);
+    uint GetPerfMonitorGroupAMD(Ref<int> numGroups);
 
     [NativeName("glGetPerfMonitorGroupsAMD")]
     [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
     [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
     [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
     [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorGroupsAMD")]
-    void GetPerfMonitorGroupsAMD(Ref<int> numGroups, uint groupsSize, Ref<uint> groups);
+    void GetPerfMonitorGroupsAMD(int* numGroups, uint groupsSize, uint* groups);
 
     [NativeName("glGetPerfMonitorGroupsAMD")]
     [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
     [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
     [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
     [NativeFunction("opengl", EntryPoint = "glGetPerfMonitorGroupsAMD")]
-    uint GetPerfMonitorGroupsAMD(Ref<int> numGroups);
+    void GetPerfMonitorGroupsAMD(Ref<int> numGroups, uint groupsSize, Ref<uint> groups);
 
     [NativeName("glGetPerfMonitorGroupStringAMD")]
     [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
@@ -164039,23 +164027,22 @@ float maxW
     [NativeName("glProgramBufferParametersfvNV")]
     [SupportedApiProfile("gl", ["GL_NV_parameter_buffer_object"])]
     [NativeFunction("opengl", EntryPoint = "glProgramBufferParametersfvNV")]
-    void ProgramBufferParametersNV(
-        uint target,
+    void ProgramBufferParameterNV(
+        Constant<uint, GLEnum, ProgramTarget> target,
         uint bindingIndex,
         uint wordIndex,
-        uint count,
-        float* @params
+        float @params
     );
 
     [NativeName("glProgramBufferParametersfvNV")]
     [SupportedApiProfile("gl", ["GL_NV_parameter_buffer_object"])]
     [NativeFunction("opengl", EntryPoint = "glProgramBufferParametersfvNV")]
     void ProgramBufferParametersNV(
-        Constant<uint, GLEnum, ProgramTarget> target,
+        uint target,
         uint bindingIndex,
         uint wordIndex,
         uint count,
-        Ref<float> @params
+        float* @params
     );
 
     [NativeName("glProgramBufferParametersfvNV")]
@@ -164065,7 +164052,8 @@ void ProgramBufferParametersNV(
         Constant<uint, GLEnum, ProgramTarget> target,
         uint bindingIndex,
         uint wordIndex,
-        float @params
+        uint count,
+        Ref<float> @params
     );
 
     [NativeName("glProgramBufferParametersIivNV")]
@@ -164816,7 +164804,7 @@ Ref @string
     [NativeName("glProgramSubroutineParametersuivNV")]
     [SupportedApiProfile("gl", ["GL_NV_gpu_program5"])]
     [NativeFunction("opengl", EntryPoint = "glProgramSubroutineParametersuivNV")]
-    void ProgramSubroutineParametersNV(uint target, uint @params);
+    void ProgramSubroutineParameterNV(uint target, uint @params);
 
     [NativeName("glProgramUniform1d")]
     [SupportedApiProfile(
@@ -174935,6 +174923,13 @@ int ptrstride
     [NativeFunction("opengl", EntryPoint = "glSelectBuffer")]
     uint SelectBuffer();
 
+    [NativeName("glSelectPerfMonitorCountersAMD")]
+    [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
+    [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
+    [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
+    [NativeFunction("opengl", EntryPoint = "glSelectPerfMonitorCountersAMD")]
+    uint SelectPerfMonitorCounterAMD(uint monitor, MaybeBool<uint> enable, uint group);
+
     [NativeName("glSelectPerfMonitorCountersAMD")]
     [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
     [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
@@ -174961,13 +174956,6 @@ void SelectPerfMonitorCountersAMD(
         Ref<uint> counterList
     );
 
-    [NativeName("glSelectPerfMonitorCountersAMD")]
-    [SupportedApiProfile("gl", ["GL_AMD_performance_monitor"])]
-    [SupportedApiProfile("glcore", ["GL_AMD_performance_monitor"])]
-    [SupportedApiProfile("gles2", ["GL_AMD_performance_monitor"])]
-    [NativeFunction("opengl", EntryPoint = "glSelectPerfMonitorCountersAMD")]
-    uint SelectPerfMonitorCountersAMD(uint monitor, MaybeBool<uint> enable, uint group);
-
     [NativeName("glSemaphoreParameterivNV")]
     [SupportedApiProfile("gl", ["GL_NV_timeline_semaphore"])]
     [SupportedApiProfile("gles2", ["GL_NV_timeline_semaphore"])]
@@ -179480,16 +179468,17 @@ Ref<int> @params
     [NativeName("glTexFilterFuncSGIS")]
     [SupportedApiProfile("gl", ["GL_SGIS_texture_filter4"])]
     [NativeFunction("opengl", EntryPoint = "glTexFilterFuncSGIS")]
-    void TexFilterFuncSgiSGIS(
-        Constant<uint, GLEnum, TextureTarget> target,
-        Constant<uint, GLEnum, TextureFilterSGIS> filter,
-        float weights
-    );
+    void TexFilterFuncSGIS(uint target, uint filter, uint n, float* weights);
 
     [NativeName("glTexFilterFuncSGIS")]
     [SupportedApiProfile("gl", ["GL_SGIS_texture_filter4"])]
     [NativeFunction("opengl", EntryPoint = "glTexFilterFuncSGIS")]
-    void TexFilterFuncSGIS(uint target, uint filter, uint n, float* weights);
+    void TexFilterFuncSGIS(
+        Constant<uint, GLEnum, TextureTarget> target,
+        Constant<uint, GLEnum, TextureFilterSGIS> filter,
+        uint n,
+        Ref<float> weights
+    );
 
     [NativeName("glTexFilterFuncSGIS")]
     [SupportedApiProfile("gl", ["GL_SGIS_texture_filter4"])]
@@ -179497,8 +179486,7 @@ float weights
     void TexFilterFuncSGIS(
         Constant<uint, GLEnum, TextureTarget> target,
         Constant<uint, GLEnum, TextureFilterSGIS> filter,
-        uint n,
-        Ref<float> weights
+        float weights
     );
 
     [NativeName("glTexGend")]
@@ -184620,6 +184608,42 @@ void TransformFeedbackVarying(
         Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
     );
 
+    [NativeName("glTransformFeedbackVaryingsEXT")]
+    [SupportedApiProfile("gl", ["GL_EXT_transform_feedback"])]
+    [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsEXT")]
+    void TransformFeedbackVaryingEXT(
+        uint program,
+        Ref<sbyte> varyings,
+        Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
+    );
+
+    [NativeName("glTransformFeedbackVaryingsNV")]
+    [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
+    [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
+    void TransformFeedbackVaryingNV(
+        uint program,
+        int locations,
+        Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
+    );
+
+    [NativeName("glTransformFeedbackVaryingsNV")]
+    [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
+    [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
+    void TransformFeedbackVaryingNV(
+        uint program,
+        GLEnum locations,
+        Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
+    );
+
+    [NativeName("glTransformFeedbackVaryingsNV")]
+    [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
+    [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
+    void TransformFeedbackVaryingNV(
+        uint program,
+        TransformFeedbackTokenNV locations,
+        Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
+    );
+
     [NativeName("glTransformFeedbackVaryings")]
     [SupportedApiProfile(
         "gl",
@@ -184716,15 +184740,6 @@ void TransformFeedbackVaryingsEXT(
         Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
     );
 
-    [NativeName("glTransformFeedbackVaryingsEXT")]
-    [SupportedApiProfile("gl", ["GL_EXT_transform_feedback"])]
-    [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsEXT")]
-    void TransformFeedbackVaryingsEXT(
-        uint program,
-        Ref<sbyte> varyings,
-        Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
-    );
-
     [NativeName("glTransformFeedbackVaryingsNV")]
     [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
     [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
@@ -184740,15 +184755,6 @@ void TransformFeedbackVaryingsNV(
         Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
     );
 
-    [NativeName("glTransformFeedbackVaryingsNV")]
-    [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
-    [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
-    void TransformFeedbackVaryingsNV(
-        uint program,
-        int locations,
-        Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
-    );
-
     [NativeName("glTransformFeedbackVaryingsNV")]
     [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
     [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
@@ -184759,15 +184765,6 @@ void TransformFeedbackVaryingsNV(
         Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
     );
 
-    [NativeName("glTransformFeedbackVaryingsNV")]
-    [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
-    [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
-    void TransformFeedbackVaryingsNV(
-        uint program,
-        GLEnum locations,
-        Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
-    );
-
     [NativeName("glTransformFeedbackVaryingsNV")]
     [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
     [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
@@ -184778,15 +184775,6 @@ void TransformFeedbackVaryingsNV(
         Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
     );
 
-    [NativeName("glTransformFeedbackVaryingsNV")]
-    [SupportedApiProfile("gl", ["GL_NV_transform_feedback"])]
-    [NativeFunction("opengl", EntryPoint = "glTransformFeedbackVaryingsNV")]
-    void TransformFeedbackVaryingsNV(
-        uint program,
-        TransformFeedbackTokenNV locations,
-        Constant<uint, GLEnum, TransformFeedbackBufferMode> bufferMode
-    );
-
     [NativeName("glTransformPathNV")]
     [SupportedApiProfile("gl", ["GL_NV_path_rendering"])]
     [SupportedApiProfile("glcore", ["GL_NV_path_rendering"])]
@@ -188977,7 +188965,7 @@ Ref<uint> indices
         MinVersion = "4.0"
     )]
     [NativeFunction("opengl", EntryPoint = "glUniformSubroutinesuiv")]
-    void UniformSubroutines(Constant<uint, GLEnum, ShaderType> shadertype, uint indices);
+    void UniformSubroutine(Constant<uint, GLEnum, ShaderType> shadertype, uint indices);
 
     [NativeName("glUniformui64NV")]
     [SupportedApiProfile("gl", ["GL_NV_shader_buffer_load"])]
@@ -189595,17 +189583,17 @@ uint offset
     [NativeName("glVDPAUMapSurfacesNV")]
     [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
     [NativeFunction("opengl", EntryPoint = "glVDPAUMapSurfacesNV")]
-    void VdpauMapSurfacesNV(uint numSurfaces, nint* surfaces);
+    void VdpauMapSurfaceNV(nint surfaces);
 
     [NativeName("glVDPAUMapSurfacesNV")]
     [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
     [NativeFunction("opengl", EntryPoint = "glVDPAUMapSurfacesNV")]
-    void VdpauMapSurfacesNV(uint numSurfaces, Ref<nint> surfaces);
+    void VdpauMapSurfacesNV(uint numSurfaces, nint* surfaces);
 
     [NativeName("glVDPAUMapSurfacesNV")]
     [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
     [NativeFunction("opengl", EntryPoint = "glVDPAUMapSurfacesNV")]
-    void VdpauMapSurfacesNV(nint surfaces);
+    void VdpauMapSurfacesNV(uint numSurfaces, Ref<nint> surfaces);
 
     [NativeName("glVDPAURegisterOutputSurfaceNV")]
     [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
@@ -189677,17 +189665,17 @@ MaybeBool<uint> isFrameStructure
     [NativeName("glVDPAUUnmapSurfacesNV")]
     [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
     [NativeFunction("opengl", EntryPoint = "glVDPAUUnmapSurfacesNV")]
-    void VdpauUnmapSurfacesNV(uint numSurface, nint* surfaces);
+    void VdpauUnmapSurfaceNV(nint surfaces);
 
     [NativeName("glVDPAUUnmapSurfacesNV")]
     [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
     [NativeFunction("opengl", EntryPoint = "glVDPAUUnmapSurfacesNV")]
-    void VdpauUnmapSurfacesNV(uint numSurface, Ref<nint> surfaces);
+    void VdpauUnmapSurfacesNV(uint numSurface, nint* surfaces);
 
     [NativeName("glVDPAUUnmapSurfacesNV")]
     [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
     [NativeFunction("opengl", EntryPoint = "glVDPAUUnmapSurfacesNV")]
-    void VdpauUnmapSurfacesNV(nint surfaces);
+    void VdpauUnmapSurfacesNV(uint numSurface, Ref<nint> surfaces);
 
     [NativeName("glVDPAUUnregisterSurfaceNV")]
     [SupportedApiProfile("gl", ["GL_NV_vdpau_interop"])]
@@ -200825,21 +200813,21 @@ Ref pointer
     [SupportedApiProfile("glcore", ["GL_EXT_window_rectangles"])]
     [SupportedApiProfile("gles2", ["GL_EXT_window_rectangles"])]
     [NativeFunction("opengl", EntryPoint = "glWindowRectanglesEXT")]
-    void WindowRectanglesEXT(uint mode, uint count, int* box);
+    void WindowRectangleEXT(uint mode, int box);
 
     [NativeName("glWindowRectanglesEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_window_rectangles"])]
     [SupportedApiProfile("glcore", ["GL_EXT_window_rectangles"])]
     [SupportedApiProfile("gles2", ["GL_EXT_window_rectangles"])]
     [NativeFunction("opengl", EntryPoint = "glWindowRectanglesEXT")]
-    void WindowRectanglesEXT(uint mode, uint count, Ref<int> box);
+    void WindowRectanglesEXT(uint mode, uint count, int* box);
 
     [NativeName("glWindowRectanglesEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_window_rectangles"])]
     [SupportedApiProfile("glcore", ["GL_EXT_window_rectangles"])]
     [SupportedApiProfile("gles2", ["GL_EXT_window_rectangles"])]
     [NativeFunction("opengl", EntryPoint = "glWindowRectanglesEXT")]
-    void WindowRectanglesEXT(uint mode, int box);
+    void WindowRectanglesEXT(uint mode, uint count, Ref<int> box);
 
     [NativeName("glWriteMaskEXT")]
     [SupportedApiProfile("gl", ["GL_EXT_vertex_shader"])]
diff --git a/sources/SilkTouch/SilkTouch/Mods/Common/AttributeUtils.cs b/sources/SilkTouch/SilkTouch/Mods/Common/AttributeUtils.cs
index ef3a5f71d7..c00cdfc2b1 100644
--- a/sources/SilkTouch/SilkTouch/Mods/Common/AttributeUtils.cs
+++ b/sources/SilkTouch/SilkTouch/Mods/Common/AttributeUtils.cs
@@ -203,69 +203,6 @@ out _
         return meth;
     }
 
-    /// <summary>
-    /// Adds a name prefix attribute to the given attribute list.
-    /// </summary>
-    /// <param name="attributeLists">The attribute lists to add the attribute to.</param>
-    /// <param name="category">The affix category.</param>
-    /// <param name="prefix">The value of the affix.</param>
-    /// <param name="addToInner">
-    /// Use true if the affix comes from the inside of the name.
-    /// Use false if not (outside or appended to end).
-    /// True means that the attribute is added to the start of the attribute list, meaning that the affix is re-appended earlier.
-    /// </param>
-    public static SyntaxList<AttributeListSyntax> AddNamePrefix(
-        this IEnumerable<AttributeListSyntax> attributeLists,
-        string category,
-        string prefix,
-        bool addToInner = false
-    ) => attributeLists.AddNamePrefixOrSuffix("Prefix", category, prefix, addToInner);
-
-    /// <summary>
-    /// Adds a name suffix attribute to the given attribute list.
-    /// </summary>
-    /// <param name="attributeLists">The attribute lists to add the attribute to.</param>
-    /// <param name="category">The affix category.</param>
-    /// <param name="suffix">The value of the affix.</param>
-    /// <param name="addToInner">
-    /// Use true if the affix comes from the inside of the name.
-    /// Use false if not (outside or appended to end).
-    /// True means that the attribute is added to the start of the attribute list, meaning that the affix is re-appended earlier.
-    /// </param>
-    public static SyntaxList<AttributeListSyntax> AddNameSuffix(
-        this IEnumerable<AttributeListSyntax> attributeLists,
-        string category,
-        string suffix,
-        bool addToInner = false
-    ) => attributeLists.AddNamePrefixOrSuffix("Suffix", category, suffix, addToInner);
-
-    private static SyntaxList<AttributeListSyntax> AddNamePrefixOrSuffix(
-        this IEnumerable<AttributeListSyntax> attributeLists,
-        string type,
-        string category,
-        string affix,
-        bool addToInner = false
-    )
-    {
-        var typeArgument = AttributeArgument(
-            LiteralExpression(SyntaxKind.StringLiteralExpression, Literal($"\"{type}\"", type))
-        );
-        var categoryArgument = AttributeArgument(
-            LiteralExpression(
-                SyntaxKind.StringLiteralExpression,
-                Literal($"\"{category}\"", category)
-            )
-        );
-        var affixArgument = AttributeArgument(
-            LiteralExpression(SyntaxKind.StringLiteralExpression, Literal($"\"{affix}\"", affix))
-        );
-        var argumentList = AttributeArgumentList([typeArgument, categoryArgument, affixArgument]);
-
-        var attribute = AttributeList([Attribute(IdentifierName("NameAffix"), argumentList)]);
-
-        return addToInner ? [attribute, .. attributeLists] : [.. attributeLists, attribute];
-    }
-
     /// <summary>
     /// Gets the native name or returns the specified default.
     /// </summary>
diff --git a/sources/SilkTouch/SilkTouch/Mods/ExtractNestedTyping.cs b/sources/SilkTouch/SilkTouch/Mods/ExtractNestedTyping.cs
index b8f063e7ec..fd53e3a615 100644
--- a/sources/SilkTouch/SilkTouch/Mods/ExtractNestedTyping.cs
+++ b/sources/SilkTouch/SilkTouch/Mods/ExtractNestedTyping.cs
@@ -529,7 +529,11 @@ _fallbackFromOuterFunctionPointer is not null
                             : default
                     )
                         .WithNativeName(currentNativeTypeName)
-                        .AddNameSuffix("FunctionPointerDelegateType", "Delegate"),
+                        .AddNameAffix(
+                            NameAffixType.Suffix,
+                            "FunctionPointerDelegateType",
+                            "Delegate"
+                        ),
                     node
                 );
                 FunctionPointerTypes[currentNativeTypeName] = pfnInfo = (pfn, @delegate, [], []);
diff --git a/sources/SilkTouch/SilkTouch/Mods/InterceptNativeFunctions.cs b/sources/SilkTouch/SilkTouch/Mods/InterceptNativeFunctions.cs
index ada83e3b00..cb563d3bf5 100644
--- a/sources/SilkTouch/SilkTouch/Mods/InterceptNativeFunctions.cs
+++ b/sources/SilkTouch/SilkTouch/Mods/InterceptNativeFunctions.cs
@@ -5,6 +5,7 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.Extensions.Options;
+using Silk.NET.SilkTouch.Naming;
 using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 
 namespace Silk.NET.SilkTouch.Mods;
@@ -131,7 +132,11 @@ or SyntaxKind.ProtectedKeyword
                 );
 
             return node.WithAttributeLists(
-                node.AttributeLists.AddNameSuffix("InterceptedFunction", "Internal")
+                node.AttributeLists.AddNameAffix(
+                    NameAffixType.Suffix,
+                    "InterceptedFunction",
+                    "Internal"
+                )
             );
         }
     }
diff --git a/sources/SilkTouch/SilkTouch/Mods/MixKhronosData.cs b/sources/SilkTouch/SilkTouch/Mods/MixKhronosData.cs
index 51bba6e3e6..75cbf897e7 100644
--- a/sources/SilkTouch/SilkTouch/Mods/MixKhronosData.cs
+++ b/sources/SilkTouch/SilkTouch/Mods/MixKhronosData.cs
@@ -11,6 +11,7 @@
 using Silk.NET.SilkTouch.Clang;
 using Silk.NET.SilkTouch.Mods.Metadata;
 using Silk.NET.SilkTouch.Mods.Transformation;
+using Silk.NET.SilkTouch.Naming;
 using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 
 namespace Silk.NET.SilkTouch.Mods;
@@ -1891,7 +1892,7 @@ private SyntaxList<AttributeListSyntax> ProcessAndGetNewAttributes(
                 {
                     trimmedName = trimmedName[..^handleSuffix.Length];
                     attributeLists = attributeLists
-                        .AddNameSuffix("KhronosHandleType", handleSuffix, true)
+                        .AddNameAffix(NameAffixType.Suffix, "KhronosHandleType", handleSuffix, true)
                         .WithNativeName(trimmedName);
                 }
             }
@@ -1903,7 +1904,11 @@ private SyntaxList<AttributeListSyntax> ProcessAndGetNewAttributes(
                 {
                     if (trimmedName.EndsWith(vendor))
                     {
-                        attributeLists = attributeLists.AddNameSuffix("KhronosVendor", vendor);
+                        attributeLists = attributeLists.AddNameAffix(
+                            NameAffixType.Suffix,
+                            "KhronosVendor",
+                            vendor
+                        );
                         trimmedName = trimmedName[..^vendor.Length];
 
                         break;
@@ -1921,7 +1926,8 @@ private SyntaxList<AttributeListSyntax> ProcessAndGetNewAttributes(
                 {
                     if (trimmedName.EndsWith(suffix))
                     {
-                        attributeLists = attributeLists.AddNameSuffix(
+                        attributeLists = attributeLists.AddNameAffix(
+                            NameAffixType.Suffix,
                             "KhronosNonVendor",
                             suffix,
                             true
@@ -1943,7 +1949,8 @@ private SyntaxList<AttributeListSyntax> ProcessAndGetNewAttributes(
                         var dataTypeSuffix = trimmedName[match.Index..];
                         trimmedName = trimmedName[..match.Index];
 
-                        attributeLists = attributeLists.AddNameSuffix(
+                        attributeLists = attributeLists.AddNameAffix(
+                            NameAffixType.Suffix,
                             "KhronosFunctionDataType",
                             dataTypeSuffix,
                             true
@@ -1998,7 +2005,11 @@ public override SyntaxNode VisitEnumDeclaration(EnumDeclarationSyntax node)
             if (groupInfo?.Namespace != null && typeName == $"{groupInfo.Namespace}Enum")
             {
                 node = node.WithAttributeLists(
-                    node.AttributeLists.AddNamePrefix("KhronosNamespaceEnum", groupInfo.Namespace)
+                    node.AttributeLists.AddNameAffix(
+                        NameAffixType.Prefix,
+                        "KhronosNamespaceEnum",
+                        groupInfo.Namespace
+                    )
                 );
             }
 
@@ -2042,7 +2053,12 @@ public override SyntaxNode VisitEnumDeclaration(EnumDeclarationSyntax node)
             {
                 // Mark the type vendor suffix as identified
                 node = node.WithAttributeLists(
-                    node.AttributeLists.AddNameSuffix(vendorAffixType, typeVendor, true)
+                    node.AttributeLists.AddNameAffix(
+                        NameAffixType.Suffix,
+                        vendorAffixType,
+                        typeVendor,
+                        true
+                    )
                 );
             }
 
@@ -2089,7 +2105,8 @@ .. node.Members.Select(member =>
                             {
                                 // Identify for trimming
                                 return member.WithAttributeLists(
-                                    member.AttributeLists.AddNameSuffix(
+                                    member.AttributeLists.AddNameAffix(
+                                        NameAffixType.Suffix,
                                         "KhronosImpliedVendor",
                                         typeVendor,
                                         true
diff --git a/sources/SilkTouch/SilkTouch/Mods/PrettifyNames.cs b/sources/SilkTouch/SilkTouch/Mods/PrettifyNames.cs
index 1d2052aad9..a803b7ab6b 100644
--- a/sources/SilkTouch/SilkTouch/Mods/PrettifyNames.cs
+++ b/sources/SilkTouch/SilkTouch/Mods/PrettifyNames.cs
@@ -128,7 +128,7 @@ public async Task ExecuteAsync(IModContext ctx, CancellationToken ct = default)
         // The dictionary containing mappings from the original type names to the new names of the type and its members
         var newNames = new Dictionary<string, RenamedType>();
 
-        var nameAffixer = new NameAffixer(visitor.AffixTypes, cfg.Affixes);
+        var nameAffixer = new PrettifyNamesAffixer(visitor.AffixTypes, cfg.Affixes);
         var namePrettifier = new NamePrettifier(cfg.LongAcronymThreshold);
 
         // Trim the trimmable names if the trimmer baseline is set
@@ -463,7 +463,7 @@ private string ApplyPrettifyOnlyPipeline(
         string? container,
         string name,
         Dictionary<string, string> nameOverrides,
-        NameAffixer nameAffixer,
+        PrettifyNamesAffixer nameAffixer,
         NamePrettifier namePrettifier
     )
     {
@@ -870,13 +870,6 @@ private record struct RenamedType(
         Dictionary<string, string> Functions
     );
 
-    private record struct NameAffix(
-        bool IsPrefix,
-        string Category,
-        string Affix,
-        int DeclarationOrder
-    );
-
     private record struct TypeData(List<string> NonFunctions, List<FunctionData> Functions);
 
     private record struct FunctionData(string Name, MethodDeclarationSyntax Syntax);
@@ -958,52 +951,13 @@ _typeInProgress is not null
             || _enumInProgress is not null
             || node.Ancestors().OfType<BaseTypeDeclarationSyntax>().Any();
 
-        private bool TryGetAffixData(
-            SyntaxList<AttributeListSyntax> attributeLists,
-            out NameAffix[] affixes
-        )
-        {
-            affixes = [];
-            var declarationOrder = 0;
-            foreach (var list in attributeLists)
-            {
-                foreach (var attribute in list.Attributes)
-                {
-                    if (!attribute.IsAttribute("Silk.NET.Core.NameAffix"))
-                    {
-                        continue;
-                    }
-
-                    var argumentList = attribute.ArgumentList;
-                    if (
-                        argumentList != null
-                        && argumentList.Arguments[0].Expression
-                            is LiteralExpressionSyntax { Token.Value: string type }
-                        && argumentList.Arguments[1].Expression
-                            is LiteralExpressionSyntax { Token.Value: string category }
-                        && argumentList.Arguments[2].Expression
-                            is LiteralExpressionSyntax { Token.Value: string affix }
-                    )
-                    {
-                        affixes =
-                        [
-                            .. affixes,
-                            new NameAffix(type == "Prefix", category, affix, declarationOrder),
-                        ];
-                        declarationOrder++;
-                    }
-                }
-            }
-
-            return affixes.Length != 0;
-        }
-
         private void ReportTypeAffixData(
             string typeIdentifier,
             SyntaxList<AttributeListSyntax> attributeLists
         )
         {
-            if (!TryGetAffixData(attributeLists, out var affixes))
+            var affixes = attributeLists.GetNameAffixes();
+            if (affixes.Length == 0)
             {
                 return;
             }
@@ -1025,7 +979,8 @@ private void ReportMemberAffixData(
             SyntaxList<AttributeListSyntax> attributeLists
         )
         {
-            if (!TryGetAffixData(attributeLists, out var affixData))
+            var affixes = attributeLists.GetNameAffixes();
+            if (affixes.Length == 0)
             {
                 return;
             }
@@ -1037,7 +992,7 @@ SyntaxList<AttributeListSyntax> attributeLists
 
             // Note that TryAdd will lead to affixes for later members being silently dropped.
             // This is to handle methods which have the same name and affixes. It is fine to drop the affixes in this case.
-            (typeAffixData.MemberAffixes ??= []).TryAdd(memberIdentifier, affixData);
+            (typeAffixData.MemberAffixes ??= []).TryAdd(memberIdentifier, affixes);
             AffixTypes[typeIdentifier] = typeAffixData;
         }
 
@@ -1286,7 +1241,7 @@ public override SyntaxNode VisitMethodDeclaration(MethodDeclarationSyntax node)
 
     /// <param name="affixTypes">The affix data retrieved by the <see cref="Visitor"/>.</param>
     /// <param name="config">The configuration from <see cref="Configuration.Affixes"/>.</param>
-    private class NameAffixer(
+    private class PrettifyNamesAffixer(
         Dictionary<string, TypeAffixData> affixTypes,
         Dictionary<string, NameAffixConfiguration> config
     )
@@ -1317,61 +1272,13 @@ public string RemoveAffixes(
                 return primary;
             }
 
-            var originalPrimary = primary;
-
-            // Sort affixes so that the outer affixes are first
-            affixes.Sort(
-                static (a, b) =>
-                {
-                    // Sort by descending declaration order
-                    // Lower declaration order means the affix is closer to the inside of the name
-                    return -a.DeclarationOrder.CompareTo(b.DeclarationOrder);
-                }
-            );
-
-            var prefixes = affixes.Where(x => x.IsPrefix).ToList();
-            var suffixes = affixes.Where(x => !x.IsPrefix).ToList();
-
-            RemoveSide(true, prefixes);
-            RemoveSide(false, suffixes);
-
-            if (originalPrimary != primary)
+            var stripped = NameAffixer.StripAffixes(primary, affixes);
+            if (stripped != primary)
             {
-                secondary?.Add(originalPrimary);
+                secondary?.Add(primary);
             }
 
-            return primary;
-
-            void RemoveSide(bool isPrefix, List<NameAffix> nameAffixes)
-            {
-                while (nameAffixes.Count > 0)
-                {
-                    var removedAffix = false;
-                    for (var i = 0; i < nameAffixes.Count; i++)
-                    {
-                        var affix = nameAffixes[i];
-                        if (
-                            isPrefix
-                                ? primary.StartsWith(affix.Affix)
-                                : primary.EndsWith(affix.Affix)
-                        )
-                        {
-                            primary = isPrefix
-                                ? primary[affix.Affix.Length..]
-                                : primary[..^affix.Affix.Length];
-
-                            nameAffixes.RemoveAt(i);
-                            removedAffix = true;
-                            break;
-                        }
-                    }
-
-                    if (!removedAffix)
-                    {
-                        break;
-                    }
-                }
-            }
+            return stripped;
         }
 
         /// <summary>
@@ -1479,7 +1386,7 @@ void CreateName(string name, Span<NameAffix> currentAffixes)
                 {
                     if (!GetConfiguration(affix).Remove)
                     {
-                        if (affix.IsPrefix)
+                        if (affix.Type == NameAffixType.Prefix)
                         {
                             name = affix.Affix + name;
                         }
@@ -1544,7 +1451,7 @@ private NameAffixConfiguration GetConfiguration(string category) =>
     /// Removes identified affixes so that other trimmers can process the base name separately.
     /// These affixes should be reapplied by <see cref="NameAffixerLateTrimmer"/>.
     /// </summary>
-    private class NameAffixerEarlyTrimmer(NameAffixer affixer) : INameTrimmer
+    private class NameAffixerEarlyTrimmer(PrettifyNamesAffixer affixer) : INameTrimmer
     {
         /// <inheritdoc/>
         public Version Version => new(0, 0, 0);
@@ -1583,7 +1490,7 @@ public void Trim(NameTrimmerContext context)
     /// <summary>
     /// Reapplies and transforms identified affixes based on <see cref="NameAffixConfiguration"/>.
     /// </summary>
-    private class NameAffixerLateTrimmer(NameAffixer affixer) : INameTrimmer
+    private class NameAffixerLateTrimmer(PrettifyNamesAffixer affixer) : INameTrimmer
     {
         /// <inheritdoc/>
         public Version Version => new(0, 0, 0);
diff --git a/sources/SilkTouch/SilkTouch/Mods/TransformHandles.cs b/sources/SilkTouch/SilkTouch/Mods/TransformHandles.cs
index dd21eb2e6e..5e958705c6 100644
--- a/sources/SilkTouch/SilkTouch/Mods/TransformHandles.cs
+++ b/sources/SilkTouch/SilkTouch/Mods/TransformHandles.cs
@@ -542,7 +542,7 @@ public override SyntaxNode VisitStructDeclaration(StructDeclarationSyntax node)
                 .WithAttributeLists(
                     new SyntaxList<AttributeListSyntax>()
                         .WithNativeName(structName)
-                        .AddNameSuffix("HandleType", "Handle")
+                        .AddNameAffix(NameAffixType.Suffix, "HandleType", "Handle")
                 )
                 .WithMembers(
                     List(
diff --git a/sources/SilkTouch/SilkTouch/Mods/Transformation/ArrayParameterTransformer.cs b/sources/SilkTouch/SilkTouch/Mods/Transformation/ArrayParameterTransformer.cs
index ae22d6cc37..2a8c27462c 100644
--- a/sources/SilkTouch/SilkTouch/Mods/Transformation/ArrayParameterTransformer.cs
+++ b/sources/SilkTouch/SilkTouch/Mods/Transformation/ArrayParameterTransformer.cs
@@ -1,10 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
-using System.Buffers;
 using System.Diagnostics;
-using System.Linq;
 using Humanizer;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
@@ -231,15 +228,16 @@ class TransformArrayParameterRewriter(
         bool isHr
     ) : CSharpSyntaxRewriter
     {
-        public override SyntaxNode VisitMethodDeclaration(MethodDeclarationSyntax node) =>
-            node.WithIdentifier(
-                    // TODO: Temporarily hack to fix issue where OpenGL -OES vendor suffix gets replaced with -O
-                    Identifier(
-                        node.Identifier.Text.EndsWith("OES")
-                            ? node.Identifier.Text
-                            : node.Identifier.Text.Singularize(false)
-                    )
-                )
+        public override SyntaxNode VisitMethodDeclaration(MethodDeclarationSyntax node)
+        {
+            var identifier = node.Identifier.Text;
+            var affixes = node.AttributeLists.GetNameAffixes();
+            var singularizedIdentifier = NameAffixer.ApplyAffixes(
+                NameAffixer.StripAffixes(identifier, affixes).Singularize(),
+                affixes
+            );
+
+            return node.WithIdentifier(Identifier(singularizedIdentifier))
                 .WithReturnType(
                     isOutput ? ptrElementType : PredefinedType(Token(SyntaxKind.VoidKeyword))
                 )
@@ -288,6 +286,7 @@ is BlockSyntax blk
                 .WithParameterList(
                     Visit(node.ParameterList) as ParameterListSyntax ?? ParameterList()
                 );
+        }
 
         public override SyntaxNode VisitReturnStatement(ReturnStatementSyntax node) =>
             ExpressionStatement(
diff --git a/sources/SilkTouch/SilkTouch/Mods/Transformation/FunctionTransformer.cs b/sources/SilkTouch/SilkTouch/Mods/Transformation/FunctionTransformer.cs
index 3ca2698ef7..cc221c4561 100644
--- a/sources/SilkTouch/SilkTouch/Mods/Transformation/FunctionTransformer.cs
+++ b/sources/SilkTouch/SilkTouch/Mods/Transformation/FunctionTransformer.cs
@@ -6,6 +6,7 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.Extensions.Logging;
+using Silk.NET.SilkTouch.Naming;
 using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 
 namespace Silk.NET.SilkTouch.Mods.Transformation;
@@ -182,7 +183,11 @@ meth.Body.Statements[0] as ExpressionStatementSyntax
                         .WithIdentifier(Identifier(newIden));
 
                     newFun = newFun.WithAttributeLists(
-                        newFun.AttributeLists.AddNameSuffix("RawFunction", "Raw")
+                        newFun.AttributeLists.AddNameAffix(
+                            NameAffixType.Suffix,
+                            "RawFunction",
+                            "Raw"
+                        )
                     );
 
                     discrim = ModUtils.DiscrimStr(
diff --git a/sources/SilkTouch/SilkTouch/Naming/NameAffix.cs b/sources/SilkTouch/SilkTouch/Naming/NameAffix.cs
new file mode 100644
index 0000000000..c5c132a9fc
--- /dev/null
+++ b/sources/SilkTouch/SilkTouch/Naming/NameAffix.cs
@@ -0,0 +1,21 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Silk.NET.SilkTouch.Naming;
+
+/// <summary>
+/// Represents a parsed <see cref="NameAffixAttribute"/>.
+/// </summary>
+/// <param name="Type">The type of affix.</param>
+/// <param name="Category">The category of the affix.</param>
+/// <param name="Affix">The affix of the identifier.</param>
+/// <param name="DeclarationOrder">
+/// The order that the attribute was declared in.
+/// 0 is the first and indicates that the affix is on the inside of the name.
+/// </param>
+public record struct NameAffix(
+    NameAffixType Type,
+    string Category,
+    string Affix,
+    int DeclarationOrder
+);
diff --git a/sources/SilkTouch/SilkTouch/Naming/NameAffixType.cs b/sources/SilkTouch/SilkTouch/Naming/NameAffixType.cs
new file mode 100644
index 0000000000..0e7689e63e
--- /dev/null
+++ b/sources/SilkTouch/SilkTouch/Naming/NameAffixType.cs
@@ -0,0 +1,20 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Silk.NET.SilkTouch.Naming;
+
+/// <summary>
+/// The type of name affix.
+/// </summary>
+public enum NameAffixType
+{
+    /// <summary>
+    /// The affix goes on the front of the name.
+    /// </summary>
+    Prefix,
+
+    /// <summary>
+    /// The affix goes on the end of the name.
+    /// </summary>
+    Suffix,
+}
diff --git a/sources/SilkTouch/SilkTouch/Naming/NameAffixer.cs b/sources/SilkTouch/SilkTouch/Naming/NameAffixer.cs
new file mode 100644
index 0000000000..a778a7d2dc
--- /dev/null
+++ b/sources/SilkTouch/SilkTouch/Naming/NameAffixer.cs
@@ -0,0 +1,241 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Silk.NET.SilkTouch.Mods;
+using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
+
+namespace Silk.NET.SilkTouch.Naming;
+
+/// <summary>
+/// Handles the parsing and usage of <see cref="NameAffixAttribute"/>s.
+/// </summary>
+public static class NameAffixer
+{
+    /// <summary>
+    /// Reads the name affix data from the specified attribute lists.
+    /// </summary>
+    public static NameAffix[] GetNameAffixes(this SyntaxList<AttributeListSyntax> attributeLists)
+    {
+        NameAffix[] affixes = [];
+        var declarationOrder = 0;
+        foreach (var list in attributeLists)
+        {
+            foreach (var attribute in list.Attributes)
+            {
+                if (!attribute.IsAttribute("Silk.NET.Core.NameAffix"))
+                {
+                    continue;
+                }
+
+                var argumentList = attribute.ArgumentList;
+                if (
+                    argumentList != null
+                    && argumentList.Arguments[0].Expression
+                        is LiteralExpressionSyntax { Token.Value: string type }
+                    && argumentList.Arguments[1].Expression
+                        is LiteralExpressionSyntax { Token.Value: string category }
+                    && argumentList.Arguments[2].Expression
+                        is LiteralExpressionSyntax { Token.Value: string affix }
+                )
+                {
+                    affixes =
+                    [
+                        .. affixes,
+                        new NameAffix(
+                            type == "Prefix" ? NameAffixType.Prefix : NameAffixType.Suffix,
+                            category,
+                            affix,
+                            declarationOrder
+                        ),
+                    ];
+                    declarationOrder++;
+                }
+            }
+        }
+
+        return affixes;
+    }
+
+    /// <summary>
+    /// Adds a [NameAffix] attribute to the given attribute list.
+    /// </summary>
+    /// <param name="attributeLists">The attribute lists to add the attribute to.</param>
+    /// <param name="type">The affix type to add.</param>
+    /// <param name="category">The affix category.</param>
+    /// <param name="affix">The value of the affix.</param>
+    /// <param name="addToInner">
+    /// Use true if the affix comes from the inside of the name.
+    /// Use false if not (outside or appended to end).
+    /// True means that the attribute is added to the start of the attribute list, meaning that the affix is re-appended earlier.
+    /// </param>
+    public static SyntaxList<AttributeListSyntax> AddNameAffix(
+        this IEnumerable<AttributeListSyntax> attributeLists,
+        NameAffixType type,
+        string category,
+        string affix,
+        bool addToInner = false
+    )
+    {
+        var affixType = type switch
+        {
+            NameAffixType.Prefix => "Prefix",
+            NameAffixType.Suffix => "Suffix",
+            _ => throw new ArgumentOutOfRangeException(nameof(type)),
+        };
+
+        var typeArgument = AttributeArgument(
+            LiteralExpression(
+                SyntaxKind.StringLiteralExpression,
+                Literal($"\"{affixType}\"", affixType)
+            )
+        );
+        var categoryArgument = AttributeArgument(
+            LiteralExpression(
+                SyntaxKind.StringLiteralExpression,
+                Literal($"\"{category}\"", category)
+            )
+        );
+        var affixArgument = AttributeArgument(
+            LiteralExpression(SyntaxKind.StringLiteralExpression, Literal($"\"{affix}\"", affix))
+        );
+        var argumentList = AttributeArgumentList([typeArgument, categoryArgument, affixArgument]);
+
+        var attribute = AttributeList([Attribute(IdentifierName("NameAffix"), argumentList)]);
+
+        return addToInner ? [attribute, .. attributeLists] : [.. attributeLists, attribute];
+    }
+
+    /// <summary>
+    /// Applies the specified affixes to the specified name.
+    /// </summary>
+    /// <remarks>
+    /// <see cref="PrettifyNames"/> has a much configurable version of this method.
+    /// That version is intentionally not exposed since configuration of affixes should be left to the user.
+    /// </remarks>
+    /// <param name="name">The name to apply affixes to.</param>
+    /// <param name="affixes">The affixes to apply. The span's elements may be reordered by this method.</param>
+    /// <returns>The name with affixes applied.</returns>
+    public static string ApplyAffixes(string name, Span<NameAffix> affixes)
+    {
+        if (affixes.Length == 0)
+        {
+            return name;
+        }
+
+        // Sort affixes so that the inner affixes are first
+        affixes.Sort(
+            static (a, b) =>
+            {
+                // Sort by ascending declaration order
+                // Lower declaration order means the affix is closer to the inside of the name
+                return a.DeclarationOrder.CompareTo(b.DeclarationOrder);
+            }
+        );
+
+        foreach (var affix in affixes)
+        {
+            if (affix.Type == NameAffixType.Prefix)
+            {
+                name = affix.Affix + name;
+            }
+            else
+            {
+                name += affix.Affix;
+            }
+        }
+
+        return name;
+    }
+
+    /// <summary>
+    /// Strips the specified affixes from the specified name.
+    /// Affixes not present on the name will be ignored.
+    /// </summary>
+    /// <param name="name">The name to strip affixes from.</param>
+    /// <param name="affixes">The affixes to remove. The span's elements may be reordered by this method.</param>
+    /// <returns>The name with affixes stripped.</returns>
+    public static string StripAffixes(string name, Span<NameAffix> affixes)
+    {
+        if (affixes.Length == 0)
+        {
+            return name;
+        }
+
+        // Sort affixes so that the outer affixes are first
+        affixes.Sort(
+            static (a, b) =>
+            {
+                // Sort so that prefixes are first
+                if (a.Type != b.Type)
+                {
+                    return ((int)a.Type).CompareTo((int)b.Type);
+                }
+
+                // Then by descending declaration order
+                // Lower declaration order means the affix is closer to the inside of the name
+                return -a.DeclarationOrder.CompareTo(b.DeclarationOrder);
+            }
+        );
+
+        var firstSuffixI = 0;
+        for (; firstSuffixI < affixes.Length; firstSuffixI++)
+        {
+            if (affixes[firstSuffixI].Type == NameAffixType.Suffix)
+            {
+                break;
+            }
+        }
+
+        var prefixes = affixes[..firstSuffixI];
+        var suffixes = affixes[firstSuffixI..];
+
+        RemoveSide(true, prefixes);
+        RemoveSide(false, suffixes);
+
+        return name;
+
+        void RemoveSide(bool isPrefix, Span<NameAffix> nameAffixes)
+        {
+            while (nameAffixes.Length > 0)
+            {
+                var removedAffix = false;
+                for (var i = 0; i < nameAffixes.Length; i++)
+                {
+                    var affix = nameAffixes[i];
+                    if (isPrefix ? name.StartsWith(affix.Affix) : name.EndsWith(affix.Affix))
+                    {
+                        name = isPrefix ? name[affix.Affix.Length..] : name[..^affix.Affix.Length];
+
+                        nameAffixes = RemoveAt(nameAffixes, i);
+                        removedAffix = true;
+                        break;
+                    }
+                }
+
+                if (!removedAffix)
+                {
+                    break;
+                }
+            }
+        }
+
+        // Removes the element at i by moving it to the end and slicing the span
+        // The order of the remaining elements is maintained
+        Span<NameAffix> RemoveAt(Span<NameAffix> nameAffixes, int i)
+        {
+            var removed = nameAffixes[i];
+            if (nameAffixes.Length == 1)
+            {
+                return [];
+            }
+
+            nameAffixes[(i + 1)..].CopyTo(nameAffixes[..^1]);
+            nameAffixes[^1] = removed;
+
+            return nameAffixes[..^1];
+        }
+    }
+}
diff --git a/sources/Vulkan/Vulkan/Vulkan/IVk.gen.cs b/sources/Vulkan/Vulkan/Vulkan/IVk.gen.cs
index efc0bfeb3f..6f0adc941d 100644
--- a/sources/Vulkan/Vulkan/Vulkan/IVk.gen.cs
+++ b/sources/Vulkan/Vulkan/Vulkan/IVk.gen.cs
@@ -1264,10 +1264,9 @@ uint set
             ]
         )]
         [NativeFunction("vulkan", EntryPoint = "vkCmdBindDescriptorBuffersEXT")]
-        static abstract void CmdBindDescriptorBuffersEXT(
+        static abstract void CmdBindDescriptorBufferEXT(
             CommandBufferHandle commandBuffer,
-            uint bufferCount,
-            DescriptorBufferBindingInfoEXT* pBindingInfos
+            DescriptorBufferBindingInfoEXT pBindingInfos
         );
 
         [NativeName("vkCmdBindDescriptorBuffersEXT")]
@@ -1285,7 +1284,7 @@ static abstract void CmdBindDescriptorBuffersEXT(
         static abstract void CmdBindDescriptorBuffersEXT(
             CommandBufferHandle commandBuffer,
             uint bufferCount,
-            Ref<DescriptorBufferBindingInfoEXT> pBindingInfos
+            DescriptorBufferBindingInfoEXT* pBindingInfos
         );
 
         [NativeName("vkCmdBindDescriptorBuffersEXT")]
@@ -1302,7 +1301,8 @@ Ref<DescriptorBufferBindingInfoEXT> pBindingInfos
         [NativeFunction("vulkan", EntryPoint = "vkCmdBindDescriptorBuffersEXT")]
         static abstract void CmdBindDescriptorBuffersEXT(
             CommandBufferHandle commandBuffer,
-            DescriptorBufferBindingInfoEXT pBindingInfos
+            uint bufferCount,
+            Ref<DescriptorBufferBindingInfoEXT> pBindingInfos
         );
 
         [NativeName("vkCmdBindDescriptorSets")]
@@ -2083,10 +2083,9 @@ Ref<ClusterAccelerationStructureCommandsInfoNV> pCommandInfos
             ]
         )]
         [NativeFunction("vulkan", EntryPoint = "vkCmdBuildMicromapsEXT")]
-        static abstract void CmdBuildMicromapsEXT(
+        static abstract void CmdBuildMicromapEXT(
             CommandBufferHandle commandBuffer,
-            uint infoCount,
-            MicromapBuildInfoEXT* pInfos
+            MicromapBuildInfoEXT pInfos
         );
 
         [NativeName("vkCmdBuildMicromapsEXT")]
@@ -2102,7 +2101,7 @@ static abstract void CmdBuildMicromapsEXT(
         static abstract void CmdBuildMicromapsEXT(
             CommandBufferHandle commandBuffer,
             uint infoCount,
-            Ref<MicromapBuildInfoEXT> pInfos
+            MicromapBuildInfoEXT* pInfos
         );
 
         [NativeName("vkCmdBuildMicromapsEXT")]
@@ -2117,7 +2116,8 @@ Ref<MicromapBuildInfoEXT> pInfos
         [NativeFunction("vulkan", EntryPoint = "vkCmdBuildMicromapsEXT")]
         static abstract void CmdBuildMicromapsEXT(
             CommandBufferHandle commandBuffer,
-            MicromapBuildInfoEXT pInfos
+            uint infoCount,
+            Ref<MicromapBuildInfoEXT> pInfos
         );
 
         [NativeName("vkCmdBuildPartitionedAccelerationStructuresNV")]
@@ -9516,19 +9516,20 @@ static abstract void CmdWriteAccelerationStructuresPropertiesKHR(
             uint firstQuery
         );
 
-        [NativeName("vkCmdWriteAccelerationStructuresPropertiesKHR")]
+        [NativeName("vkCmdWriteAccelerationStructuresPropertiesNV")]
         [SupportedApiProfile(
             "vulkan",
-            ["VK_KHR_acceleration_structure"],
+            ["VK_NV_ray_tracing"],
             ImpliesSets = [
-                "VK_KHR_deferred_host_operations+VK_VERSION_1_1+VK_EXT_descriptor_indexing+VK_KHR_buffer_device_address",
-                "VK_KHR_deferred_host_operations+VK_VERSION_1_2",
+                "VK_KHR_get_physical_device_properties2+VK_KHR_get_memory_requirements2",
+                "VK_VERSION_1_1",
             ]
         )]
-        [NativeFunction("vulkan", EntryPoint = "vkCmdWriteAccelerationStructuresPropertiesKHR")]
-        static abstract void CmdWriteAccelerationStructuresPropertiesKHR(
+        [NativeFunction("vulkan", EntryPoint = "vkCmdWriteAccelerationStructuresPropertiesNV")]
+        static abstract void CmdWriteAccelerationStructuresPropertiesNV(
             CommandBufferHandle commandBuffer,
-            AccelerationStructureHandleKHR pAccelerationStructures,
+            uint accelerationStructureCount,
+            AccelerationStructureHandleNV* pAccelerationStructures,
             QueryType queryType,
             QueryPoolHandle queryPool,
             uint firstQuery
@@ -9547,26 +9548,25 @@ uint firstQuery
         static abstract void CmdWriteAccelerationStructuresPropertiesNV(
             CommandBufferHandle commandBuffer,
             uint accelerationStructureCount,
-            AccelerationStructureHandleNV* pAccelerationStructures,
+            Ref<AccelerationStructureHandleNV> pAccelerationStructures,
             QueryType queryType,
             QueryPoolHandle queryPool,
             uint firstQuery
         );
 
-        [NativeName("vkCmdWriteAccelerationStructuresPropertiesNV")]
+        [NativeName("vkCmdWriteAccelerationStructuresPropertiesKHR")]
         [SupportedApiProfile(
             "vulkan",
-            ["VK_NV_ray_tracing"],
+            ["VK_KHR_acceleration_structure"],
             ImpliesSets = [
-                "VK_KHR_get_physical_device_properties2+VK_KHR_get_memory_requirements2",
-                "VK_VERSION_1_1",
+                "VK_KHR_deferred_host_operations+VK_VERSION_1_1+VK_EXT_descriptor_indexing+VK_KHR_buffer_device_address",
+                "VK_KHR_deferred_host_operations+VK_VERSION_1_2",
             ]
         )]
-        [NativeFunction("vulkan", EntryPoint = "vkCmdWriteAccelerationStructuresPropertiesNV")]
-        static abstract void CmdWriteAccelerationStructuresPropertiesNV(
+        [NativeFunction("vulkan", EntryPoint = "vkCmdWriteAccelerationStructuresPropertiesKHR")]
+        static abstract void CmdWriteAccelerationStructuresPropertyKHR(
             CommandBufferHandle commandBuffer,
-            uint accelerationStructureCount,
-            Ref<AccelerationStructureHandleNV> pAccelerationStructures,
+            AccelerationStructureHandleKHR pAccelerationStructures,
             QueryType queryType,
             QueryPoolHandle queryPool,
             uint firstQuery
@@ -9582,7 +9582,7 @@ uint firstQuery
             ]
         )]
         [NativeFunction("vulkan", EntryPoint = "vkCmdWriteAccelerationStructuresPropertiesNV")]
-        static abstract void CmdWriteAccelerationStructuresPropertiesNV(
+        static abstract void CmdWriteAccelerationStructuresPropertyNV(
             CommandBufferHandle commandBuffer,
             AccelerationStructureHandleNV pAccelerationStructures,
             QueryType queryType,
@@ -9663,7 +9663,7 @@ uint firstQuery
             ]
         )]
         [NativeFunction("vulkan", EntryPoint = "vkCmdWriteMicromapsPropertiesEXT")]
-        static abstract void CmdWriteMicromapsPropertiesEXT(
+        static abstract void CmdWriteMicromapsPropertyEXT(
             CommandBufferHandle commandBuffer,
             MicromapHandleEXT pMicromaps,
             QueryType queryType,
@@ -25982,10 +25982,9 @@ uint set
         ]
     )]
     [NativeFunction("vulkan", EntryPoint = "vkCmdBindDescriptorBuffersEXT")]
-    void CmdBindDescriptorBuffersEXT(
+    void CmdBindDescriptorBufferEXT(
         CommandBufferHandle commandBuffer,
-        uint bufferCount,
-        DescriptorBufferBindingInfoEXT* pBindingInfos
+        DescriptorBufferBindingInfoEXT pBindingInfos
     );
 
     [NativeName("vkCmdBindDescriptorBuffersEXT")]
@@ -26003,7 +26002,7 @@ void CmdBindDescriptorBuffersEXT(
     void CmdBindDescriptorBuffersEXT(
         CommandBufferHandle commandBuffer,
         uint bufferCount,
-        Ref<DescriptorBufferBindingInfoEXT> pBindingInfos
+        DescriptorBufferBindingInfoEXT* pBindingInfos
     );
 
     [NativeName("vkCmdBindDescriptorBuffersEXT")]
@@ -26020,7 +26019,8 @@ Ref<DescriptorBufferBindingInfoEXT> pBindingInfos
     [NativeFunction("vulkan", EntryPoint = "vkCmdBindDescriptorBuffersEXT")]
     void CmdBindDescriptorBuffersEXT(
         CommandBufferHandle commandBuffer,
-        DescriptorBufferBindingInfoEXT pBindingInfos
+        uint bufferCount,
+        Ref<DescriptorBufferBindingInfoEXT> pBindingInfos
     );
 
     [NativeName("vkCmdBindDescriptorSets")]
@@ -26769,11 +26769,7 @@ Ref<ClusterAccelerationStructureCommandsInfoNV> pCommandInfos
         ]
     )]
     [NativeFunction("vulkan", EntryPoint = "vkCmdBuildMicromapsEXT")]
-    void CmdBuildMicromapsEXT(
-        CommandBufferHandle commandBuffer,
-        uint infoCount,
-        MicromapBuildInfoEXT* pInfos
-    );
+    void CmdBuildMicromapEXT(CommandBufferHandle commandBuffer, MicromapBuildInfoEXT pInfos);
 
     [NativeName("vkCmdBuildMicromapsEXT")]
     [SupportedApiProfile(
@@ -26788,7 +26784,7 @@ void CmdBuildMicromapsEXT(
     void CmdBuildMicromapsEXT(
         CommandBufferHandle commandBuffer,
         uint infoCount,
-        Ref<MicromapBuildInfoEXT> pInfos
+        MicromapBuildInfoEXT* pInfos
     );
 
     [NativeName("vkCmdBuildMicromapsEXT")]
@@ -26801,7 +26797,11 @@ Ref<MicromapBuildInfoEXT> pInfos
         ]
     )]
     [NativeFunction("vulkan", EntryPoint = "vkCmdBuildMicromapsEXT")]
-    void CmdBuildMicromapsEXT(CommandBufferHandle commandBuffer, MicromapBuildInfoEXT pInfos);
+    void CmdBuildMicromapsEXT(
+        CommandBufferHandle commandBuffer,
+        uint infoCount,
+        Ref<MicromapBuildInfoEXT> pInfos
+    );
 
     [NativeName("vkCmdBuildPartitionedAccelerationStructuresNV")]
     [SupportedApiProfile(
@@ -33813,19 +33813,20 @@ void CmdWriteAccelerationStructuresPropertiesKHR(
         uint firstQuery
     );
 
-    [NativeName("vkCmdWriteAccelerationStructuresPropertiesKHR")]
+    [NativeName("vkCmdWriteAccelerationStructuresPropertiesNV")]
     [SupportedApiProfile(
         "vulkan",
-        ["VK_KHR_acceleration_structure"],
+        ["VK_NV_ray_tracing"],
         ImpliesSets = [
-            "VK_KHR_deferred_host_operations+VK_VERSION_1_1+VK_EXT_descriptor_indexing+VK_KHR_buffer_device_address",
-            "VK_KHR_deferred_host_operations+VK_VERSION_1_2",
+            "VK_KHR_get_physical_device_properties2+VK_KHR_get_memory_requirements2",
+            "VK_VERSION_1_1",
         ]
     )]
-    [NativeFunction("vulkan", EntryPoint = "vkCmdWriteAccelerationStructuresPropertiesKHR")]
-    void CmdWriteAccelerationStructuresPropertiesKHR(
+    [NativeFunction("vulkan", EntryPoint = "vkCmdWriteAccelerationStructuresPropertiesNV")]
+    void CmdWriteAccelerationStructuresPropertiesNV(
         CommandBufferHandle commandBuffer,
-        AccelerationStructureHandleKHR pAccelerationStructures,
+        uint accelerationStructureCount,
+        AccelerationStructureHandleNV* pAccelerationStructures,
         QueryType queryType,
         QueryPoolHandle queryPool,
         uint firstQuery
@@ -33844,26 +33845,25 @@ uint firstQuery
     void CmdWriteAccelerationStructuresPropertiesNV(
         CommandBufferHandle commandBuffer,
         uint accelerationStructureCount,
-        AccelerationStructureHandleNV* pAccelerationStructures,
+        Ref<AccelerationStructureHandleNV> pAccelerationStructures,
         QueryType queryType,
         QueryPoolHandle queryPool,
         uint firstQuery
     );
 
-    [NativeName("vkCmdWriteAccelerationStructuresPropertiesNV")]
+    [NativeName("vkCmdWriteAccelerationStructuresPropertiesKHR")]
     [SupportedApiProfile(
         "vulkan",
-        ["VK_NV_ray_tracing"],
+        ["VK_KHR_acceleration_structure"],
         ImpliesSets = [
-            "VK_KHR_get_physical_device_properties2+VK_KHR_get_memory_requirements2",
-            "VK_VERSION_1_1",
+            "VK_KHR_deferred_host_operations+VK_VERSION_1_1+VK_EXT_descriptor_indexing+VK_KHR_buffer_device_address",
+            "VK_KHR_deferred_host_operations+VK_VERSION_1_2",
         ]
     )]
-    [NativeFunction("vulkan", EntryPoint = "vkCmdWriteAccelerationStructuresPropertiesNV")]
-    void CmdWriteAccelerationStructuresPropertiesNV(
+    [NativeFunction("vulkan", EntryPoint = "vkCmdWriteAccelerationStructuresPropertiesKHR")]
+    void CmdWriteAccelerationStructuresPropertyKHR(
         CommandBufferHandle commandBuffer,
-        uint accelerationStructureCount,
-        Ref<AccelerationStructureHandleNV> pAccelerationStructures,
+        AccelerationStructureHandleKHR pAccelerationStructures,
         QueryType queryType,
         QueryPoolHandle queryPool,
         uint firstQuery
@@ -33879,7 +33879,7 @@ uint firstQuery
         ]
     )]
     [NativeFunction("vulkan", EntryPoint = "vkCmdWriteAccelerationStructuresPropertiesNV")]
-    void CmdWriteAccelerationStructuresPropertiesNV(
+    void CmdWriteAccelerationStructuresPropertyNV(
         CommandBufferHandle commandBuffer,
         AccelerationStructureHandleNV pAccelerationStructures,
         QueryType queryType,
@@ -33960,7 +33960,7 @@ uint firstQuery
         ]
     )]
     [NativeFunction("vulkan", EntryPoint = "vkCmdWriteMicromapsPropertiesEXT")]
-    void CmdWriteMicromapsPropertiesEXT(
+    void CmdWriteMicromapsPropertyEXT(
         CommandBufferHandle commandBuffer,
         MicromapHandleEXT pMicromaps,
         QueryType queryType,
diff --git a/sources/Vulkan/Vulkan/Vulkan/Vk.gen.cs b/sources/Vulkan/Vulkan/Vulkan/Vk.gen.cs
index 5645e455ee..92005b824a 100644
--- a/sources/Vulkan/Vulkan/Vulkan/Vk.gen.cs
+++ b/sources/Vulkan/Vulkan/Vulkan/Vk.gen.cs
@@ -1629,6 +1629,28 @@ public static extern void CmdBindDescriptorBufferEmbeddedSamplersEXT(
             uint set
         );
 
+        [NativeName("vkCmdBindDescriptorBuffersEXT")]
+        [SupportedApiProfile(
+            "vulkan",
+            ["VK_EXT_descriptor_buffer"],
+            ImpliesSets = [
+                "VK_KHR_synchronization2+VK_KHR_buffer_device_address+VK_EXT_descriptor_indexing+VK_KHR_get_physical_device_properties2",
+                "VK_KHR_synchronization2+VK_KHR_buffer_device_address+VK_EXT_descriptor_indexing+VK_VERSION_1_1",
+                "VK_KHR_synchronization2+VK_VERSION_1_2",
+                "VK_VERSION_1_3",
+            ]
+        )]
+        [NativeFunction("vulkan", EntryPoint = "vkCmdBindDescriptorBuffersEXT")]
+        public static void CmdBindDescriptorBufferEXT(
+            CommandBufferHandle commandBuffer,
+            DescriptorBufferBindingInfoEXT pBindingInfos
+        ) =>
+            CmdBindDescriptorBuffersEXT(
+                commandBuffer,
+                1,
+                (DescriptorBufferBindingInfoEXT*)&pBindingInfos
+            );
+
         [NativeName("vkCmdBindDescriptorBuffersEXT")]
         [DllImport("vulkan", ExactSpelling = true, EntryPoint = "vkCmdBindDescriptorBuffersEXT")]
         [SupportedApiProfile(
@@ -1674,28 +1696,6 @@ Ref<DescriptorBufferBindingInfoEXT> pBindingInfos
             }
         }
 
-        [NativeName("vkCmdBindDescriptorBuffersEXT")]
-        [SupportedApiProfile(
-            "vulkan",
-            ["VK_EXT_descriptor_buffer"],
-            ImpliesSets = [
-                "VK_KHR_synchronization2+VK_KHR_buffer_device_address+VK_EXT_descriptor_indexing+VK_KHR_get_physical_device_properties2",
-                "VK_KHR_synchronization2+VK_KHR_buffer_device_address+VK_EXT_descriptor_indexing+VK_VERSION_1_1",
-                "VK_KHR_synchronization2+VK_VERSION_1_2",
-                "VK_VERSION_1_3",
-            ]
-        )]
-        [NativeFunction("vulkan", EntryPoint = "vkCmdBindDescriptorBuffersEXT")]
-        public static void CmdBindDescriptorBuffersEXT(
-            CommandBufferHandle commandBuffer,
-            DescriptorBufferBindingInfoEXT pBindingInfos
-        ) =>
-            CmdBindDescriptorBuffersEXT(
-                commandBuffer,
-                1,
-                (DescriptorBufferBindingInfoEXT*)&pBindingInfos
-            );
-
         [NativeName("vkCmdBindDescriptorSets")]
         [DllImport("vulkan", ExactSpelling = true, EntryPoint = "vkCmdBindDescriptorSets")]
         [SupportedApiProfile(
@@ -2724,6 +2724,21 @@ Ref<ClusterAccelerationStructureCommandsInfoNV> pCommandInfos
             }
         }
 
+        [NativeName("vkCmdBuildMicromapsEXT")]
+        [SupportedApiProfile(
+            "vulkan",
+            ["VK_EXT_opacity_micromap"],
+            ImpliesSets = [
+                "VK_KHR_acceleration_structure+VK_KHR_synchronization2",
+                "VK_KHR_acceleration_structure+VK_VERSION_1_3",
+            ]
+        )]
+        [NativeFunction("vulkan", EntryPoint = "vkCmdBuildMicromapsEXT")]
+        public static void CmdBuildMicromapEXT(
+            CommandBufferHandle commandBuffer,
+            MicromapBuildInfoEXT pInfos
+        ) => CmdBuildMicromapsEXT(commandBuffer, 1, (MicromapBuildInfoEXT*)&pInfos);
+
         [NativeName("vkCmdBuildMicromapsEXT")]
         [DllImport("vulkan", ExactSpelling = true, EntryPoint = "vkCmdBuildMicromapsEXT")]
         [SupportedApiProfile(
@@ -2765,21 +2780,6 @@ Ref<MicromapBuildInfoEXT> pInfos
             }
         }
 
-        [NativeName("vkCmdBuildMicromapsEXT")]
-        [SupportedApiProfile(
-            "vulkan",
-            ["VK_EXT_opacity_micromap"],
-            ImpliesSets = [
-                "VK_KHR_acceleration_structure+VK_KHR_synchronization2",
-                "VK_KHR_acceleration_structure+VK_VERSION_1_3",
-            ]
-        )]
-        [NativeFunction("vulkan", EntryPoint = "vkCmdBuildMicromapsEXT")]
-        public static void CmdBuildMicromapsEXT(
-            CommandBufferHandle commandBuffer,
-            MicromapBuildInfoEXT pInfos
-        ) => CmdBuildMicromapsEXT(commandBuffer, 1, (MicromapBuildInfoEXT*)&pInfos);
-
         [NativeName("vkCmdBuildPartitionedAccelerationStructuresNV")]
         [DllImport(
             "vulkan",
@@ -11943,32 +11943,6 @@ uint firstQuery
             }
         }
 
-        [NativeName("vkCmdWriteAccelerationStructuresPropertiesKHR")]
-        [SupportedApiProfile(
-            "vulkan",
-            ["VK_KHR_acceleration_structure"],
-            ImpliesSets = [
-                "VK_KHR_deferred_host_operations+VK_VERSION_1_1+VK_EXT_descriptor_indexing+VK_KHR_buffer_device_address",
-                "VK_KHR_deferred_host_operations+VK_VERSION_1_2",
-            ]
-        )]
-        [NativeFunction("vulkan", EntryPoint = "vkCmdWriteAccelerationStructuresPropertiesKHR")]
-        public static void CmdWriteAccelerationStructuresPropertiesKHR(
-            CommandBufferHandle commandBuffer,
-            AccelerationStructureHandleKHR pAccelerationStructures,
-            QueryType queryType,
-            QueryPoolHandle queryPool,
-            uint firstQuery
-        ) =>
-            CmdWriteAccelerationStructuresPropertiesKHR(
-                commandBuffer,
-                1,
-                (AccelerationStructureHandleKHR*)&pAccelerationStructures,
-                queryType,
-                queryPool,
-                firstQuery
-            );
-
         [NativeName("vkCmdWriteAccelerationStructuresPropertiesNV")]
         [DllImport(
             "vulkan",
@@ -12030,6 +12004,32 @@ uint firstQuery
             }
         }
 
+        [NativeName("vkCmdWriteAccelerationStructuresPropertiesKHR")]
+        [SupportedApiProfile(
+            "vulkan",
+            ["VK_KHR_acceleration_structure"],
+            ImpliesSets = [
+                "VK_KHR_deferred_host_operations+VK_VERSION_1_1+VK_EXT_descriptor_indexing+VK_KHR_buffer_device_address",
+                "VK_KHR_deferred_host_operations+VK_VERSION_1_2",
+            ]
+        )]
+        [NativeFunction("vulkan", EntryPoint = "vkCmdWriteAccelerationStructuresPropertiesKHR")]
+        public static void CmdWriteAccelerationStructuresPropertyKHR(
+            CommandBufferHandle commandBuffer,
+            AccelerationStructureHandleKHR pAccelerationStructures,
+            QueryType queryType,
+            QueryPoolHandle queryPool,
+            uint firstQuery
+        ) =>
+            CmdWriteAccelerationStructuresPropertiesKHR(
+                commandBuffer,
+                1,
+                (AccelerationStructureHandleKHR*)&pAccelerationStructures,
+                queryType,
+                queryPool,
+                firstQuery
+            );
+
         [NativeName("vkCmdWriteAccelerationStructuresPropertiesNV")]
         [SupportedApiProfile(
             "vulkan",
@@ -12040,7 +12040,7 @@ uint firstQuery
             ]
         )]
         [NativeFunction("vulkan", EntryPoint = "vkCmdWriteAccelerationStructuresPropertiesNV")]
-        public static void CmdWriteAccelerationStructuresPropertiesNV(
+        public static void CmdWriteAccelerationStructuresPropertyNV(
             CommandBufferHandle commandBuffer,
             AccelerationStructureHandleNV pAccelerationStructures,
             QueryType queryType,
@@ -12145,7 +12145,7 @@ uint firstQuery
             ]
         )]
         [NativeFunction("vulkan", EntryPoint = "vkCmdWriteMicromapsPropertiesEXT")]
-        public static void CmdWriteMicromapsPropertiesEXT(
+        public static void CmdWriteMicromapsPropertyEXT(
             CommandBufferHandle commandBuffer,
             MicromapHandleEXT pMicromaps,
             QueryType queryType,
@@ -34276,11 +34276,10 @@ uint set
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void CmdBindDescriptorBuffersEXT(
+        public void CmdBindDescriptorBufferEXT(
             CommandBufferHandle commandBuffer,
-            uint bufferCount,
-            DescriptorBufferBindingInfoEXT* pBindingInfos
-        ) => T.CmdBindDescriptorBuffersEXT(commandBuffer, bufferCount, pBindingInfos);
+            DescriptorBufferBindingInfoEXT pBindingInfos
+        ) => T.CmdBindDescriptorBufferEXT(commandBuffer, pBindingInfos);
 
         [NativeName("vkCmdBindDescriptorBuffersEXT")]
         [SupportedApiProfile(
@@ -34300,7 +34299,7 @@ public void CmdBindDescriptorBuffersEXT(
         public void CmdBindDescriptorBuffersEXT(
             CommandBufferHandle commandBuffer,
             uint bufferCount,
-            Ref<DescriptorBufferBindingInfoEXT> pBindingInfos
+            DescriptorBufferBindingInfoEXT* pBindingInfos
         ) => T.CmdBindDescriptorBuffersEXT(commandBuffer, bufferCount, pBindingInfos);
 
         [NativeName("vkCmdBindDescriptorBuffersEXT")]
@@ -34320,8 +34319,9 @@ Ref<DescriptorBufferBindingInfoEXT> pBindingInfos
         )]
         public void CmdBindDescriptorBuffersEXT(
             CommandBufferHandle commandBuffer,
-            DescriptorBufferBindingInfoEXT pBindingInfos
-        ) => T.CmdBindDescriptorBuffersEXT(commandBuffer, pBindingInfos);
+            uint bufferCount,
+            Ref<DescriptorBufferBindingInfoEXT> pBindingInfos
+        ) => T.CmdBindDescriptorBuffersEXT(commandBuffer, bufferCount, pBindingInfos);
 
         [NativeName("vkCmdBindDescriptorSets")]
         [SupportedApiProfile(
@@ -35375,11 +35375,10 @@ Ref<ClusterAccelerationStructureCommandsInfoNV> pCommandInfos
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void CmdBuildMicromapsEXT(
+        public void CmdBuildMicromapEXT(
             CommandBufferHandle commandBuffer,
-            uint infoCount,
-            MicromapBuildInfoEXT* pInfos
-        ) => T.CmdBuildMicromapsEXT(commandBuffer, infoCount, pInfos);
+            MicromapBuildInfoEXT pInfos
+        ) => T.CmdBuildMicromapEXT(commandBuffer, pInfos);
 
         [NativeName("vkCmdBuildMicromapsEXT")]
         [SupportedApiProfile(
@@ -35397,7 +35396,7 @@ public void CmdBuildMicromapsEXT(
         public void CmdBuildMicromapsEXT(
             CommandBufferHandle commandBuffer,
             uint infoCount,
-            Ref<MicromapBuildInfoEXT> pInfos
+            MicromapBuildInfoEXT* pInfos
         ) => T.CmdBuildMicromapsEXT(commandBuffer, infoCount, pInfos);
 
         [NativeName("vkCmdBuildMicromapsEXT")]
@@ -35415,8 +35414,9 @@ Ref<MicromapBuildInfoEXT> pInfos
         )]
         public void CmdBuildMicromapsEXT(
             CommandBufferHandle commandBuffer,
-            MicromapBuildInfoEXT pInfos
-        ) => T.CmdBuildMicromapsEXT(commandBuffer, pInfos);
+            uint infoCount,
+            Ref<MicromapBuildInfoEXT> pInfos
+        ) => T.CmdBuildMicromapsEXT(commandBuffer, infoCount, pInfos);
 
         [NativeName("vkCmdBuildPartitionedAccelerationStructuresNV")]
         [SupportedApiProfile(
@@ -44766,28 +44766,30 @@ uint firstQuery
                 firstQuery
             );
 
-        [NativeName("vkCmdWriteAccelerationStructuresPropertiesKHR")]
+        [NativeName("vkCmdWriteAccelerationStructuresPropertiesNV")]
         [SupportedApiProfile(
             "vulkan",
-            ["VK_KHR_acceleration_structure"],
+            ["VK_NV_ray_tracing"],
             ImpliesSets = [
-                "VK_KHR_deferred_host_operations+VK_VERSION_1_1+VK_EXT_descriptor_indexing+VK_KHR_buffer_device_address",
-                "VK_KHR_deferred_host_operations+VK_VERSION_1_2",
+                "VK_KHR_get_physical_device_properties2+VK_KHR_get_memory_requirements2",
+                "VK_VERSION_1_1",
             ]
         )]
-        [NativeFunction("vulkan", EntryPoint = "vkCmdWriteAccelerationStructuresPropertiesKHR")]
+        [NativeFunction("vulkan", EntryPoint = "vkCmdWriteAccelerationStructuresPropertiesNV")]
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void CmdWriteAccelerationStructuresPropertiesKHR(
+        public void CmdWriteAccelerationStructuresPropertiesNV(
             CommandBufferHandle commandBuffer,
-            AccelerationStructureHandleKHR pAccelerationStructures,
+            uint accelerationStructureCount,
+            AccelerationStructureHandleNV* pAccelerationStructures,
             QueryType queryType,
             QueryPoolHandle queryPool,
             uint firstQuery
         ) =>
-            T.CmdWriteAccelerationStructuresPropertiesKHR(
+            T.CmdWriteAccelerationStructuresPropertiesNV(
                 commandBuffer,
+                accelerationStructureCount,
                 pAccelerationStructures,
                 queryType,
                 queryPool,
@@ -44810,7 +44812,7 @@ uint firstQuery
         public void CmdWriteAccelerationStructuresPropertiesNV(
             CommandBufferHandle commandBuffer,
             uint accelerationStructureCount,
-            AccelerationStructureHandleNV* pAccelerationStructures,
+            Ref<AccelerationStructureHandleNV> pAccelerationStructures,
             QueryType queryType,
             QueryPoolHandle queryPool,
             uint firstQuery
@@ -44824,30 +44826,28 @@ uint firstQuery
                 firstQuery
             );
 
-        [NativeName("vkCmdWriteAccelerationStructuresPropertiesNV")]
+        [NativeName("vkCmdWriteAccelerationStructuresPropertiesKHR")]
         [SupportedApiProfile(
             "vulkan",
-            ["VK_NV_ray_tracing"],
+            ["VK_KHR_acceleration_structure"],
             ImpliesSets = [
-                "VK_KHR_get_physical_device_properties2+VK_KHR_get_memory_requirements2",
-                "VK_VERSION_1_1",
+                "VK_KHR_deferred_host_operations+VK_VERSION_1_1+VK_EXT_descriptor_indexing+VK_KHR_buffer_device_address",
+                "VK_KHR_deferred_host_operations+VK_VERSION_1_2",
             ]
         )]
-        [NativeFunction("vulkan", EntryPoint = "vkCmdWriteAccelerationStructuresPropertiesNV")]
+        [NativeFunction("vulkan", EntryPoint = "vkCmdWriteAccelerationStructuresPropertiesKHR")]
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void CmdWriteAccelerationStructuresPropertiesNV(
+        public void CmdWriteAccelerationStructuresPropertyKHR(
             CommandBufferHandle commandBuffer,
-            uint accelerationStructureCount,
-            Ref<AccelerationStructureHandleNV> pAccelerationStructures,
+            AccelerationStructureHandleKHR pAccelerationStructures,
             QueryType queryType,
             QueryPoolHandle queryPool,
             uint firstQuery
         ) =>
-            T.CmdWriteAccelerationStructuresPropertiesNV(
+            T.CmdWriteAccelerationStructuresPropertyKHR(
                 commandBuffer,
-                accelerationStructureCount,
                 pAccelerationStructures,
                 queryType,
                 queryPool,
@@ -44867,14 +44867,14 @@ uint firstQuery
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void CmdWriteAccelerationStructuresPropertiesNV(
+        public void CmdWriteAccelerationStructuresPropertyNV(
             CommandBufferHandle commandBuffer,
             AccelerationStructureHandleNV pAccelerationStructures,
             QueryType queryType,
             QueryPoolHandle queryPool,
             uint firstQuery
         ) =>
-            T.CmdWriteAccelerationStructuresPropertiesNV(
+            T.CmdWriteAccelerationStructuresPropertyNV(
                 commandBuffer,
                 pAccelerationStructures,
                 queryType,
@@ -44986,14 +44986,14 @@ uint firstQuery
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public void CmdWriteMicromapsPropertiesEXT(
+        public void CmdWriteMicromapsPropertyEXT(
             CommandBufferHandle commandBuffer,
             MicromapHandleEXT pMicromaps,
             QueryType queryType,
             QueryPoolHandle queryPool,
             uint firstQuery
         ) =>
-            T.CmdWriteMicromapsPropertiesEXT(
+            T.CmdWriteMicromapsPropertyEXT(
                 commandBuffer,
                 pMicromaps,
                 queryType,
@@ -65392,16 +65392,10 @@ uint set
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void CmdBindDescriptorBuffersEXT(
+        public static void CmdBindDescriptorBufferEXT(
             CommandBufferHandle commandBuffer,
-            uint bufferCount,
-            DescriptorBufferBindingInfoEXT* pBindingInfos
-        ) =>
-            Underlying.Value!.CmdBindDescriptorBuffersEXT(
-                commandBuffer,
-                bufferCount,
-                pBindingInfos
-            );
+            DescriptorBufferBindingInfoEXT pBindingInfos
+        ) => Underlying.Value!.CmdBindDescriptorBufferEXT(commandBuffer, pBindingInfos);
 
         [NativeName("vkCmdBindDescriptorBuffersEXT")]
         [SupportedApiProfile(
@@ -65421,14 +65415,13 @@ public static void CmdBindDescriptorBuffersEXT(
         public static void CmdBindDescriptorBuffersEXT(
             CommandBufferHandle commandBuffer,
             uint bufferCount,
-            Ref<DescriptorBufferBindingInfoEXT> pBindingInfos
-        )
-        {
-            fixed (DescriptorBufferBindingInfoEXT* __dsl_pBindingInfos = pBindingInfos)
-            {
-                CmdBindDescriptorBuffersEXT(commandBuffer, bufferCount, __dsl_pBindingInfos);
-            }
-        }
+            DescriptorBufferBindingInfoEXT* pBindingInfos
+        ) =>
+            Underlying.Value!.CmdBindDescriptorBuffersEXT(
+                commandBuffer,
+                bufferCount,
+                pBindingInfos
+            );
 
         [NativeName("vkCmdBindDescriptorBuffersEXT")]
         [SupportedApiProfile(
@@ -65447,8 +65440,15 @@ Ref<DescriptorBufferBindingInfoEXT> pBindingInfos
         )]
         public static void CmdBindDescriptorBuffersEXT(
             CommandBufferHandle commandBuffer,
-            DescriptorBufferBindingInfoEXT pBindingInfos
-        ) => Underlying.Value!.CmdBindDescriptorBuffersEXT(commandBuffer, pBindingInfos);
+            uint bufferCount,
+            Ref<DescriptorBufferBindingInfoEXT> pBindingInfos
+        )
+        {
+            fixed (DescriptorBufferBindingInfoEXT* __dsl_pBindingInfos = pBindingInfos)
+            {
+                CmdBindDescriptorBuffersEXT(commandBuffer, bufferCount, __dsl_pBindingInfos);
+            }
+        }
 
         [NativeName("vkCmdBindDescriptorSets")]
         [SupportedApiProfile(
@@ -66637,11 +66637,10 @@ Ref<ClusterAccelerationStructureCommandsInfoNV> pCommandInfos
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void CmdBuildMicromapsEXT(
+        public static void CmdBuildMicromapEXT(
             CommandBufferHandle commandBuffer,
-            uint infoCount,
-            MicromapBuildInfoEXT* pInfos
-        ) => Underlying.Value!.CmdBuildMicromapsEXT(commandBuffer, infoCount, pInfos);
+            MicromapBuildInfoEXT pInfos
+        ) => Underlying.Value!.CmdBuildMicromapEXT(commandBuffer, pInfos);
 
         [NativeName("vkCmdBuildMicromapsEXT")]
         [SupportedApiProfile(
@@ -66659,14 +66658,8 @@ public static void CmdBuildMicromapsEXT(
         public static void CmdBuildMicromapsEXT(
             CommandBufferHandle commandBuffer,
             uint infoCount,
-            Ref<MicromapBuildInfoEXT> pInfos
-        )
-        {
-            fixed (MicromapBuildInfoEXT* __dsl_pInfos = pInfos)
-            {
-                CmdBuildMicromapsEXT(commandBuffer, infoCount, __dsl_pInfos);
-            }
-        }
+            MicromapBuildInfoEXT* pInfos
+        ) => Underlying.Value!.CmdBuildMicromapsEXT(commandBuffer, infoCount, pInfos);
 
         [NativeName("vkCmdBuildMicromapsEXT")]
         [SupportedApiProfile(
@@ -66683,8 +66676,15 @@ Ref<MicromapBuildInfoEXT> pInfos
         )]
         public static void CmdBuildMicromapsEXT(
             CommandBufferHandle commandBuffer,
-            MicromapBuildInfoEXT pInfos
-        ) => Underlying.Value!.CmdBuildMicromapsEXT(commandBuffer, pInfos);
+            uint infoCount,
+            Ref<MicromapBuildInfoEXT> pInfos
+        )
+        {
+            fixed (MicromapBuildInfoEXT* __dsl_pInfos = pInfos)
+            {
+                CmdBuildMicromapsEXT(commandBuffer, infoCount, __dsl_pInfos);
+            }
+        }
 
         [NativeName("vkCmdBuildPartitionedAccelerationStructuresNV")]
         [SupportedApiProfile(
@@ -77188,58 +77188,30 @@ uint firstQuery
             }
         }
 
-        [NativeName("vkCmdWriteAccelerationStructuresPropertiesKHR")]
+        [NativeName("vkCmdWriteAccelerationStructuresPropertiesNV")]
         [SupportedApiProfile(
             "vulkan",
-            ["VK_KHR_acceleration_structure"],
+            ["VK_NV_ray_tracing"],
             ImpliesSets = [
-                "VK_KHR_deferred_host_operations+VK_VERSION_1_1+VK_EXT_descriptor_indexing+VK_KHR_buffer_device_address",
-                "VK_KHR_deferred_host_operations+VK_VERSION_1_2",
+                "VK_KHR_get_physical_device_properties2+VK_KHR_get_memory_requirements2",
+                "VK_VERSION_1_1",
             ]
         )]
-        [NativeFunction("vulkan", EntryPoint = "vkCmdWriteAccelerationStructuresPropertiesKHR")]
+        [NativeFunction("vulkan", EntryPoint = "vkCmdWriteAccelerationStructuresPropertiesNV")]
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void CmdWriteAccelerationStructuresPropertiesKHR(
+        public static void CmdWriteAccelerationStructuresPropertiesNV(
             CommandBufferHandle commandBuffer,
-            AccelerationStructureHandleKHR pAccelerationStructures,
+            uint accelerationStructureCount,
+            AccelerationStructureHandleNV* pAccelerationStructures,
             QueryType queryType,
             QueryPoolHandle queryPool,
             uint firstQuery
         ) =>
-            Underlying.Value!.CmdWriteAccelerationStructuresPropertiesKHR(
+            Underlying.Value!.CmdWriteAccelerationStructuresPropertiesNV(
                 commandBuffer,
-                pAccelerationStructures,
-                queryType,
-                queryPool,
-                firstQuery
-            );
-
-        [NativeName("vkCmdWriteAccelerationStructuresPropertiesNV")]
-        [SupportedApiProfile(
-            "vulkan",
-            ["VK_NV_ray_tracing"],
-            ImpliesSets = [
-                "VK_KHR_get_physical_device_properties2+VK_KHR_get_memory_requirements2",
-                "VK_VERSION_1_1",
-            ]
-        )]
-        [NativeFunction("vulkan", EntryPoint = "vkCmdWriteAccelerationStructuresPropertiesNV")]
-        [MethodImpl(
-            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
-        )]
-        public static void CmdWriteAccelerationStructuresPropertiesNV(
-            CommandBufferHandle commandBuffer,
-            uint accelerationStructureCount,
-            AccelerationStructureHandleNV* pAccelerationStructures,
-            QueryType queryType,
-            QueryPoolHandle queryPool,
-            uint firstQuery
-        ) =>
-            Underlying.Value!.CmdWriteAccelerationStructuresPropertiesNV(
-                commandBuffer,
-                accelerationStructureCount,
+                accelerationStructureCount,
                 pAccelerationStructures,
                 queryType,
                 queryPool,
@@ -77284,6 +77256,34 @@ uint firstQuery
             }
         }
 
+        [NativeName("vkCmdWriteAccelerationStructuresPropertiesKHR")]
+        [SupportedApiProfile(
+            "vulkan",
+            ["VK_KHR_acceleration_structure"],
+            ImpliesSets = [
+                "VK_KHR_deferred_host_operations+VK_VERSION_1_1+VK_EXT_descriptor_indexing+VK_KHR_buffer_device_address",
+                "VK_KHR_deferred_host_operations+VK_VERSION_1_2",
+            ]
+        )]
+        [NativeFunction("vulkan", EntryPoint = "vkCmdWriteAccelerationStructuresPropertiesKHR")]
+        [MethodImpl(
+            MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
+        )]
+        public static void CmdWriteAccelerationStructuresPropertyKHR(
+            CommandBufferHandle commandBuffer,
+            AccelerationStructureHandleKHR pAccelerationStructures,
+            QueryType queryType,
+            QueryPoolHandle queryPool,
+            uint firstQuery
+        ) =>
+            Underlying.Value!.CmdWriteAccelerationStructuresPropertyKHR(
+                commandBuffer,
+                pAccelerationStructures,
+                queryType,
+                queryPool,
+                firstQuery
+            );
+
         [NativeName("vkCmdWriteAccelerationStructuresPropertiesNV")]
         [SupportedApiProfile(
             "vulkan",
@@ -77297,14 +77297,14 @@ uint firstQuery
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void CmdWriteAccelerationStructuresPropertiesNV(
+        public static void CmdWriteAccelerationStructuresPropertyNV(
             CommandBufferHandle commandBuffer,
             AccelerationStructureHandleNV pAccelerationStructures,
             QueryType queryType,
             QueryPoolHandle queryPool,
             uint firstQuery
         ) =>
-            Underlying.Value!.CmdWriteAccelerationStructuresPropertiesNV(
+            Underlying.Value!.CmdWriteAccelerationStructuresPropertyNV(
                 commandBuffer,
                 pAccelerationStructures,
                 queryType,
@@ -77435,14 +77435,14 @@ uint firstQuery
         [MethodImpl(
             MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
         )]
-        public static void CmdWriteMicromapsPropertiesEXT(
+        public static void CmdWriteMicromapsPropertyEXT(
             CommandBufferHandle commandBuffer,
             MicromapHandleEXT pMicromaps,
             QueryType queryType,
             QueryPoolHandle queryPool,
             uint firstQuery
         ) =>
-            Underlying.Value!.CmdWriteMicromapsPropertiesEXT(
+            Underlying.Value!.CmdWriteMicromapsPropertyEXT(
                 commandBuffer,
                 pMicromaps,
                 queryType,
@@ -111473,21 +111473,15 @@ uint set
     )]
     [NativeFunction("vulkan", EntryPoint = "vkCmdBindDescriptorBuffersEXT")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IVk.CmdBindDescriptorBuffersEXT(
+    void IVk.CmdBindDescriptorBufferEXT(
         CommandBufferHandle commandBuffer,
-        uint bufferCount,
-        DescriptorBufferBindingInfoEXT* pBindingInfos
+        DescriptorBufferBindingInfoEXT pBindingInfos
     ) =>
-        (
-            (delegate* unmanaged<CommandBufferHandle, uint, DescriptorBufferBindingInfoEXT*, void>)(
-                _slots[37] is not null and var loadedFnPtr
-                    ? loadedFnPtr
-                    : _slots[37] = nativeContext.LoadFunction(
-                        "vkCmdBindDescriptorBuffersEXT",
-                        "vulkan"
-                    )
-            )
-        )(commandBuffer, bufferCount, pBindingInfos);
+        ((IVk)this).CmdBindDescriptorBuffersEXT(
+            commandBuffer,
+            1,
+            (DescriptorBufferBindingInfoEXT*)&pBindingInfos
+        );
 
     [NativeName("vkCmdBindDescriptorBuffersEXT")]
     [SupportedApiProfile(
@@ -111502,11 +111496,10 @@ _slots[37] is not null and var loadedFnPtr
     )]
     [NativeFunction("vulkan", EntryPoint = "vkCmdBindDescriptorBuffersEXT")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void CmdBindDescriptorBuffersEXT(
+    public static void CmdBindDescriptorBufferEXT(
         CommandBufferHandle commandBuffer,
-        uint bufferCount,
-        DescriptorBufferBindingInfoEXT* pBindingInfos
-    ) => ThisThread.CmdBindDescriptorBuffersEXT(commandBuffer, bufferCount, pBindingInfos);
+        DescriptorBufferBindingInfoEXT pBindingInfos
+    ) => ThisThread.CmdBindDescriptorBufferEXT(commandBuffer, pBindingInfos);
 
     [NativeName("vkCmdBindDescriptorBuffersEXT")]
     [SupportedApiProfile(
@@ -111524,18 +111517,18 @@ public static void CmdBindDescriptorBuffersEXT(
     void IVk.CmdBindDescriptorBuffersEXT(
         CommandBufferHandle commandBuffer,
         uint bufferCount,
-        Ref<DescriptorBufferBindingInfoEXT> pBindingInfos
-    )
-    {
-        fixed (DescriptorBufferBindingInfoEXT* __dsl_pBindingInfos = pBindingInfos)
-        {
-            ((IVk)this).CmdBindDescriptorBuffersEXT(
-                commandBuffer,
-                bufferCount,
-                __dsl_pBindingInfos
-            );
-        }
-    }
+        DescriptorBufferBindingInfoEXT* pBindingInfos
+    ) =>
+        (
+            (delegate* unmanaged<CommandBufferHandle, uint, DescriptorBufferBindingInfoEXT*, void>)(
+                _slots[37] is not null and var loadedFnPtr
+                    ? loadedFnPtr
+                    : _slots[37] = nativeContext.LoadFunction(
+                        "vkCmdBindDescriptorBuffersEXT",
+                        "vulkan"
+                    )
+            )
+        )(commandBuffer, bufferCount, pBindingInfos);
 
     [NativeName("vkCmdBindDescriptorBuffersEXT")]
     [SupportedApiProfile(
@@ -111553,7 +111546,7 @@ Ref<DescriptorBufferBindingInfoEXT> pBindingInfos
     public static void CmdBindDescriptorBuffersEXT(
         CommandBufferHandle commandBuffer,
         uint bufferCount,
-        Ref<DescriptorBufferBindingInfoEXT> pBindingInfos
+        DescriptorBufferBindingInfoEXT* pBindingInfos
     ) => ThisThread.CmdBindDescriptorBuffersEXT(commandBuffer, bufferCount, pBindingInfos);
 
     [NativeName("vkCmdBindDescriptorBuffersEXT")]
@@ -111571,13 +111564,19 @@ Ref<DescriptorBufferBindingInfoEXT> pBindingInfos
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     void IVk.CmdBindDescriptorBuffersEXT(
         CommandBufferHandle commandBuffer,
-        DescriptorBufferBindingInfoEXT pBindingInfos
-    ) =>
-        ((IVk)this).CmdBindDescriptorBuffersEXT(
-            commandBuffer,
-            1,
-            (DescriptorBufferBindingInfoEXT*)&pBindingInfos
-        );
+        uint bufferCount,
+        Ref<DescriptorBufferBindingInfoEXT> pBindingInfos
+    )
+    {
+        fixed (DescriptorBufferBindingInfoEXT* __dsl_pBindingInfos = pBindingInfos)
+        {
+            ((IVk)this).CmdBindDescriptorBuffersEXT(
+                commandBuffer,
+                bufferCount,
+                __dsl_pBindingInfos
+            );
+        }
+    }
 
     [NativeName("vkCmdBindDescriptorBuffersEXT")]
     [SupportedApiProfile(
@@ -111594,8 +111593,9 @@ DescriptorBufferBindingInfoEXT pBindingInfos
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static void CmdBindDescriptorBuffersEXT(
         CommandBufferHandle commandBuffer,
-        DescriptorBufferBindingInfoEXT pBindingInfos
-    ) => ThisThread.CmdBindDescriptorBuffersEXT(commandBuffer, pBindingInfos);
+        uint bufferCount,
+        Ref<DescriptorBufferBindingInfoEXT> pBindingInfos
+    ) => ThisThread.CmdBindDescriptorBuffersEXT(commandBuffer, bufferCount, pBindingInfos);
 
     [NativeName("vkCmdBindDescriptorSets")]
     [SupportedApiProfile(
@@ -113838,18 +113838,8 @@ Ref<ClusterAccelerationStructureCommandsInfoNV> pCommandInfos
     )]
     [NativeFunction("vulkan", EntryPoint = "vkCmdBuildMicromapsEXT")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IVk.CmdBuildMicromapsEXT(
-        CommandBufferHandle commandBuffer,
-        uint infoCount,
-        MicromapBuildInfoEXT* pInfos
-    ) =>
-        (
-            (delegate* unmanaged<CommandBufferHandle, uint, MicromapBuildInfoEXT*, void>)(
-                _slots[61] is not null and var loadedFnPtr
-                    ? loadedFnPtr
-                    : _slots[61] = nativeContext.LoadFunction("vkCmdBuildMicromapsEXT", "vulkan")
-            )
-        )(commandBuffer, infoCount, pInfos);
+    void IVk.CmdBuildMicromapEXT(CommandBufferHandle commandBuffer, MicromapBuildInfoEXT pInfos) =>
+        ((IVk)this).CmdBuildMicromapsEXT(commandBuffer, 1, (MicromapBuildInfoEXT*)&pInfos);
 
     [NativeName("vkCmdBuildMicromapsEXT")]
     [SupportedApiProfile(
@@ -113862,11 +113852,10 @@ _slots[61] is not null and var loadedFnPtr
     )]
     [NativeFunction("vulkan", EntryPoint = "vkCmdBuildMicromapsEXT")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void CmdBuildMicromapsEXT(
+    public static void CmdBuildMicromapEXT(
         CommandBufferHandle commandBuffer,
-        uint infoCount,
-        MicromapBuildInfoEXT* pInfos
-    ) => ThisThread.CmdBuildMicromapsEXT(commandBuffer, infoCount, pInfos);
+        MicromapBuildInfoEXT pInfos
+    ) => ThisThread.CmdBuildMicromapEXT(commandBuffer, pInfos);
 
     [NativeName("vkCmdBuildMicromapsEXT")]
     [SupportedApiProfile(
@@ -113882,14 +113871,15 @@ public static void CmdBuildMicromapsEXT(
     void IVk.CmdBuildMicromapsEXT(
         CommandBufferHandle commandBuffer,
         uint infoCount,
-        Ref<MicromapBuildInfoEXT> pInfos
-    )
-    {
-        fixed (MicromapBuildInfoEXT* __dsl_pInfos = pInfos)
-        {
-            ((IVk)this).CmdBuildMicromapsEXT(commandBuffer, infoCount, __dsl_pInfos);
-        }
-    }
+        MicromapBuildInfoEXT* pInfos
+    ) =>
+        (
+            (delegate* unmanaged<CommandBufferHandle, uint, MicromapBuildInfoEXT*, void>)(
+                _slots[61] is not null and var loadedFnPtr
+                    ? loadedFnPtr
+                    : _slots[61] = nativeContext.LoadFunction("vkCmdBuildMicromapsEXT", "vulkan")
+            )
+        )(commandBuffer, infoCount, pInfos);
 
     [NativeName("vkCmdBuildMicromapsEXT")]
     [SupportedApiProfile(
@@ -113905,7 +113895,7 @@ Ref<MicromapBuildInfoEXT> pInfos
     public static void CmdBuildMicromapsEXT(
         CommandBufferHandle commandBuffer,
         uint infoCount,
-        Ref<MicromapBuildInfoEXT> pInfos
+        MicromapBuildInfoEXT* pInfos
     ) => ThisThread.CmdBuildMicromapsEXT(commandBuffer, infoCount, pInfos);
 
     [NativeName("vkCmdBuildMicromapsEXT")]
@@ -113919,8 +113909,17 @@ Ref<MicromapBuildInfoEXT> pInfos
     )]
     [NativeFunction("vulkan", EntryPoint = "vkCmdBuildMicromapsEXT")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IVk.CmdBuildMicromapsEXT(CommandBufferHandle commandBuffer, MicromapBuildInfoEXT pInfos) =>
-        ((IVk)this).CmdBuildMicromapsEXT(commandBuffer, 1, (MicromapBuildInfoEXT*)&pInfos);
+    void IVk.CmdBuildMicromapsEXT(
+        CommandBufferHandle commandBuffer,
+        uint infoCount,
+        Ref<MicromapBuildInfoEXT> pInfos
+    )
+    {
+        fixed (MicromapBuildInfoEXT* __dsl_pInfos = pInfos)
+        {
+            ((IVk)this).CmdBuildMicromapsEXT(commandBuffer, infoCount, __dsl_pInfos);
+        }
+    }
 
     [NativeName("vkCmdBuildMicromapsEXT")]
     [SupportedApiProfile(
@@ -113935,8 +113934,9 @@ void IVk.CmdBuildMicromapsEXT(CommandBufferHandle commandBuffer, MicromapBuildIn
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     public static void CmdBuildMicromapsEXT(
         CommandBufferHandle commandBuffer,
-        MicromapBuildInfoEXT pInfos
-    ) => ThisThread.CmdBuildMicromapsEXT(commandBuffer, pInfos);
+        uint infoCount,
+        Ref<MicromapBuildInfoEXT> pInfos
+    ) => ThisThread.CmdBuildMicromapsEXT(commandBuffer, infoCount, pInfos);
 
     [NativeName("vkCmdBuildPartitionedAccelerationStructuresNV")]
     [SupportedApiProfile(
@@ -133676,59 +133676,6 @@ uint firstQuery
             firstQuery
         );
 
-    [NativeName("vkCmdWriteAccelerationStructuresPropertiesKHR")]
-    [SupportedApiProfile(
-        "vulkan",
-        ["VK_KHR_acceleration_structure"],
-        ImpliesSets = [
-            "VK_KHR_deferred_host_operations+VK_VERSION_1_1+VK_EXT_descriptor_indexing+VK_KHR_buffer_device_address",
-            "VK_KHR_deferred_host_operations+VK_VERSION_1_2",
-        ]
-    )]
-    [NativeFunction("vulkan", EntryPoint = "vkCmdWriteAccelerationStructuresPropertiesKHR")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IVk.CmdWriteAccelerationStructuresPropertiesKHR(
-        CommandBufferHandle commandBuffer,
-        AccelerationStructureHandleKHR pAccelerationStructures,
-        QueryType queryType,
-        QueryPoolHandle queryPool,
-        uint firstQuery
-    ) =>
-        ((IVk)this).CmdWriteAccelerationStructuresPropertiesKHR(
-            commandBuffer,
-            1,
-            (AccelerationStructureHandleKHR*)&pAccelerationStructures,
-            queryType,
-            queryPool,
-            firstQuery
-        );
-
-    [NativeName("vkCmdWriteAccelerationStructuresPropertiesKHR")]
-    [SupportedApiProfile(
-        "vulkan",
-        ["VK_KHR_acceleration_structure"],
-        ImpliesSets = [
-            "VK_KHR_deferred_host_operations+VK_VERSION_1_1+VK_EXT_descriptor_indexing+VK_KHR_buffer_device_address",
-            "VK_KHR_deferred_host_operations+VK_VERSION_1_2",
-        ]
-    )]
-    [NativeFunction("vulkan", EntryPoint = "vkCmdWriteAccelerationStructuresPropertiesKHR")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void CmdWriteAccelerationStructuresPropertiesKHR(
-        CommandBufferHandle commandBuffer,
-        AccelerationStructureHandleKHR pAccelerationStructures,
-        QueryType queryType,
-        QueryPoolHandle queryPool,
-        uint firstQuery
-    ) =>
-        ThisThread.CmdWriteAccelerationStructuresPropertiesKHR(
-            commandBuffer,
-            pAccelerationStructures,
-            queryType,
-            queryPool,
-            firstQuery
-        );
-
     [NativeName("vkCmdWriteAccelerationStructuresPropertiesNV")]
     [SupportedApiProfile(
         "vulkan",
@@ -133864,6 +133811,59 @@ uint firstQuery
             firstQuery
         );
 
+    [NativeName("vkCmdWriteAccelerationStructuresPropertiesKHR")]
+    [SupportedApiProfile(
+        "vulkan",
+        ["VK_KHR_acceleration_structure"],
+        ImpliesSets = [
+            "VK_KHR_deferred_host_operations+VK_VERSION_1_1+VK_EXT_descriptor_indexing+VK_KHR_buffer_device_address",
+            "VK_KHR_deferred_host_operations+VK_VERSION_1_2",
+        ]
+    )]
+    [NativeFunction("vulkan", EntryPoint = "vkCmdWriteAccelerationStructuresPropertiesKHR")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    void IVk.CmdWriteAccelerationStructuresPropertyKHR(
+        CommandBufferHandle commandBuffer,
+        AccelerationStructureHandleKHR pAccelerationStructures,
+        QueryType queryType,
+        QueryPoolHandle queryPool,
+        uint firstQuery
+    ) =>
+        ((IVk)this).CmdWriteAccelerationStructuresPropertiesKHR(
+            commandBuffer,
+            1,
+            (AccelerationStructureHandleKHR*)&pAccelerationStructures,
+            queryType,
+            queryPool,
+            firstQuery
+        );
+
+    [NativeName("vkCmdWriteAccelerationStructuresPropertiesKHR")]
+    [SupportedApiProfile(
+        "vulkan",
+        ["VK_KHR_acceleration_structure"],
+        ImpliesSets = [
+            "VK_KHR_deferred_host_operations+VK_VERSION_1_1+VK_EXT_descriptor_indexing+VK_KHR_buffer_device_address",
+            "VK_KHR_deferred_host_operations+VK_VERSION_1_2",
+        ]
+    )]
+    [NativeFunction("vulkan", EntryPoint = "vkCmdWriteAccelerationStructuresPropertiesKHR")]
+    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+    public static void CmdWriteAccelerationStructuresPropertyKHR(
+        CommandBufferHandle commandBuffer,
+        AccelerationStructureHandleKHR pAccelerationStructures,
+        QueryType queryType,
+        QueryPoolHandle queryPool,
+        uint firstQuery
+    ) =>
+        ThisThread.CmdWriteAccelerationStructuresPropertyKHR(
+            commandBuffer,
+            pAccelerationStructures,
+            queryType,
+            queryPool,
+            firstQuery
+        );
+
     [NativeName("vkCmdWriteAccelerationStructuresPropertiesNV")]
     [SupportedApiProfile(
         "vulkan",
@@ -133875,7 +133875,7 @@ uint firstQuery
     )]
     [NativeFunction("vulkan", EntryPoint = "vkCmdWriteAccelerationStructuresPropertiesNV")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IVk.CmdWriteAccelerationStructuresPropertiesNV(
+    void IVk.CmdWriteAccelerationStructuresPropertyNV(
         CommandBufferHandle commandBuffer,
         AccelerationStructureHandleNV pAccelerationStructures,
         QueryType queryType,
@@ -133902,14 +133902,14 @@ uint firstQuery
     )]
     [NativeFunction("vulkan", EntryPoint = "vkCmdWriteAccelerationStructuresPropertiesNV")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void CmdWriteAccelerationStructuresPropertiesNV(
+    public static void CmdWriteAccelerationStructuresPropertyNV(
         CommandBufferHandle commandBuffer,
         AccelerationStructureHandleNV pAccelerationStructures,
         QueryType queryType,
         QueryPoolHandle queryPool,
         uint firstQuery
     ) =>
-        ThisThread.CmdWriteAccelerationStructuresPropertiesNV(
+        ThisThread.CmdWriteAccelerationStructuresPropertyNV(
             commandBuffer,
             pAccelerationStructures,
             queryType,
@@ -134147,7 +134147,7 @@ uint firstQuery
     )]
     [NativeFunction("vulkan", EntryPoint = "vkCmdWriteMicromapsPropertiesEXT")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    void IVk.CmdWriteMicromapsPropertiesEXT(
+    void IVk.CmdWriteMicromapsPropertyEXT(
         CommandBufferHandle commandBuffer,
         MicromapHandleEXT pMicromaps,
         QueryType queryType,
@@ -134174,14 +134174,14 @@ uint firstQuery
     )]
     [NativeFunction("vulkan", EntryPoint = "vkCmdWriteMicromapsPropertiesEXT")]
     [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-    public static void CmdWriteMicromapsPropertiesEXT(
+    public static void CmdWriteMicromapsPropertyEXT(
         CommandBufferHandle commandBuffer,
         MicromapHandleEXT pMicromaps,
         QueryType queryType,
         QueryPoolHandle queryPool,
         uint firstQuery
     ) =>
-        ThisThread.CmdWriteMicromapsPropertiesEXT(
+        ThisThread.CmdWriteMicromapsPropertyEXT(
             commandBuffer,
             pMicromaps,
             queryType,
diff --git a/tests/SilkTouch/SilkTouch/DummyTransformationContext.cs b/tests/SilkTouch/SilkTouch/DummyTransformationContext.cs
new file mode 100644
index 0000000000..30073e380a
--- /dev/null
+++ b/tests/SilkTouch/SilkTouch/DummyTransformationContext.cs
@@ -0,0 +1,17 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Silk.NET.SilkTouch.Mods.Transformation;
+
+namespace Silk.NET.SilkTouch.UnitTests;
+
+public class DummyTransformationContext : ITransformationContext
+{
+    public string? JobKey { get; set; } = "Test";
+    public MethodDeclarationSyntax? Original { get; set; }
+    public IFunctionTransformer[]? Transformers { get; set; } = [];
+    public Predicate<UsingDirectiveSyntax> OnAddUsing = _ => true;
+
+    public bool AddUsing(UsingDirectiveSyntax use) => OnAddUsing.Invoke(use);
+}
diff --git a/tests/SilkTouch/SilkTouch/FunctionTransformation/ArrayParameterTransformerTests.SingularizeAffixedName_ShouldNotAffectAffix.verified.txt b/tests/SilkTouch/SilkTouch/FunctionTransformation/ArrayParameterTransformerTests.SingularizeAffixedName_ShouldNotAffectAffix.verified.txt
new file mode 100644
index 0000000000..2e41613a32
--- /dev/null
+++ b/tests/SilkTouch/SilkTouch/FunctionTransformation/ArrayParameterTransformerTests.SingularizeAffixedName_ShouldNotAffectAffix.verified.txt
@@ -0,0 +1,11 @@
+[NameAffix("Suffix", "KhronosVendor", "OES")]
+[NativeFunction("opengl", EntryPoint = "glFeedbackBufferxOES")]
+public static void glFeedbackBufferxOES([NativeTypeName("GLsizei")] uint n, [NativeTypeName("GLenum")] uint type, [NativeTypeName("const GLfixed *")] int* buffer)
+{
+}
+
+[NameAffix("Suffix", "KhronosVendor", "OES")]
+[NativeFunction("opengl", EntryPoint = "glFeedbackBufferxOES")]
+public static void glFeedbackBufferxOES([NativeTypeName("GLenum")] uint type, [NativeTypeName("const GLfixed *")] int buffer)
+{
+}
\ No newline at end of file
diff --git a/tests/SilkTouch/SilkTouch/FunctionTransformation/ArrayParameterTransformerTests.SingularizeAffixedName_ShouldSingularizeBaseName.verified.txt b/tests/SilkTouch/SilkTouch/FunctionTransformation/ArrayParameterTransformerTests.SingularizeAffixedName_ShouldSingularizeBaseName.verified.txt
new file mode 100644
index 0000000000..2b2e32a6aa
--- /dev/null
+++ b/tests/SilkTouch/SilkTouch/FunctionTransformation/ArrayParameterTransformerTests.SingularizeAffixedName_ShouldSingularizeBaseName.verified.txt
@@ -0,0 +1,11 @@
+[NameAffix("Suffix", "KhronosNonVendor", "Direct")]
+[NativeFunction("opengl", EntryPoint = "alDeleteAuxiliaryEffectSlotsDirect")]
+public static void alDeleteAuxiliaryEffectSlotsDirect(ALCcontext context, [NativeTypeName("ALsizei")] int n, [NativeTypeName("const ALuint *")] uint* effectslots)
+{
+}
+
+[NameAffix("Suffix", "KhronosNonVendor", "Direct")]
+[NativeFunction("opengl", EntryPoint = "alDeleteAuxiliaryEffectSlotsDirect")]
+public static void alDeleteAuxiliaryEffectSlotDirect(ALCcontext context, [NativeTypeName("const ALuint *")] uint effectslots)
+{
+}
\ No newline at end of file
diff --git a/tests/SilkTouch/SilkTouch/FunctionTransformation/ArrayParameterTransformerTests.cs b/tests/SilkTouch/SilkTouch/FunctionTransformation/ArrayParameterTransformerTests.cs
new file mode 100644
index 0000000000..e7c7e3a239
--- /dev/null
+++ b/tests/SilkTouch/SilkTouch/FunctionTransformation/ArrayParameterTransformerTests.cs
@@ -0,0 +1,159 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Silk.NET.SilkTouch.Mods.Metadata;
+using Silk.NET.SilkTouch.Mods.Transformation;
+
+namespace Silk.NET.SilkTouch.UnitTests.FunctionTransformation;
+
+public class ArrayParameterTransformerTests
+{
+    [Test]
+    public async Task SingularizeAffixedName_ShouldSingularizeBaseName()
+    {
+        var method = (MethodDeclarationSyntax)
+            SyntaxFactory.ParseMemberDeclaration(
+                """
+                [NameAffix("Suffix", "KhronosNonVendor", "Direct")]
+                [NativeFunction("opengl", EntryPoint = "alDeleteAuxiliaryEffectSlotsDirect")]
+                public static void alDeleteAuxiliaryEffectSlotsDirect(
+                    ALCcontext context,
+                    [NativeTypeName("ALsizei")] int n,
+                    [NativeTypeName("const ALuint *")] uint* effectslots)
+                {
+                }
+                """
+            )!;
+
+        var transformer = new ArrayParameterTransformer();
+        var context = new DummyTransformationContext()
+        {
+            Transformers =
+            [
+                new SingularizeAffixedName_ShouldSingularizeBaseName_MetadataProvider(),
+            ],
+        };
+
+        var results = new List<MethodDeclarationSyntax>();
+        transformer.Transform(
+            method,
+            context,
+            result =>
+            {
+                results.Add(result);
+            }
+        );
+
+        // "Slots" should be pluralized as "Slot"
+        await Verify(string.Join("\n\n", results.Select(result => result.NormalizeWhitespace())));
+    }
+
+    private class SingularizeAffixedName_ShouldSingularizeBaseName_MetadataProvider
+        : IApiMetadataProvider<SymbolConstraints>,
+            IFunctionTransformer
+    {
+        public bool TryGetChildSymbolMetadata(
+            string? jobKey,
+            string nativeName,
+            string childNativeName,
+            [NotNullWhen(true)] out SymbolConstraints? metadata
+        )
+        {
+            if (childNativeName == "effectslots")
+            {
+                metadata = MetadataUtils.CreateBasicSymbolConstraints(
+                    ["n"],
+                    [true, false],
+                    false,
+                    false,
+                    0
+                );
+                return true;
+            }
+
+            metadata = null;
+            return false;
+        }
+
+        public void Transform(
+            MethodDeclarationSyntax current,
+            ITransformationContext ctx,
+            Action<MethodDeclarationSyntax> next
+        ) => next(current);
+    }
+
+    [Test]
+    public async Task SingularizeAffixedName_ShouldNotAffectAffix()
+    {
+        var method = (MethodDeclarationSyntax)
+            SyntaxFactory.ParseMemberDeclaration(
+                """
+                [NameAffix("Suffix", "KhronosVendor", "OES")]
+                [NativeFunction("opengl", EntryPoint = "glFeedbackBufferxOES")]
+                public static void glFeedbackBufferxOES(
+                    [NativeTypeName("GLsizei")] uint n,
+                    [NativeTypeName("GLenum")] uint type,
+                    [NativeTypeName("const GLfixed *")] int* buffer)
+                {
+                }
+                """
+            )!;
+
+        var transformer = new ArrayParameterTransformer();
+        var context = new DummyTransformationContext()
+        {
+            Transformers = [new SingularizeAffixedName_ShouldNotAffectAffix_MetadataProvider()],
+        };
+
+        var results = new List<MethodDeclarationSyntax>();
+        transformer.Transform(
+            method,
+            context,
+            result =>
+            {
+                results.Add(result);
+            }
+        );
+
+        // The "OES" suffix should not be singularized as "O"
+        await Verify(string.Join("\n\n", results.Select(result => result.NormalizeWhitespace())));
+    }
+
+    private class SingularizeAffixedName_ShouldNotAffectAffix_MetadataProvider
+        : IApiMetadataProvider<SymbolConstraints>,
+            IFunctionTransformer
+    {
+        public bool TryGetChildSymbolMetadata(
+            string? jobKey,
+            string nativeName,
+            string childNativeName,
+            [NotNullWhen(true)] out SymbolConstraints? metadata
+        )
+        {
+            if (childNativeName == "buffer")
+            {
+                metadata = MetadataUtils.CreateBasicSymbolConstraints(
+                    ["n"],
+                    [true, false],
+                    false,
+                    false,
+                    0
+                );
+                return true;
+            }
+
+            metadata = null;
+            return false;
+        }
+
+        public void Transform(
+            MethodDeclarationSyntax current,
+            ITransformationContext ctx,
+            Action<MethodDeclarationSyntax> next
+        ) => next(current);
+    }
+}
diff --git a/tests/SilkTouch/SilkTouch/Naming/NameAffixerTests.cs b/tests/SilkTouch/SilkTouch/Naming/NameAffixerTests.cs
new file mode 100644
index 0000000000..b2923185da
--- /dev/null
+++ b/tests/SilkTouch/SilkTouch/Naming/NameAffixerTests.cs
@@ -0,0 +1,104 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Silk.NET.SilkTouch.Naming;
+using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
+
+namespace Silk.NET.SilkTouch.UnitTests.Naming;
+
+public class NameAffixerTests
+{
+    [Test]
+    public void GetAffixes()
+    {
+        var member = ParseMemberDeclaration(
+            """
+            [NameAffix("Prefix", "SharedPrefix", "al")]
+            [NameAffix("Suffix", "KhronosFunctionDataType", "v")]
+            [NameAffix("Suffix", "KhronosNonVendor", "Direct")]
+            [NameAffix("Suffix", "KhronosVendor", "SOFT")]
+            public void alGetBufferPtrvDirectSOFT() { }
+            """
+        );
+
+        var affixes = member!.AttributeLists.GetNameAffixes();
+
+        Assert.That(
+            affixes,
+            Is.EqualTo(
+                [
+                    new NameAffix(NameAffixType.Prefix, "SharedPrefix", "al", 0),
+                    new NameAffix(NameAffixType.Suffix, "KhronosFunctionDataType", "v", 1),
+                    new NameAffix(NameAffixType.Suffix, "KhronosNonVendor", "Direct", 2),
+                    new NameAffix(NameAffixType.Suffix, "KhronosVendor", "SOFT", 3),
+                ]
+            )
+        );
+    }
+
+    [Test]
+    public void ApplyAffixes_AddsAffixes()
+    {
+        Assert.Multiple(() =>
+        {
+            Assert.That(NameAffixer.ApplyAffixes("Name", []), Is.EqualTo("Name"));
+
+            Assert.That(
+                NameAffixer.ApplyAffixes(
+                    "PresentMode",
+                    [
+                        new NameAffix(NameAffixType.Prefix, "Category", "Vk", 0),
+                        new NameAffix(NameAffixType.Suffix, "Category", "KHR", 1),
+                    ]
+                ),
+                Is.EqualTo("VkPresentModeKHR")
+            );
+
+            Assert.That(
+                NameAffixer.ApplyAffixes(
+                    "GetBufferPtr",
+                    [
+                        new NameAffix(NameAffixType.Prefix, "Category", "al", 0),
+                        new NameAffix(NameAffixType.Suffix, "Category", "v", 1),
+                        new NameAffix(NameAffixType.Suffix, "Category", "Direct", 2),
+                        new NameAffix(NameAffixType.Suffix, "Category", "SOFT", 3),
+                    ]
+                ),
+                Is.EqualTo("alGetBufferPtrvDirectSOFT")
+            );
+        });
+    }
+
+    [Test]
+    public void StripAffixes_RemovesAffixes()
+    {
+        Assert.Multiple(() =>
+        {
+            Assert.That(NameAffixer.StripAffixes("Name", []), Is.EqualTo("Name"));
+
+            Assert.That(
+                NameAffixer.StripAffixes(
+                    "VkPresentModeKHR",
+                    [
+                        new NameAffix(NameAffixType.Prefix, "Category", "Vk", 0),
+                        new NameAffix(NameAffixType.Suffix, "Category", "KHR", 1),
+                    ]
+                ),
+                Is.EqualTo("PresentMode")
+            );
+
+            Assert.That(
+                NameAffixer.StripAffixes(
+                    "alGetBufferPtrvDirectSOFT",
+                    [
+                        new NameAffix(NameAffixType.Prefix, "Category", "al", 0),
+                        new NameAffix(NameAffixType.Suffix, "Category", "v", 1),
+                        new NameAffix(NameAffixType.Suffix, "Category", "Direct", 2),
+                        new NameAffix(NameAffixType.Suffix, "Category", "SOFT", 3),
+                    ]
+                ),
+                Is.EqualTo("GetBufferPtr")
+            );
+        });
+    }
+}