diff --git a/src/Generator.Bind/Specifications/GL2/overrides.xml b/src/Generator.Bind/Specifications/GL2/overrides.xml
index d8221cbb..01d9e4e3 100644
--- a/src/Generator.Bind/Specifications/GL2/overrides.xml
+++ b/src/Generator.Bind/Specifications/GL2/overrides.xml
@@ -7458,5 +7458,12 @@
         <count>counterDescLength</count>
       </param>
     </function>
+
+    <!-- GetPerfQueryInfoINTEL is missing count attributes -->
+    <function name="GetPerfQueryInfoINTEL" extension="INTEL">
+      <param name="queryName">
+        <count>queryNameLength</count>
+      </param>
+    </function>
   </replace>
 </signatures>
diff --git a/src/OpenTK/Graphics/OpenGL/GL.cs b/src/OpenTK/Graphics/OpenGL/GL.cs
index daba3996..80f88bef 100644
--- a/src/OpenTK/Graphics/OpenGL/GL.cs
+++ b/src/OpenTK/Graphics/OpenGL/GL.cs
@@ -110652,74 +110652,74 @@ namespace OpenTK.Graphics.OpenGL
             /// <summary>[requires: INTEL_performance_query]</summary>
             /// <param name="queryId"></param>
             /// <param name="queryNameLength"></param>
-            /// <param name="queryName"></param>
+            /// <param name="queryName">[length: queryNameLength]</param>
             /// <param name="dataSize"></param>
             /// <param name="noCounters"></param>
             /// <param name="noInstances"></param>
             /// <param name="capsMask"></param>
             [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")]
             [CLSCompliant(false)]
-            public static void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] Int32[] dataSize, [OutAttribute] Int32[] noCounters, [OutAttribute] Int32[] noInstances, [OutAttribute] Int32[] capsMask) { throw new BindingsNotRewrittenException(); }
+            public static void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] Int32[] dataSize, [OutAttribute] Int32[] noCounters, [OutAttribute] Int32[] noInstances, [OutAttribute] Int32[] capsMask) { throw new BindingsNotRewrittenException(); }
 
             /// <summary>[requires: INTEL_performance_query]</summary>
             /// <param name="queryId"></param>
             /// <param name="queryNameLength"></param>
-            /// <param name="queryName"></param>
+            /// <param name="queryName">[length: queryNameLength]</param>
             /// <param name="dataSize"></param>
             /// <param name="noCounters"></param>
             /// <param name="noInstances"></param>
             /// <param name="capsMask"></param>
             [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")]
             [CLSCompliant(false)]
-            public static void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] out Int32 dataSize, [OutAttribute] out Int32 noCounters, [OutAttribute] out Int32 noInstances, [OutAttribute] out Int32 capsMask) { throw new BindingsNotRewrittenException(); }
+            public static void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] out Int32 dataSize, [OutAttribute] out Int32 noCounters, [OutAttribute] out Int32 noInstances, [OutAttribute] out Int32 capsMask) { throw new BindingsNotRewrittenException(); }
 
             /// <summary>[requires: INTEL_performance_query]</summary>
             /// <param name="queryId"></param>
             /// <param name="queryNameLength"></param>
-            /// <param name="queryName"></param>
+            /// <param name="queryName">[length: queryNameLength]</param>
             /// <param name="dataSize"></param>
             /// <param name="noCounters"></param>
             /// <param name="noInstances"></param>
             /// <param name="capsMask"></param>
             [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")]
             [CLSCompliant(false)]
-            public static unsafe void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] Int32* dataSize, [OutAttribute] Int32* noCounters, [OutAttribute] Int32* noInstances, [OutAttribute] Int32* capsMask) { throw new BindingsNotRewrittenException(); }
+            public static unsafe void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] Int32* dataSize, [OutAttribute] Int32* noCounters, [OutAttribute] Int32* noInstances, [OutAttribute] Int32* capsMask) { throw new BindingsNotRewrittenException(); }
 
             /// <summary>[requires: INTEL_performance_query]</summary>
             /// <param name="queryId"></param>
             /// <param name="queryNameLength"></param>
-            /// <param name="queryName"></param>
+            /// <param name="queryName">[length: queryNameLength]</param>
             /// <param name="dataSize"></param>
             /// <param name="noCounters"></param>
             /// <param name="noInstances"></param>
             /// <param name="capsMask"></param>
             [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")]
             [CLSCompliant(false)]
-            public static void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] UInt32[] dataSize, [OutAttribute] UInt32[] noCounters, [OutAttribute] UInt32[] noInstances, [OutAttribute] UInt32[] capsMask) { throw new BindingsNotRewrittenException(); }
+            public static void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] UInt32[] dataSize, [OutAttribute] UInt32[] noCounters, [OutAttribute] UInt32[] noInstances, [OutAttribute] UInt32[] capsMask) { throw new BindingsNotRewrittenException(); }
 
             /// <summary>[requires: INTEL_performance_query]</summary>
             /// <param name="queryId"></param>
             /// <param name="queryNameLength"></param>
-            /// <param name="queryName"></param>
+            /// <param name="queryName">[length: queryNameLength]</param>
             /// <param name="dataSize"></param>
             /// <param name="noCounters"></param>
             /// <param name="noInstances"></param>
             /// <param name="capsMask"></param>
             [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")]
             [CLSCompliant(false)]
-            public static void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] out UInt32 dataSize, [OutAttribute] out UInt32 noCounters, [OutAttribute] out UInt32 noInstances, [OutAttribute] out UInt32 capsMask) { throw new BindingsNotRewrittenException(); }
+            public static void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] out UInt32 dataSize, [OutAttribute] out UInt32 noCounters, [OutAttribute] out UInt32 noInstances, [OutAttribute] out UInt32 capsMask) { throw new BindingsNotRewrittenException(); }
 
             /// <summary>[requires: INTEL_performance_query]</summary>
             /// <param name="queryId"></param>
             /// <param name="queryNameLength"></param>
-            /// <param name="queryName"></param>
+            /// <param name="queryName">[length: queryNameLength]</param>
             /// <param name="dataSize"></param>
             /// <param name="noCounters"></param>
             /// <param name="noInstances"></param>
             /// <param name="capsMask"></param>
             [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")]
             [CLSCompliant(false)]
-            public static unsafe void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask) { throw new BindingsNotRewrittenException(); }
+            public static unsafe void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask) { throw new BindingsNotRewrittenException(); }
 
             /// <summary>[requires: INTEL_map_texture]</summary>
             /// <param name="texture"></param>
@@ -147807,7 +147807,7 @@ namespace OpenTK.Graphics.OpenGL
         private static extern unsafe void glGetPerfQueryIdByNameINTEL(IntPtr queryName, [OutAttribute] UInt32* queryId);
         [Slot(959)]
         [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)]
-        private static extern unsafe void glGetPerfQueryInfoINTEL(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] IntPtr queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask);
+        private static extern unsafe void glGetPerfQueryInfoINTEL(UInt32 queryId, UInt32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] IntPtr queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask);
         [Slot(1338)]
         [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)]
         private static extern unsafe IntPtr glMapTexture2DINTEL(UInt32 texture, Int32 level, UInt32 access, [OutAttribute, CountAttribute(Count = 1)] Int32* stride, [OutAttribute, CountAttribute(Count = 1)] System.Int32* layout);
diff --git a/src/OpenTK/Graphics/OpenGL4/GL4.cs b/src/OpenTK/Graphics/OpenGL4/GL4.cs
index d5a98554..7cf95e0a 100644
--- a/src/OpenTK/Graphics/OpenGL4/GL4.cs
+++ b/src/OpenTK/Graphics/OpenGL4/GL4.cs
@@ -63862,74 +63862,74 @@ namespace OpenTK.Graphics.OpenGL4
             /// <summary>[requires: INTEL_performance_query]</summary>
             /// <param name="queryId"></param>
             /// <param name="queryNameLength"></param>
-            /// <param name="queryName"></param>
+            /// <param name="queryName">[length: queryNameLength]</param>
             /// <param name="dataSize"></param>
             /// <param name="noCounters"></param>
             /// <param name="noInstances"></param>
             /// <param name="capsMask"></param>
             [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")]
             [CLSCompliant(false)]
-            public static void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] Int32[] dataSize, [OutAttribute] Int32[] noCounters, [OutAttribute] Int32[] noInstances, [OutAttribute] Int32[] capsMask) { throw new BindingsNotRewrittenException(); }
+            public static void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] Int32[] dataSize, [OutAttribute] Int32[] noCounters, [OutAttribute] Int32[] noInstances, [OutAttribute] Int32[] capsMask) { throw new BindingsNotRewrittenException(); }
 
             /// <summary>[requires: INTEL_performance_query]</summary>
             /// <param name="queryId"></param>
             /// <param name="queryNameLength"></param>
-            /// <param name="queryName"></param>
+            /// <param name="queryName">[length: queryNameLength]</param>
             /// <param name="dataSize"></param>
             /// <param name="noCounters"></param>
             /// <param name="noInstances"></param>
             /// <param name="capsMask"></param>
             [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")]
             [CLSCompliant(false)]
-            public static void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] out Int32 dataSize, [OutAttribute] out Int32 noCounters, [OutAttribute] out Int32 noInstances, [OutAttribute] out Int32 capsMask) { throw new BindingsNotRewrittenException(); }
+            public static void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] out Int32 dataSize, [OutAttribute] out Int32 noCounters, [OutAttribute] out Int32 noInstances, [OutAttribute] out Int32 capsMask) { throw new BindingsNotRewrittenException(); }
 
             /// <summary>[requires: INTEL_performance_query]</summary>
             /// <param name="queryId"></param>
             /// <param name="queryNameLength"></param>
-            /// <param name="queryName"></param>
+            /// <param name="queryName">[length: queryNameLength]</param>
             /// <param name="dataSize"></param>
             /// <param name="noCounters"></param>
             /// <param name="noInstances"></param>
             /// <param name="capsMask"></param>
             [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")]
             [CLSCompliant(false)]
-            public static unsafe void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] Int32* dataSize, [OutAttribute] Int32* noCounters, [OutAttribute] Int32* noInstances, [OutAttribute] Int32* capsMask) { throw new BindingsNotRewrittenException(); }
+            public static unsafe void GetPerfQueryInfo(Int32 queryId, Int32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] Int32* dataSize, [OutAttribute] Int32* noCounters, [OutAttribute] Int32* noInstances, [OutAttribute] Int32* capsMask) { throw new BindingsNotRewrittenException(); }
 
             /// <summary>[requires: INTEL_performance_query]</summary>
             /// <param name="queryId"></param>
             /// <param name="queryNameLength"></param>
-            /// <param name="queryName"></param>
+            /// <param name="queryName">[length: queryNameLength]</param>
             /// <param name="dataSize"></param>
             /// <param name="noCounters"></param>
             /// <param name="noInstances"></param>
             /// <param name="capsMask"></param>
             [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")]
             [CLSCompliant(false)]
-            public static void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] UInt32[] dataSize, [OutAttribute] UInt32[] noCounters, [OutAttribute] UInt32[] noInstances, [OutAttribute] UInt32[] capsMask) { throw new BindingsNotRewrittenException(); }
+            public static void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] UInt32[] dataSize, [OutAttribute] UInt32[] noCounters, [OutAttribute] UInt32[] noInstances, [OutAttribute] UInt32[] capsMask) { throw new BindingsNotRewrittenException(); }
 
             /// <summary>[requires: INTEL_performance_query]</summary>
             /// <param name="queryId"></param>
             /// <param name="queryNameLength"></param>
-            /// <param name="queryName"></param>
+            /// <param name="queryName">[length: queryNameLength]</param>
             /// <param name="dataSize"></param>
             /// <param name="noCounters"></param>
             /// <param name="noInstances"></param>
             /// <param name="capsMask"></param>
             [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")]
             [CLSCompliant(false)]
-            public static void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] out UInt32 dataSize, [OutAttribute] out UInt32 noCounters, [OutAttribute] out UInt32 noInstances, [OutAttribute] out UInt32 capsMask) { throw new BindingsNotRewrittenException(); }
+            public static void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] out UInt32 dataSize, [OutAttribute] out UInt32 noCounters, [OutAttribute] out UInt32 noInstances, [OutAttribute] out UInt32 capsMask) { throw new BindingsNotRewrittenException(); }
 
             /// <summary>[requires: INTEL_performance_query]</summary>
             /// <param name="queryId"></param>
             /// <param name="queryNameLength"></param>
-            /// <param name="queryName"></param>
+            /// <param name="queryName">[length: queryNameLength]</param>
             /// <param name="dataSize"></param>
             /// <param name="noCounters"></param>
             /// <param name="noInstances"></param>
             /// <param name="capsMask"></param>
             [AutoGenerated(Category = "INTEL_performance_query", Version = "", EntryPoint = "glGetPerfQueryInfoINTEL")]
             [CLSCompliant(false)]
-            public static unsafe void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] out String queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask) { throw new BindingsNotRewrittenException(); }
+            public static unsafe void GetPerfQueryInfo(UInt32 queryId, UInt32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] out String queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask) { throw new BindingsNotRewrittenException(); }
 
         }
 
@@ -80171,7 +80171,7 @@ namespace OpenTK.Graphics.OpenGL4
         private static extern unsafe void glGetPerfQueryIdByNameINTEL(IntPtr queryName, [OutAttribute] UInt32* queryId);
         [Slot(494)]
         [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)]
-        private static extern unsafe void glGetPerfQueryInfoINTEL(UInt32 queryId, UInt32 queryNameLength, [OutAttribute] IntPtr queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask);
+        private static extern unsafe void glGetPerfQueryInfoINTEL(UInt32 queryId, UInt32 queryNameLength, [OutAttribute, CountAttribute(Parameter = "queryNameLength")] IntPtr queryName, [OutAttribute] UInt32* dataSize, [OutAttribute] UInt32* noCounters, [OutAttribute] UInt32* noInstances, [OutAttribute] UInt32* capsMask);
         [Slot(37)]
         [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)]
         private static extern void glBlendBarrierKHR();