diff --git a/src/Generator.Bind/Specifications/GL2/overrides.xml b/src/Generator.Bind/Specifications/GL2/overrides.xml
index 01d9e4e3..e3fefd9c 100644
--- a/src/Generator.Bind/Specifications/GL2/overrides.xml
+++ b/src/Generator.Bind/Specifications/GL2/overrides.xml
@@ -5536,8 +5536,12 @@
     <function name="GetProgramPipelineInfoLog" extension="EXT">
       <param name="length" legacyArrayParameter="true" />
     </function>
+    <!-- GetTranslatedShaderSource is missing count attributes -->
     <function name="GetTranslatedShaderSource" extension="ANGLE">
       <param name="length" legacyArrayParameter="true" />
+      <param name="source">
+        <count>bufsize</count>
+      </param>
     </function>
     <function name="GetProgramBinary" extension="OES">
       <param name="length" legacyArrayParameter="true" />
diff --git a/src/OpenTK/Graphics/ES20/ES20.cs b/src/OpenTK/Graphics/ES20/ES20.cs
index 5ea99a67..2cbceeeb 100644
--- a/src/OpenTK/Graphics/ES20/ES20.cs
+++ b/src/OpenTK/Graphics/ES20/ES20.cs
@@ -2219,57 +2219,57 @@ namespace OpenTK.Graphics.ES20
             /// <param name="shader"></param>
             /// <param name="bufsize"></param>
             /// <param name="length">[length: 1]</param>
-            /// <param name="source"></param>
+            /// <param name="source">[length: bufsize]</param>
             [Obsolete("Use out overload instead")]
             [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")]
             [CLSCompliant(false)]
-            public static void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); }
+            public static void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); }
 
             /// <summary>[requires: ANGLE_translated_shader_source]</summary>
             /// <param name="shader"></param>
             /// <param name="bufsize"></param>
             /// <param name="length">[length: 1]</param>
-            /// <param name="source"></param>
+            /// <param name="source">[length: bufsize]</param>
             [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")]
             [CLSCompliant(false)]
-            public static void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] out Int32 length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); }
+            public static void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] out Int32 length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); }
 
             /// <summary>[requires: ANGLE_translated_shader_source]</summary>
             /// <param name="shader"></param>
             /// <param name="bufsize"></param>
             /// <param name="length">[length: 1]</param>
-            /// <param name="source"></param>
+            /// <param name="source">[length: bufsize]</param>
             [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")]
             [CLSCompliant(false)]
-            public static unsafe void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); }
+            public static unsafe void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); }
 
             /// <summary>[requires: ANGLE_translated_shader_source]</summary>
             /// <param name="shader"></param>
             /// <param name="bufsize"></param>
             /// <param name="length">[length: 1]</param>
-            /// <param name="source"></param>
+            /// <param name="source">[length: bufsize]</param>
             [Obsolete("Use out overload instead")]
             [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")]
             [CLSCompliant(false)]
-            public static void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); }
+            public static void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); }
 
             /// <summary>[requires: ANGLE_translated_shader_source]</summary>
             /// <param name="shader"></param>
             /// <param name="bufsize"></param>
             /// <param name="length">[length: 1]</param>
-            /// <param name="source"></param>
+            /// <param name="source">[length: bufsize]</param>
             [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")]
             [CLSCompliant(false)]
-            public static void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] out Int32 length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); }
+            public static void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] out Int32 length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); }
 
             /// <summary>[requires: ANGLE_translated_shader_source]</summary>
             /// <param name="shader"></param>
             /// <param name="bufsize"></param>
             /// <param name="length">[length: 1]</param>
-            /// <param name="source"></param>
+            /// <param name="source">[length: bufsize]</param>
             [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")]
             [CLSCompliant(false)]
-            public static unsafe void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); }
+            public static unsafe void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); }
 
             /// <summary>[requires: ANGLE_framebuffer_multisample]
             /// Establish data storage, format, dimensions and sample count of a renderbuffer object's image
@@ -53546,7 +53546,7 @@ namespace OpenTK.Graphics.ES20
         private static extern void glDrawElementsInstancedANGLE(System.Int32 mode, Int32 count, System.Int32 type, [CountAttribute(Computed = "count,type")] IntPtr indices, Int32 primcount);
         [Slot(308)]
         [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)]
-        private static extern unsafe void glGetTranslatedShaderSourceANGLE(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute] IntPtr source);
+        private static extern unsafe void glGetTranslatedShaderSourceANGLE(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute, CountAttribute(Parameter = "bufsize")] IntPtr source);
         [Slot(482)]
         [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)]
         private static extern void glRenderbufferStorageMultisampleANGLE(System.Int32 target, Int32 samples, System.Int32 internalformat, Int32 width, Int32 height);
diff --git a/src/OpenTK/Graphics/ES30/ES30.cs b/src/OpenTK/Graphics/ES30/ES30.cs
index a2ea1d3e..f28d51bd 100644
--- a/src/OpenTK/Graphics/ES30/ES30.cs
+++ b/src/OpenTK/Graphics/ES30/ES30.cs
@@ -2427,57 +2427,57 @@ namespace OpenTK.Graphics.ES30
             /// <param name="shader"></param>
             /// <param name="bufsize"></param>
             /// <param name="length">[length: 1]</param>
-            /// <param name="source"></param>
+            /// <param name="source">[length: bufsize]</param>
             [Obsolete("Use out overload instead")]
             [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")]
             [CLSCompliant(false)]
-            public static void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); }
+            public static void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); }
 
             /// <summary>[requires: ANGLE_translated_shader_source]</summary>
             /// <param name="shader"></param>
             /// <param name="bufsize"></param>
             /// <param name="length">[length: 1]</param>
-            /// <param name="source"></param>
+            /// <param name="source">[length: bufsize]</param>
             [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")]
             [CLSCompliant(false)]
-            public static void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] out Int32 length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); }
+            public static void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] out Int32 length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); }
 
             /// <summary>[requires: ANGLE_translated_shader_source]</summary>
             /// <param name="shader"></param>
             /// <param name="bufsize"></param>
             /// <param name="length">[length: 1]</param>
-            /// <param name="source"></param>
+            /// <param name="source">[length: bufsize]</param>
             [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")]
             [CLSCompliant(false)]
-            public static unsafe void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); }
+            public static unsafe void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); }
 
             /// <summary>[requires: ANGLE_translated_shader_source]</summary>
             /// <param name="shader"></param>
             /// <param name="bufsize"></param>
             /// <param name="length">[length: 1]</param>
-            /// <param name="source"></param>
+            /// <param name="source">[length: bufsize]</param>
             [Obsolete("Use out overload instead")]
             [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")]
             [CLSCompliant(false)]
-            public static void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); }
+            public static void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); }
 
             /// <summary>[requires: ANGLE_translated_shader_source]</summary>
             /// <param name="shader"></param>
             /// <param name="bufsize"></param>
             /// <param name="length">[length: 1]</param>
-            /// <param name="source"></param>
+            /// <param name="source">[length: bufsize]</param>
             [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")]
             [CLSCompliant(false)]
-            public static void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] out Int32 length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); }
+            public static void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] out Int32 length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); }
 
             /// <summary>[requires: ANGLE_translated_shader_source]</summary>
             /// <param name="shader"></param>
             /// <param name="bufsize"></param>
             /// <param name="length">[length: 1]</param>
-            /// <param name="source"></param>
+            /// <param name="source">[length: bufsize]</param>
             [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")]
             [CLSCompliant(false)]
-            public static unsafe void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); }
+            public static unsafe void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); }
 
             /// <summary>[requires: ANGLE_framebuffer_multisample]
             /// Establish data storage, format, dimensions and sample count of a renderbuffer object's image
@@ -61559,7 +61559,7 @@ namespace OpenTK.Graphics.ES30
         private static extern void glDrawElementsInstancedANGLE(System.Int32 mode, Int32 count, System.Int32 type, [CountAttribute(Computed = "count,type")] IntPtr indices, Int32 primcount);
         [Slot(361)]
         [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)]
-        private static extern unsafe void glGetTranslatedShaderSourceANGLE(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute] IntPtr source);
+        private static extern unsafe void glGetTranslatedShaderSourceANGLE(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute, CountAttribute(Parameter = "bufsize")] IntPtr source);
         [Slot(553)]
         [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)]
         private static extern void glRenderbufferStorageMultisampleANGLE(System.Int32 target, Int32 samples, System.Int32 internalformat, Int32 width, Int32 height);
diff --git a/src/OpenTK/Graphics/ES31/ES31.cs b/src/OpenTK/Graphics/ES31/ES31.cs
index 42c4b5b1..ec69e03a 100644
--- a/src/OpenTK/Graphics/ES31/ES31.cs
+++ b/src/OpenTK/Graphics/ES31/ES31.cs
@@ -2557,57 +2557,57 @@ namespace OpenTK.Graphics.ES31
             /// <param name="shader"></param>
             /// <param name="bufsize"></param>
             /// <param name="length">[length: 1]</param>
-            /// <param name="source"></param>
+            /// <param name="source">[length: bufsize]</param>
             [Obsolete("Use out overload instead")]
             [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")]
             [CLSCompliant(false)]
-            public static void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); }
+            public static void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); }
 
             /// <summary>[requires: ANGLE_translated_shader_source]</summary>
             /// <param name="shader"></param>
             /// <param name="bufsize"></param>
             /// <param name="length">[length: 1]</param>
-            /// <param name="source"></param>
+            /// <param name="source">[length: bufsize]</param>
             [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")]
             [CLSCompliant(false)]
-            public static void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] out Int32 length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); }
+            public static void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] out Int32 length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); }
 
             /// <summary>[requires: ANGLE_translated_shader_source]</summary>
             /// <param name="shader"></param>
             /// <param name="bufsize"></param>
             /// <param name="length">[length: 1]</param>
-            /// <param name="source"></param>
+            /// <param name="source">[length: bufsize]</param>
             [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")]
             [CLSCompliant(false)]
-            public static unsafe void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); }
+            public static unsafe void GetTranslatedShaderSource(Int32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); }
 
             /// <summary>[requires: ANGLE_translated_shader_source]</summary>
             /// <param name="shader"></param>
             /// <param name="bufsize"></param>
             /// <param name="length">[length: 1]</param>
-            /// <param name="source"></param>
+            /// <param name="source">[length: bufsize]</param>
             [Obsolete("Use out overload instead")]
             [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")]
             [CLSCompliant(false)]
-            public static void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); }
+            public static void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32[] length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); }
 
             /// <summary>[requires: ANGLE_translated_shader_source]</summary>
             /// <param name="shader"></param>
             /// <param name="bufsize"></param>
             /// <param name="length">[length: 1]</param>
-            /// <param name="source"></param>
+            /// <param name="source">[length: bufsize]</param>
             [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")]
             [CLSCompliant(false)]
-            public static void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] out Int32 length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); }
+            public static void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] out Int32 length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); }
 
             /// <summary>[requires: ANGLE_translated_shader_source]</summary>
             /// <param name="shader"></param>
             /// <param name="bufsize"></param>
             /// <param name="length">[length: 1]</param>
-            /// <param name="source"></param>
+            /// <param name="source">[length: bufsize]</param>
             [AutoGenerated(Category = "ANGLE_translated_shader_source", Version = "", EntryPoint = "glGetTranslatedShaderSourceANGLE")]
             [CLSCompliant(false)]
-            public static unsafe void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute] out String source) { throw new BindingsNotRewrittenException(); }
+            public static unsafe void GetTranslatedShaderSource(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute, CountAttribute(Parameter = "bufsize")] out String source) { throw new BindingsNotRewrittenException(); }
 
             /// <summary>[requires: ANGLE_framebuffer_multisample]
             /// Establish data storage, format, dimensions and sample count of a renderbuffer object's image
@@ -58544,7 +58544,7 @@ namespace OpenTK.Graphics.ES31
         private static extern void glDrawElementsInstancedANGLE(System.Int32 mode, Int32 count, System.Int32 type, [CountAttribute(Computed = "count,type")] IntPtr indices, Int32 primcount);
         [Slot(385)]
         [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)]
-        private static extern unsafe void glGetTranslatedShaderSourceANGLE(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute] IntPtr source);
+        private static extern unsafe void glGetTranslatedShaderSourceANGLE(UInt32 shader, Int32 bufsize, [OutAttribute, CountAttribute(Count = 1)] Int32* length, [OutAttribute, CountAttribute(Parameter = "bufsize")] IntPtr source);
         [Slot(613)]
         [DllImport(Library, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)]
         private static extern void glRenderbufferStorageMultisampleANGLE(System.Int32 target, Int32 samples, System.Int32 internalformat, Int32 width, Int32 height);