diff --git a/.travis.yml b/.travis.yml
index 600ee103..2783d9fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: csharp
 
-sudo: false  # use the new container-based Travis infrastructure 
+sudo: false  # use the new container-based Travis infrastructure
 
 before_install:
   - chmod +x build.sh
@@ -10,10 +10,10 @@ before_script:
  - "export DISPLAY=:99.0"
  - "sh -e /etc/init.d/xvfb start"
  - sleep 3 # give xvfb some time to start
- 
-script: 
-  - ./build.sh NuGet
-  
+
+script:
+  - travis_wait ./build.sh NuGet
+
 after_script:
   - mono --debug --profile=log:coverage,covfilter=+OpenTK,covfilter=-OpenTK.Tests,covfilter=-FSharp.Core,covfilter=-FsCheck,covfilter=-xunit.assert "packages/xunit.runner.console/tools/xunit.console.exe"  "tests/OpenTK.Tests/bin/Release/OpenTK.Tests.dll" -parallel none
   - mprof-report --reports=coverage --coverage-out=coverage.xml output.mlpd
diff --git a/src/Generator.Bind/CSharpSpecWriter.cs b/src/Generator.Bind/CSharpSpecWriter.cs
index f9c00c7f..003cc71d 100644
--- a/src/Generator.Bind/CSharpSpecWriter.cs
+++ b/src/Generator.Bind/CSharpSpecWriter.cs
@@ -662,15 +662,13 @@ namespace Bind
             if (f.Parameters.HasGenericParameters)
             {
                 sb.Append("<");
-                foreach (Parameter p in f.Parameters)
+                foreach (Parameter p in f.Parameters.Where(p  => p.Generic))
                 {
-                    if (p.Generic)
-                    {
-                        sb.Append(p.CurrentType);
-                        sb.Append(",");
-                    }
+                    sb.Append(p.CurrentType);
+                    sb.Append(", ");
                 }
-                sb.Remove(sb.Length - 1, 1);
+
+                sb.Remove(sb.Length - 2, 2);
                 sb.Append(">");
             }
 
@@ -679,12 +677,9 @@ namespace Bind
             if (f.Parameters.HasGenericParameters)
             {
                 sb.AppendLine();
-                foreach (Parameter p in f.Parameters)
+                foreach (Parameter p in f.Parameters.Where(p => p.Generic))
                 {
-                    if (p.Generic)
-                    {
-                        sb.AppendLine(String.Format("    where {0} : struct", p.CurrentType));
-                    }
+                    sb.AppendLine(String.Format("    where {0} : struct", p.CurrentType));
                 }
             }
 
diff --git a/src/Generator.Rewrite/Program.cs b/src/Generator.Rewrite/Program.cs
index 480485a6..c58f05f2 100644
--- a/src/Generator.Rewrite/Program.cs
+++ b/src/Generator.Rewrite/Program.cs
@@ -552,7 +552,7 @@ namespace OpenTK.Rewrite
 
                 if (!p.ParameterType.IsArray && p.ParameterType.Name == "String")
                 {
-                    EmitStringEpilogue(wrapper, p, body, il,GetGeneratedVariable(generatedVariables, p.Name + "_string_ptr", body));
+                    EmitStringEpilogue(wrapper, p, body, il, GetGeneratedVariable(generatedVariables, p.Name + "_string_ptr", body));
                 }
 
                 if (p.ParameterType.IsArray && p.ParameterType.GetElementType().Name == "String")
diff --git a/src/OpenTK/Audio/OpenAL/Alc/Alc.cs b/src/OpenTK/Audio/OpenAL/Alc/Alc.cs
index a49f4d31..ef6d39a7 100644
--- a/src/OpenTK/Audio/OpenAL/Alc/Alc.cs
+++ b/src/OpenTK/Audio/OpenAL/Alc/Alc.cs
@@ -435,7 +435,7 @@ namespace OpenTK.Audio.OpenAL
         /// <param name="buffer">a buffer, which must be large enough to accommodate the number of samples.</param>
         /// <param name="samples">the number of samples to be retrieved.</param>
         [CLSCompliant(false)]
-        public static void CaptureSamples<T>(IntPtr device, T[, ,] buffer, int samples)
+        public static void CaptureSamples<T>(IntPtr device, T[,,] buffer, int samples)
             where T : struct
         {
             CaptureSamples(device, ref buffer[0, 0, 0], samples);
diff --git a/src/OpenTK/BlittableValueType.cs b/src/OpenTK/BlittableValueType.cs
index 2c1a362f..264aa83f 100644
--- a/src/OpenTK/BlittableValueType.cs
+++ b/src/OpenTK/BlittableValueType.cs
@@ -178,7 +178,7 @@ namespace OpenTK
         /// <param name="type">An instance of the type to check.</param>
         /// <returns>True if T is blittable; false otherwise.</returns>
         [CLSCompliant(false)]
-        public static bool Check<T>(T[, ,] type)
+        public static bool Check<T>(T[,,] type)
         {
             return BlittableValueType<T>.Check();
         }
@@ -255,7 +255,7 @@ namespace OpenTK
         /// <returns>An integer, specifying the size of the type in bytes.</returns>
         /// <exception cref="System.ArgumentException">Occurs when type is not blittable.</exception>
         [CLSCompliant(false)]
-        public static int StrideOf<T>(T[, ,] type)
+        public static int StrideOf<T>(T[,,] type)
         {
             if (!Check(type))
             {
diff --git a/src/OpenTK/Graphics/OpenGL/GL.cs b/src/OpenTK/Graphics/OpenGL/GL.cs
index 8d62d71d..4ecfacb8 100644
--- a/src/OpenTK/Graphics/OpenGL/GL.cs
+++ b/src/OpenTK/Graphics/OpenGL/GL.cs
@@ -13240,7 +13240,7 @@ namespace OpenTK.Graphics.OpenGL
             /// <param name="span">[length: 0]</param>
             [AutoGenerated(Category = "ARB_robustness", Version = "", EntryPoint = "glGetnSeparableFilterARB")]
             [CLSCompliant(false)]
-            public static void GetnSeparableFilter<T4,T6,T7>(OpenTK.Graphics.OpenGL.ArbRobustness target, OpenTK.Graphics.OpenGL.ArbRobustness format, OpenTK.Graphics.OpenGL.ArbRobustness type, Int32 rowBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "rowBufSize")] T4[] row, Int32 columnBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "columnBufSize")] T6[] column, [InAttribute, OutAttribute, CountAttribute(Count = 0)] T7[] span)
+            public static void GetnSeparableFilter<T4, T6, T7>(OpenTK.Graphics.OpenGL.ArbRobustness target, OpenTK.Graphics.OpenGL.ArbRobustness format, OpenTK.Graphics.OpenGL.ArbRobustness type, Int32 rowBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "rowBufSize")] T4[] row, Int32 columnBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "columnBufSize")] T6[] column, [InAttribute, OutAttribute, CountAttribute(Count = 0)] T7[] span)
                 where T4 : struct
                 where T6 : struct
                 where T7 : struct
@@ -13257,7 +13257,7 @@ namespace OpenTK.Graphics.OpenGL
             /// <param name="span">[length: 0]</param>
             [AutoGenerated(Category = "ARB_robustness", Version = "", EntryPoint = "glGetnSeparableFilterARB")]
             [CLSCompliant(false)]
-            public static void GetnSeparableFilter<T4,T6,T7>(OpenTK.Graphics.OpenGL.ArbRobustness target, OpenTK.Graphics.OpenGL.ArbRobustness format, OpenTK.Graphics.OpenGL.ArbRobustness type, Int32 rowBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "rowBufSize")] T4[,] row, Int32 columnBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "columnBufSize")] T6[,] column, [InAttribute, OutAttribute, CountAttribute(Count = 0)] T7[,] span)
+            public static void GetnSeparableFilter<T4, T6, T7>(OpenTK.Graphics.OpenGL.ArbRobustness target, OpenTK.Graphics.OpenGL.ArbRobustness format, OpenTK.Graphics.OpenGL.ArbRobustness type, Int32 rowBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "rowBufSize")] T4[,] row, Int32 columnBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "columnBufSize")] T6[,] column, [InAttribute, OutAttribute, CountAttribute(Count = 0)] T7[,] span)
                 where T4 : struct
                 where T6 : struct
                 where T7 : struct
@@ -13274,7 +13274,7 @@ namespace OpenTK.Graphics.OpenGL
             /// <param name="span">[length: 0]</param>
             [AutoGenerated(Category = "ARB_robustness", Version = "", EntryPoint = "glGetnSeparableFilterARB")]
             [CLSCompliant(false)]
-            public static void GetnSeparableFilter<T4,T6,T7>(OpenTK.Graphics.OpenGL.ArbRobustness target, OpenTK.Graphics.OpenGL.ArbRobustness format, OpenTK.Graphics.OpenGL.ArbRobustness type, Int32 rowBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "rowBufSize")] T4[,,] row, Int32 columnBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "columnBufSize")] T6[,,] column, [InAttribute, OutAttribute, CountAttribute(Count = 0)] T7[,,] span)
+            public static void GetnSeparableFilter<T4, T6, T7>(OpenTK.Graphics.OpenGL.ArbRobustness target, OpenTK.Graphics.OpenGL.ArbRobustness format, OpenTK.Graphics.OpenGL.ArbRobustness type, Int32 rowBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "rowBufSize")] T4[,,] row, Int32 columnBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "columnBufSize")] T6[,,] column, [InAttribute, OutAttribute, CountAttribute(Count = 0)] T7[,,] span)
                 where T4 : struct
                 where T6 : struct
                 where T7 : struct
@@ -13290,7 +13290,7 @@ namespace OpenTK.Graphics.OpenGL
             /// <param name="column">[length: columnBufSize]</param>
             /// <param name="span">[length: 0]</param>
             [AutoGenerated(Category = "ARB_robustness", Version = "", EntryPoint = "glGetnSeparableFilterARB")]
-            public static void GetnSeparableFilter<T4,T6,T7>(OpenTK.Graphics.OpenGL.ArbRobustness target, OpenTK.Graphics.OpenGL.ArbRobustness format, OpenTK.Graphics.OpenGL.ArbRobustness type, Int32 rowBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "rowBufSize")] ref T4 row, Int32 columnBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "columnBufSize")] ref T6 column, [InAttribute, OutAttribute, CountAttribute(Count = 0)] ref T7 span)
+            public static void GetnSeparableFilter<T4, T6, T7>(OpenTK.Graphics.OpenGL.ArbRobustness target, OpenTK.Graphics.OpenGL.ArbRobustness format, OpenTK.Graphics.OpenGL.ArbRobustness type, Int32 rowBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "rowBufSize")] ref T4 row, Int32 columnBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "columnBufSize")] ref T6 column, [InAttribute, OutAttribute, CountAttribute(Count = 0)] ref T7 span)
                 where T4 : struct
                 where T6 : struct
                 where T7 : struct
@@ -43138,7 +43138,7 @@ namespace OpenTK.Graphics.OpenGL
         /// <param name="span"></param>
         [AutoGenerated(Category = "VERSION_4_5", Version = "4.5", EntryPoint = "glGetnSeparableFilter")]
         [CLSCompliant(false)]
-        public static void GetnSeparableFilter<T4,T6,T7>(OpenTK.Graphics.OpenGL.Version45 target, OpenTK.Graphics.OpenGL.Version45 format, OpenTK.Graphics.OpenGL.Version45 type, Int32 rowBufSize, [InAttribute, OutAttribute] T4[] row, Int32 columnBufSize, [InAttribute, OutAttribute] T6[] column, [InAttribute, OutAttribute] T7[] span)
+        public static void GetnSeparableFilter<T4, T6, T7>(OpenTK.Graphics.OpenGL.Version45 target, OpenTK.Graphics.OpenGL.Version45 format, OpenTK.Graphics.OpenGL.Version45 type, Int32 rowBufSize, [InAttribute, OutAttribute] T4[] row, Int32 columnBufSize, [InAttribute, OutAttribute] T6[] column, [InAttribute, OutAttribute] T7[] span)
             where T4 : struct
             where T6 : struct
             where T7 : struct
@@ -43155,7 +43155,7 @@ namespace OpenTK.Graphics.OpenGL
         /// <param name="span"></param>
         [AutoGenerated(Category = "VERSION_4_5", Version = "4.5", EntryPoint = "glGetnSeparableFilter")]
         [CLSCompliant(false)]
-        public static void GetnSeparableFilter<T4,T6,T7>(OpenTK.Graphics.OpenGL.Version45 target, OpenTK.Graphics.OpenGL.Version45 format, OpenTK.Graphics.OpenGL.Version45 type, Int32 rowBufSize, [InAttribute, OutAttribute] T4[,] row, Int32 columnBufSize, [InAttribute, OutAttribute] T6[,] column, [InAttribute, OutAttribute] T7[,] span)
+        public static void GetnSeparableFilter<T4, T6, T7>(OpenTK.Graphics.OpenGL.Version45 target, OpenTK.Graphics.OpenGL.Version45 format, OpenTK.Graphics.OpenGL.Version45 type, Int32 rowBufSize, [InAttribute, OutAttribute] T4[,] row, Int32 columnBufSize, [InAttribute, OutAttribute] T6[,] column, [InAttribute, OutAttribute] T7[,] span)
             where T4 : struct
             where T6 : struct
             where T7 : struct
@@ -43172,7 +43172,7 @@ namespace OpenTK.Graphics.OpenGL
         /// <param name="span"></param>
         [AutoGenerated(Category = "VERSION_4_5", Version = "4.5", EntryPoint = "glGetnSeparableFilter")]
         [CLSCompliant(false)]
-        public static void GetnSeparableFilter<T4,T6,T7>(OpenTK.Graphics.OpenGL.Version45 target, OpenTK.Graphics.OpenGL.Version45 format, OpenTK.Graphics.OpenGL.Version45 type, Int32 rowBufSize, [InAttribute, OutAttribute] T4[,,] row, Int32 columnBufSize, [InAttribute, OutAttribute] T6[,,] column, [InAttribute, OutAttribute] T7[,,] span)
+        public static void GetnSeparableFilter<T4, T6, T7>(OpenTK.Graphics.OpenGL.Version45 target, OpenTK.Graphics.OpenGL.Version45 format, OpenTK.Graphics.OpenGL.Version45 type, Int32 rowBufSize, [InAttribute, OutAttribute] T4[,,] row, Int32 columnBufSize, [InAttribute, OutAttribute] T6[,,] column, [InAttribute, OutAttribute] T7[,,] span)
             where T4 : struct
             where T6 : struct
             where T7 : struct
@@ -43188,7 +43188,7 @@ namespace OpenTK.Graphics.OpenGL
         /// <param name="column"></param>
         /// <param name="span"></param>
         [AutoGenerated(Category = "VERSION_4_5", Version = "4.5", EntryPoint = "glGetnSeparableFilter")]
-        public static void GetnSeparableFilter<T4,T6,T7>(OpenTK.Graphics.OpenGL.Version45 target, OpenTK.Graphics.OpenGL.Version45 format, OpenTK.Graphics.OpenGL.Version45 type, Int32 rowBufSize, [InAttribute, OutAttribute] ref T4 row, Int32 columnBufSize, [InAttribute, OutAttribute] ref T6 column, [InAttribute, OutAttribute] ref T7 span)
+        public static void GetnSeparableFilter<T4, T6, T7>(OpenTK.Graphics.OpenGL.Version45 target, OpenTK.Graphics.OpenGL.Version45 format, OpenTK.Graphics.OpenGL.Version45 type, Int32 rowBufSize, [InAttribute, OutAttribute] ref T4 row, Int32 columnBufSize, [InAttribute, OutAttribute] ref T6 column, [InAttribute, OutAttribute] ref T7 span)
             where T4 : struct
             where T6 : struct
             where T7 : struct
@@ -46893,7 +46893,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "ARB_imaging", Version = "", EntryPoint = "glGetSeparableFilter")]
         [CLSCompliant(false)]
-        public static void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T3[] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T4[] column, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T5[] span)
+        public static void GetSeparableFilter<T3, T4, T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T3[] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T4[] column, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T5[] span)
             where T3 : struct
             where T4 : struct
             where T5 : struct
@@ -46922,7 +46922,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "ARB_imaging", Version = "", EntryPoint = "glGetSeparableFilter")]
         [CLSCompliant(false)]
-        public static void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T3[,] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T4[,] column, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T5[,] span)
+        public static void GetSeparableFilter<T3, T4, T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T3[,] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T4[,] column, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T5[,] span)
             where T3 : struct
             where T4 : struct
             where T5 : struct
@@ -46951,7 +46951,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "ARB_imaging", Version = "", EntryPoint = "glGetSeparableFilter")]
         [CLSCompliant(false)]
-        public static void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T3[,,] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T4[,,] column, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T5[,,] span)
+        public static void GetSeparableFilter<T3, T4, T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T3[,,] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T4[,,] column, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T5[,,] span)
             where T3 : struct
             where T4 : struct
             where T5 : struct
@@ -46979,7 +46979,7 @@ namespace OpenTK.Graphics.OpenGL
         /// Pointer to storage for the span filter image (currently unused).
         /// </param>
         [AutoGenerated(Category = "ARB_imaging", Version = "", EntryPoint = "glGetSeparableFilter")]
-        public static void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] ref T3 row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] ref T4 column, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] ref T5 span)
+        public static void GetSeparableFilter<T3, T4, T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] ref T3 row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] ref T4 column, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] ref T5 span)
             where T3 : struct
             where T4 : struct
             where T5 : struct
@@ -63229,7 +63229,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "ARB_imaging", Version = "", EntryPoint = "glSeparableFilter2D")]
         [CLSCompliant(false)]
-        public static void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,width")] T6[] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,height")] T7[] column)
+        public static void SeparableFilter2D<T6, T7>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,width")] T6[] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,height")] T7[] column)
             where T6 : struct
             where T7 : struct
          { throw new NotImplementedException(); }
@@ -63263,7 +63263,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "ARB_imaging", Version = "", EntryPoint = "glSeparableFilter2D")]
         [CLSCompliant(false)]
-        public static void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,width")] T6[,] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,height")] T7[,] column)
+        public static void SeparableFilter2D<T6, T7>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,width")] T6[,] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,height")] T7[,] column)
             where T6 : struct
             where T7 : struct
          { throw new NotImplementedException(); }
@@ -63297,7 +63297,7 @@ namespace OpenTK.Graphics.OpenGL
         /// </param>
         [AutoGenerated(Category = "ARB_imaging", Version = "", EntryPoint = "glSeparableFilter2D")]
         [CLSCompliant(false)]
-        public static void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,width")] T6[,,] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,height")] T7[,,] column)
+        public static void SeparableFilter2D<T6, T7>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,width")] T6[,,] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,height")] T7[,,] column)
             where T6 : struct
             where T7 : struct
          { throw new NotImplementedException(); }
@@ -63330,7 +63330,7 @@ namespace OpenTK.Graphics.OpenGL
         /// Pointer to a one-dimensional array of pixel data that is processed to build the column filter kernel.
         /// </param>
         [AutoGenerated(Category = "ARB_imaging", Version = "", EntryPoint = "glSeparableFilter2D")]
-        public static void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,width")] ref T6 row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,height")] ref T7 column)
+        public static void SeparableFilter2D<T6, T7>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,width")] ref T6 row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,height")] ref T7 column)
             where T6 : struct
             where T7 : struct
          { throw new NotImplementedException(); }
@@ -87011,7 +87011,7 @@ namespace OpenTK.Graphics.OpenGL
             /// </param>
             [AutoGenerated(Category = "EXT_convolution", Version = "", EntryPoint = "glGetSeparableFilterEXT")]
             [CLSCompliant(false)]
-            public static void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL.SeparableTargetExt target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T3[] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T4[] column, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T5[] span)
+            public static void GetSeparableFilter<T3, T4, T5>(OpenTK.Graphics.OpenGL.SeparableTargetExt target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T3[] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T4[] column, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T5[] span)
                 where T3 : struct
                 where T4 : struct
                 where T5 : struct
@@ -87040,7 +87040,7 @@ namespace OpenTK.Graphics.OpenGL
             /// </param>
             [AutoGenerated(Category = "EXT_convolution", Version = "", EntryPoint = "glGetSeparableFilterEXT")]
             [CLSCompliant(false)]
-            public static void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL.SeparableTargetExt target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T3[,] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T4[,] column, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T5[,] span)
+            public static void GetSeparableFilter<T3, T4, T5>(OpenTK.Graphics.OpenGL.SeparableTargetExt target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T3[,] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T4[,] column, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T5[,] span)
                 where T3 : struct
                 where T4 : struct
                 where T5 : struct
@@ -87069,7 +87069,7 @@ namespace OpenTK.Graphics.OpenGL
             /// </param>
             [AutoGenerated(Category = "EXT_convolution", Version = "", EntryPoint = "glGetSeparableFilterEXT")]
             [CLSCompliant(false)]
-            public static void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL.SeparableTargetExt target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T3[,,] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T4[,,] column, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T5[,,] span)
+            public static void GetSeparableFilter<T3, T4, T5>(OpenTK.Graphics.OpenGL.SeparableTargetExt target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T3[,,] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T4[,,] column, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T5[,,] span)
                 where T3 : struct
                 where T4 : struct
                 where T5 : struct
@@ -87097,7 +87097,7 @@ namespace OpenTK.Graphics.OpenGL
             /// Pointer to storage for the span filter image (currently unused).
             /// </param>
             [AutoGenerated(Category = "EXT_convolution", Version = "", EntryPoint = "glGetSeparableFilterEXT")]
-            public static void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL.SeparableTargetExt target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] ref T3 row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] ref T4 column, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] ref T5 span)
+            public static void GetSeparableFilter<T3, T4, T5>(OpenTK.Graphics.OpenGL.SeparableTargetExt target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] ref T3 row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] ref T4 column, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] ref T5 span)
                 where T3 : struct
                 where T4 : struct
                 where T5 : struct
@@ -97750,7 +97750,7 @@ namespace OpenTK.Graphics.OpenGL
             /// </param>
             [AutoGenerated(Category = "EXT_convolution", Version = "", EntryPoint = "glSeparableFilter2DEXT")]
             [CLSCompliant(false)]
-            public static void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.SeparableTargetExt target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,width")] T6[] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,height")] T7[] column)
+            public static void SeparableFilter2D<T6, T7>(OpenTK.Graphics.OpenGL.SeparableTargetExt target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,width")] T6[] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,height")] T7[] column)
                 where T6 : struct
                 where T7 : struct
              { throw new NotImplementedException(); }
@@ -97784,7 +97784,7 @@ namespace OpenTK.Graphics.OpenGL
             /// </param>
             [AutoGenerated(Category = "EXT_convolution", Version = "", EntryPoint = "glSeparableFilter2DEXT")]
             [CLSCompliant(false)]
-            public static void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.SeparableTargetExt target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,width")] T6[,] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,height")] T7[,] column)
+            public static void SeparableFilter2D<T6, T7>(OpenTK.Graphics.OpenGL.SeparableTargetExt target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,width")] T6[,] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,height")] T7[,] column)
                 where T6 : struct
                 where T7 : struct
              { throw new NotImplementedException(); }
@@ -97818,7 +97818,7 @@ namespace OpenTK.Graphics.OpenGL
             /// </param>
             [AutoGenerated(Category = "EXT_convolution", Version = "", EntryPoint = "glSeparableFilter2DEXT")]
             [CLSCompliant(false)]
-            public static void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.SeparableTargetExt target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,width")] T6[,,] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,height")] T7[,,] column)
+            public static void SeparableFilter2D<T6, T7>(OpenTK.Graphics.OpenGL.SeparableTargetExt target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,width")] T6[,,] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,height")] T7[,,] column)
                 where T6 : struct
                 where T7 : struct
              { throw new NotImplementedException(); }
@@ -97851,7 +97851,7 @@ namespace OpenTK.Graphics.OpenGL
             /// Pointer to a one-dimensional array of pixel data that is processed to build the column filter kernel.
             /// </param>
             [AutoGenerated(Category = "EXT_convolution", Version = "", EntryPoint = "glSeparableFilter2DEXT")]
-            public static void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.SeparableTargetExt target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,width")] ref T6 row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,height")] ref T7 column)
+            public static void SeparableFilter2D<T6, T7>(OpenTK.Graphics.OpenGL.SeparableTargetExt target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,width")] ref T6 row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,height")] ref T7 column)
                 where T6 : struct
                 where T7 : struct
              { throw new NotImplementedException(); }
@@ -116380,7 +116380,7 @@ namespace OpenTK.Graphics.OpenGL
             /// <param name="emScale"></param>
             [AutoGenerated(Category = "NV_path_rendering", Version = "", EntryPoint = "glPathGlyphsNV")]
             [CLSCompliant(false)]
-            public static void PathGlyph<T2,T6>(Int32 firstPathName, OpenTK.Graphics.OpenGL.NvPathRendering fontTarget, [InAttribute, OutAttribute, CountAttribute(Computed = "fontTarget,fontName")] T2[] fontName, Int32 fontStyle, Int32 numGlyphs, OpenTK.Graphics.OpenGL.NvPathRendering type, [InAttribute, OutAttribute, CountAttribute(Computed = "numGlyphs,type,charcodes")] T6[] charcodes, OpenTK.Graphics.OpenGL.NvPathRendering handleMissingGlyphs, Int32 pathParameterTemplate, Single emScale)
+            public static void PathGlyph<T2, T6>(Int32 firstPathName, OpenTK.Graphics.OpenGL.NvPathRendering fontTarget, [InAttribute, OutAttribute, CountAttribute(Computed = "fontTarget,fontName")] T2[] fontName, Int32 fontStyle, Int32 numGlyphs, OpenTK.Graphics.OpenGL.NvPathRendering type, [InAttribute, OutAttribute, CountAttribute(Computed = "numGlyphs,type,charcodes")] T6[] charcodes, OpenTK.Graphics.OpenGL.NvPathRendering handleMissingGlyphs, Int32 pathParameterTemplate, Single emScale)
                 where T2 : struct
                 where T6 : struct
              { throw new NotImplementedException(); }
@@ -116398,7 +116398,7 @@ namespace OpenTK.Graphics.OpenGL
             /// <param name="emScale"></param>
             [AutoGenerated(Category = "NV_path_rendering", Version = "", EntryPoint = "glPathGlyphsNV")]
             [CLSCompliant(false)]
-            public static void PathGlyph<T2,T6>(Int32 firstPathName, OpenTK.Graphics.OpenGL.NvPathRendering fontTarget, [InAttribute, OutAttribute, CountAttribute(Computed = "fontTarget,fontName")] T2[,] fontName, Int32 fontStyle, Int32 numGlyphs, OpenTK.Graphics.OpenGL.NvPathRendering type, [InAttribute, OutAttribute, CountAttribute(Computed = "numGlyphs,type,charcodes")] T6[,] charcodes, OpenTK.Graphics.OpenGL.NvPathRendering handleMissingGlyphs, Int32 pathParameterTemplate, Single emScale)
+            public static void PathGlyph<T2, T6>(Int32 firstPathName, OpenTK.Graphics.OpenGL.NvPathRendering fontTarget, [InAttribute, OutAttribute, CountAttribute(Computed = "fontTarget,fontName")] T2[,] fontName, Int32 fontStyle, Int32 numGlyphs, OpenTK.Graphics.OpenGL.NvPathRendering type, [InAttribute, OutAttribute, CountAttribute(Computed = "numGlyphs,type,charcodes")] T6[,] charcodes, OpenTK.Graphics.OpenGL.NvPathRendering handleMissingGlyphs, Int32 pathParameterTemplate, Single emScale)
                 where T2 : struct
                 where T6 : struct
              { throw new NotImplementedException(); }
@@ -116416,7 +116416,7 @@ namespace OpenTK.Graphics.OpenGL
             /// <param name="emScale"></param>
             [AutoGenerated(Category = "NV_path_rendering", Version = "", EntryPoint = "glPathGlyphsNV")]
             [CLSCompliant(false)]
-            public static void PathGlyph<T2,T6>(Int32 firstPathName, OpenTK.Graphics.OpenGL.NvPathRendering fontTarget, [InAttribute, OutAttribute, CountAttribute(Computed = "fontTarget,fontName")] T2[,,] fontName, Int32 fontStyle, Int32 numGlyphs, OpenTK.Graphics.OpenGL.NvPathRendering type, [InAttribute, OutAttribute, CountAttribute(Computed = "numGlyphs,type,charcodes")] T6[,,] charcodes, OpenTK.Graphics.OpenGL.NvPathRendering handleMissingGlyphs, Int32 pathParameterTemplate, Single emScale)
+            public static void PathGlyph<T2, T6>(Int32 firstPathName, OpenTK.Graphics.OpenGL.NvPathRendering fontTarget, [InAttribute, OutAttribute, CountAttribute(Computed = "fontTarget,fontName")] T2[,,] fontName, Int32 fontStyle, Int32 numGlyphs, OpenTK.Graphics.OpenGL.NvPathRendering type, [InAttribute, OutAttribute, CountAttribute(Computed = "numGlyphs,type,charcodes")] T6[,,] charcodes, OpenTK.Graphics.OpenGL.NvPathRendering handleMissingGlyphs, Int32 pathParameterTemplate, Single emScale)
                 where T2 : struct
                 where T6 : struct
              { throw new NotImplementedException(); }
@@ -116434,7 +116434,7 @@ namespace OpenTK.Graphics.OpenGL
             /// <param name="emScale"></param>
             [AutoGenerated(Category = "NV_path_rendering", Version = "", EntryPoint = "glPathGlyphsNV")]
             [CLSCompliant(false)]
-            public static void PathGlyph<T2,T6>(Int32 firstPathName, OpenTK.Graphics.OpenGL.NvPathRendering fontTarget, [InAttribute, OutAttribute, CountAttribute(Computed = "fontTarget,fontName")] ref T2 fontName, Int32 fontStyle, Int32 numGlyphs, OpenTK.Graphics.OpenGL.NvPathRendering type, [InAttribute, OutAttribute, CountAttribute(Computed = "numGlyphs,type,charcodes")] ref T6 charcodes, OpenTK.Graphics.OpenGL.NvPathRendering handleMissingGlyphs, Int32 pathParameterTemplate, Single emScale)
+            public static void PathGlyph<T2, T6>(Int32 firstPathName, OpenTK.Graphics.OpenGL.NvPathRendering fontTarget, [InAttribute, OutAttribute, CountAttribute(Computed = "fontTarget,fontName")] ref T2 fontName, Int32 fontStyle, Int32 numGlyphs, OpenTK.Graphics.OpenGL.NvPathRendering type, [InAttribute, OutAttribute, CountAttribute(Computed = "numGlyphs,type,charcodes")] ref T6 charcodes, OpenTK.Graphics.OpenGL.NvPathRendering handleMissingGlyphs, Int32 pathParameterTemplate, Single emScale)
                 where T2 : struct
                 where T6 : struct
              { throw new NotImplementedException(); }
@@ -116467,7 +116467,7 @@ namespace OpenTK.Graphics.OpenGL
             /// <param name="emScale"></param>
             [AutoGenerated(Category = "NV_path_rendering", Version = "", EntryPoint = "glPathGlyphsNV")]
             [CLSCompliant(false)]
-            public static void PathGlyph<T2,T6>(UInt32 firstPathName, OpenTK.Graphics.OpenGL.NvPathRendering fontTarget, [InAttribute, OutAttribute, CountAttribute(Computed = "fontTarget,fontName")] T2[] fontName, UInt32 fontStyle, Int32 numGlyphs, OpenTK.Graphics.OpenGL.NvPathRendering type, [InAttribute, OutAttribute, CountAttribute(Computed = "numGlyphs,type,charcodes")] T6[] charcodes, OpenTK.Graphics.OpenGL.NvPathRendering handleMissingGlyphs, UInt32 pathParameterTemplate, Single emScale)
+            public static void PathGlyph<T2, T6>(UInt32 firstPathName, OpenTK.Graphics.OpenGL.NvPathRendering fontTarget, [InAttribute, OutAttribute, CountAttribute(Computed = "fontTarget,fontName")] T2[] fontName, UInt32 fontStyle, Int32 numGlyphs, OpenTK.Graphics.OpenGL.NvPathRendering type, [InAttribute, OutAttribute, CountAttribute(Computed = "numGlyphs,type,charcodes")] T6[] charcodes, OpenTK.Graphics.OpenGL.NvPathRendering handleMissingGlyphs, UInt32 pathParameterTemplate, Single emScale)
                 where T2 : struct
                 where T6 : struct
              { throw new NotImplementedException(); }
@@ -116485,7 +116485,7 @@ namespace OpenTK.Graphics.OpenGL
             /// <param name="emScale"></param>
             [AutoGenerated(Category = "NV_path_rendering", Version = "", EntryPoint = "glPathGlyphsNV")]
             [CLSCompliant(false)]
-            public static void PathGlyph<T2,T6>(UInt32 firstPathName, OpenTK.Graphics.OpenGL.NvPathRendering fontTarget, [InAttribute, OutAttribute, CountAttribute(Computed = "fontTarget,fontName")] T2[,] fontName, UInt32 fontStyle, Int32 numGlyphs, OpenTK.Graphics.OpenGL.NvPathRendering type, [InAttribute, OutAttribute, CountAttribute(Computed = "numGlyphs,type,charcodes")] T6[,] charcodes, OpenTK.Graphics.OpenGL.NvPathRendering handleMissingGlyphs, UInt32 pathParameterTemplate, Single emScale)
+            public static void PathGlyph<T2, T6>(UInt32 firstPathName, OpenTK.Graphics.OpenGL.NvPathRendering fontTarget, [InAttribute, OutAttribute, CountAttribute(Computed = "fontTarget,fontName")] T2[,] fontName, UInt32 fontStyle, Int32 numGlyphs, OpenTK.Graphics.OpenGL.NvPathRendering type, [InAttribute, OutAttribute, CountAttribute(Computed = "numGlyphs,type,charcodes")] T6[,] charcodes, OpenTK.Graphics.OpenGL.NvPathRendering handleMissingGlyphs, UInt32 pathParameterTemplate, Single emScale)
                 where T2 : struct
                 where T6 : struct
              { throw new NotImplementedException(); }
@@ -116503,7 +116503,7 @@ namespace OpenTK.Graphics.OpenGL
             /// <param name="emScale"></param>
             [AutoGenerated(Category = "NV_path_rendering", Version = "", EntryPoint = "glPathGlyphsNV")]
             [CLSCompliant(false)]
-            public static void PathGlyph<T2,T6>(UInt32 firstPathName, OpenTK.Graphics.OpenGL.NvPathRendering fontTarget, [InAttribute, OutAttribute, CountAttribute(Computed = "fontTarget,fontName")] T2[,,] fontName, UInt32 fontStyle, Int32 numGlyphs, OpenTK.Graphics.OpenGL.NvPathRendering type, [InAttribute, OutAttribute, CountAttribute(Computed = "numGlyphs,type,charcodes")] T6[,,] charcodes, OpenTK.Graphics.OpenGL.NvPathRendering handleMissingGlyphs, UInt32 pathParameterTemplate, Single emScale)
+            public static void PathGlyph<T2, T6>(UInt32 firstPathName, OpenTK.Graphics.OpenGL.NvPathRendering fontTarget, [InAttribute, OutAttribute, CountAttribute(Computed = "fontTarget,fontName")] T2[,,] fontName, UInt32 fontStyle, Int32 numGlyphs, OpenTK.Graphics.OpenGL.NvPathRendering type, [InAttribute, OutAttribute, CountAttribute(Computed = "numGlyphs,type,charcodes")] T6[,,] charcodes, OpenTK.Graphics.OpenGL.NvPathRendering handleMissingGlyphs, UInt32 pathParameterTemplate, Single emScale)
                 where T2 : struct
                 where T6 : struct
              { throw new NotImplementedException(); }
@@ -116521,7 +116521,7 @@ namespace OpenTK.Graphics.OpenGL
             /// <param name="emScale"></param>
             [AutoGenerated(Category = "NV_path_rendering", Version = "", EntryPoint = "glPathGlyphsNV")]
             [CLSCompliant(false)]
-            public static void PathGlyph<T2,T6>(UInt32 firstPathName, OpenTK.Graphics.OpenGL.NvPathRendering fontTarget, [InAttribute, OutAttribute, CountAttribute(Computed = "fontTarget,fontName")] ref T2 fontName, UInt32 fontStyle, Int32 numGlyphs, OpenTK.Graphics.OpenGL.NvPathRendering type, [InAttribute, OutAttribute, CountAttribute(Computed = "numGlyphs,type,charcodes")] ref T6 charcodes, OpenTK.Graphics.OpenGL.NvPathRendering handleMissingGlyphs, UInt32 pathParameterTemplate, Single emScale)
+            public static void PathGlyph<T2, T6>(UInt32 firstPathName, OpenTK.Graphics.OpenGL.NvPathRendering fontTarget, [InAttribute, OutAttribute, CountAttribute(Computed = "fontTarget,fontName")] ref T2 fontName, UInt32 fontStyle, Int32 numGlyphs, OpenTK.Graphics.OpenGL.NvPathRendering type, [InAttribute, OutAttribute, CountAttribute(Computed = "numGlyphs,type,charcodes")] ref T6 charcodes, OpenTK.Graphics.OpenGL.NvPathRendering handleMissingGlyphs, UInt32 pathParameterTemplate, Single emScale)
                 where T2 : struct
                 where T6 : struct
              { throw new NotImplementedException(); }
@@ -123536,7 +123536,7 @@ namespace OpenTK.Graphics.OpenGL
             /// <param name="getProcAddress"></param>
             [AutoGenerated(Category = "NV_vdpau_interop", Version = "", EntryPoint = "glVDPAUInitNV")]
             [CLSCompliant(false)]
-            public static void VDPAUInit<T0,T1>([InAttribute, OutAttribute] T0[] vdpDevice, [InAttribute, OutAttribute] T1[] getProcAddress)
+            public static void VDPAUInit<T0, T1>([InAttribute, OutAttribute] T0[] vdpDevice, [InAttribute, OutAttribute] T1[] getProcAddress)
                 where T0 : struct
                 where T1 : struct
              { throw new NotImplementedException(); }
@@ -123546,7 +123546,7 @@ namespace OpenTK.Graphics.OpenGL
             /// <param name="getProcAddress"></param>
             [AutoGenerated(Category = "NV_vdpau_interop", Version = "", EntryPoint = "glVDPAUInitNV")]
             [CLSCompliant(false)]
-            public static void VDPAUInit<T0,T1>([InAttribute, OutAttribute] T0[,] vdpDevice, [InAttribute, OutAttribute] T1[,] getProcAddress)
+            public static void VDPAUInit<T0, T1>([InAttribute, OutAttribute] T0[,] vdpDevice, [InAttribute, OutAttribute] T1[,] getProcAddress)
                 where T0 : struct
                 where T1 : struct
              { throw new NotImplementedException(); }
@@ -123556,7 +123556,7 @@ namespace OpenTK.Graphics.OpenGL
             /// <param name="getProcAddress"></param>
             [AutoGenerated(Category = "NV_vdpau_interop", Version = "", EntryPoint = "glVDPAUInitNV")]
             [CLSCompliant(false)]
-            public static void VDPAUInit<T0,T1>([InAttribute, OutAttribute] T0[,,] vdpDevice, [InAttribute, OutAttribute] T1[,,] getProcAddress)
+            public static void VDPAUInit<T0, T1>([InAttribute, OutAttribute] T0[,,] vdpDevice, [InAttribute, OutAttribute] T1[,,] getProcAddress)
                 where T0 : struct
                 where T1 : struct
              { throw new NotImplementedException(); }
@@ -123565,7 +123565,7 @@ namespace OpenTK.Graphics.OpenGL
             /// <param name="vdpDevice"></param>
             /// <param name="getProcAddress"></param>
             [AutoGenerated(Category = "NV_vdpau_interop", Version = "", EntryPoint = "glVDPAUInitNV")]
-            public static void VDPAUInit<T0,T1>([InAttribute, OutAttribute] ref T0 vdpDevice, [InAttribute, OutAttribute] ref T1 getProcAddress)
+            public static void VDPAUInit<T0, T1>([InAttribute, OutAttribute] ref T0 vdpDevice, [InAttribute, OutAttribute] ref T1 getProcAddress)
                 where T0 : struct
                 where T1 : struct
              { throw new NotImplementedException(); }
diff --git a/src/OpenTK/Graphics/OpenGL/GLObsolete.cs b/src/OpenTK/Graphics/OpenGL/GLObsolete.cs
index a2fe6c9a..13ccbe95 100644
--- a/src/OpenTK/Graphics/OpenGL/GLObsolete.cs
+++ b/src/OpenTK/Graphics/OpenGL/GLObsolete.cs
@@ -292,7 +292,7 @@ namespace OpenTK.Graphics.OpenGL
         [Obsolete("Use GetSeparableFilter<T3, T4, T5> overload instead")]
         [CLSCompliant(false)]
         public static
-        void GetSeparableFilter<T4,T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[] column, [InAttribute, OutAttribute] T5[,,] span)
+        void GetSeparableFilter<T4, T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[] column, [InAttribute, OutAttribute] T5[,,] span)
             where T4 : struct
             where T5 : struct { throw new NotImplementedException(); }
 
@@ -334,7 +334,7 @@ namespace OpenTK.Graphics.OpenGL
         [Obsolete("Use GetSeparableFilter<T3, T4, T5> overload instead")]
         [CLSCompliant(false)]
         public static
-        void GetSeparableFilter<T4,T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[,] column, [InAttribute, OutAttribute] T5[,,] span)
+        void GetSeparableFilter<T4, T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[,] column, [InAttribute, OutAttribute] T5[,,] span)
             where T4 : struct
             where T5 : struct { throw new NotImplementedException(); }
 
@@ -376,7 +376,7 @@ namespace OpenTK.Graphics.OpenGL
         [Obsolete("Use GetSeparableFilter<T3, T4, T5> overload instead")]
         [CLSCompliant(false)]
         public static
-        void GetSeparableFilter<T4,T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
+        void GetSeparableFilter<T4, T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
             where T4 : struct
             where T5 : struct { throw new NotImplementedException(); }
 
@@ -418,7 +418,7 @@ namespace OpenTK.Graphics.OpenGL
         [Obsolete("Use GetSeparableFilter<T3, T4, T5> overload instead")]
         [CLSCompliant(false)]
         public static
-        void GetSeparableFilter<T4,T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] ref T4 column, [InAttribute, OutAttribute] T5[,,] span)
+        void GetSeparableFilter<T4, T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] ref T4 column, [InAttribute, OutAttribute] T5[,,] span)
             where T4 : struct
             where T5 : struct { throw new NotImplementedException(); }
 
@@ -460,7 +460,7 @@ namespace OpenTK.Graphics.OpenGL
         [Obsolete("Use GetSeparableFilter<T3, T4, T5> overload with equal array dimensions instead")]
         [CLSCompliant(false)]
         public static
-        void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[] row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
+        void GetSeparableFilter<T3, T4, T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[] row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
             where T3 : struct
             where T4 : struct
             where T5 : struct { throw new NotImplementedException(); }
@@ -503,7 +503,7 @@ namespace OpenTK.Graphics.OpenGL
         [Obsolete("Use GetSeparableFilter<T3, T4, T5> overload with equal array dimensions instead")]
         [CLSCompliant(false)]
         public static
-        void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[,] row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
+        void GetSeparableFilter<T3, T4, T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[,] row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
             where T3 : struct
             where T4 : struct
             where T5 : struct { throw new NotImplementedException(); }
@@ -545,7 +545,7 @@ namespace OpenTK.Graphics.OpenGL
         [AutoGenerated(Category = "Version12Deprecated", Version = "1.2", EntryPoint = "glGetSeparableFilter")]
         [Obsolete("Use GetSeparableFilter<T3, T4, T5> with three ref arguments instead")]
         public static
-        void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T3 row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
+        void GetSeparableFilter<T3, T4, T5>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T3 row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
             where T3 : struct
             where T4 : struct
             where T5 : struct { throw new NotImplementedException(); }
@@ -808,7 +808,7 @@ namespace OpenTK.Graphics.OpenGL
         [Obsolete("Use overload with equal array dimensions instead")]
         [CLSCompliant(false)]
         public static
-        void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[] row, [InAttribute, OutAttribute] T7[,,] column)
+        void SeparableFilter2D<T6, T7>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[] row, [InAttribute, OutAttribute] T7[,,] column)
             where T6 : struct
             where T7 : struct { throw new NotImplementedException(); }
 
@@ -860,7 +860,7 @@ namespace OpenTK.Graphics.OpenGL
         [Obsolete("Use overload with equal array dimensions instead")]
         [CLSCompliant(false)]
         public static
-        void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[,] row, [InAttribute, OutAttribute] T7[,,] column)
+        void SeparableFilter2D<T6, T7>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[,] row, [InAttribute, OutAttribute] T7[,,] column)
             where T6 : struct
             where T7 : struct { throw new NotImplementedException(); }
 
@@ -912,7 +912,7 @@ namespace OpenTK.Graphics.OpenGL
         [Obsolete("Use overload with equal array dimensions instead")]
         [CLSCompliant(false)]
         public static
-        void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T6 row, [InAttribute, OutAttribute] T7[,,] column)
+        void SeparableFilter2D<T6, T7>(OpenTK.Graphics.OpenGL.SeparableTarget target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T6 row, [InAttribute, OutAttribute] T7[,,] column)
             where T6 : struct
             where T7 : struct { throw new NotImplementedException(); }
 
@@ -1517,7 +1517,7 @@ namespace OpenTK.Graphics.OpenGL
             [Obsolete("Use GetSeparableFilter<T4, T5, T6> overloads instead")]
             [CLSCompliant(false)]
             public static
-            void GetSeparableFilter<T4,T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[] column, [InAttribute, OutAttribute] T5[,,] span)
+            void GetSeparableFilter<T4, T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[] column, [InAttribute, OutAttribute] T5[,,] span)
                 where T4 : struct
                 where T5 : struct { throw new NotImplementedException(); }
 
@@ -1559,7 +1559,7 @@ namespace OpenTK.Graphics.OpenGL
             [Obsolete("Use GetSeparableFilter<T4, T5, T6> overloads instead")]
             [CLSCompliant(false)]
             public static
-            void GetSeparableFilter<T4,T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[,] column, [InAttribute, OutAttribute] T5[,,] span)
+            void GetSeparableFilter<T4, T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[,] column, [InAttribute, OutAttribute] T5[,,] span)
                 where T4 : struct
                 where T5 : struct { throw new NotImplementedException(); }
 
@@ -1601,7 +1601,7 @@ namespace OpenTK.Graphics.OpenGL
             [Obsolete("Use GetSeparableFilter<T4, T5, T6> overloads instead")]
             [CLSCompliant(false)]
             public static
-            void GetSeparableFilter<T4,T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
+            void GetSeparableFilter<T4, T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
                 where T4 : struct
                 where T5 : struct { throw new NotImplementedException(); }
 
@@ -1642,7 +1642,7 @@ namespace OpenTK.Graphics.OpenGL
             [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glGetSeparableFilterEXT")]
             [Obsolete("Use GetSeparableFilter<T4, T5, T6> overloads instead")]
             public static
-            void GetSeparableFilter<T4,T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] ref T4 column, [InAttribute, OutAttribute] T5[,,] span)
+            void GetSeparableFilter<T4, T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [OutAttribute] IntPtr row, [InAttribute, OutAttribute] ref T4 column, [InAttribute, OutAttribute] T5[,,] span)
                 where T4 : struct
                 where T5 : struct { throw new NotImplementedException(); }
 
@@ -1684,7 +1684,7 @@ namespace OpenTK.Graphics.OpenGL
             [Obsolete("Use ref/array overloads instead")]
             [CLSCompliant(false)]
             public static
-            void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[] row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
+            void GetSeparableFilter<T3, T4, T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[] row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
                 where T3 : struct
                 where T4 : struct
                 where T5 : struct { throw new NotImplementedException(); }
@@ -1727,7 +1727,7 @@ namespace OpenTK.Graphics.OpenGL
             [Obsolete("Use ref/array overloads instead")]
             [CLSCompliant(false)]
             public static
-            void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[,] row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
+            void GetSeparableFilter<T3, T4, T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T3[,] row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
                 where T3 : struct
                 where T4 : struct
                 where T5 : struct { throw new NotImplementedException(); }
@@ -1770,7 +1770,7 @@ namespace OpenTK.Graphics.OpenGL
             [Obsolete("Use ref/array overloads instead")]
             [CLSCompliant(false)]
             public static
-            void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T3 row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
+            void GetSeparableFilter<T3, T4, T5>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T3 row, [InAttribute, OutAttribute] T4[,,] column, [InAttribute, OutAttribute] T5[,,] span)
                 where T3 : struct
                 where T4 : struct
                 where T5 : struct { throw new NotImplementedException(); }
@@ -1871,7 +1871,7 @@ namespace OpenTK.Graphics.OpenGL
             [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glSeparableFilter2DEXT")]
             [Obsolete("Use ref/array overloads instead")]
             public static
-            void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T6 row, [InAttribute, OutAttribute] ref T7 column)
+            void SeparableFilter2D<T6, T7>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T6 row, [InAttribute, OutAttribute] ref T7 column)
                 where T6 : struct
                 where T7 : struct { throw new NotImplementedException(); }
 
@@ -1923,7 +1923,7 @@ namespace OpenTK.Graphics.OpenGL
             [Obsolete("Use ref/array overloads instead")]
             [CLSCompliant(false)]
             public static
-            void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[] row, [InAttribute, OutAttribute] T7[] column)
+            void SeparableFilter2D<T6, T7>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[] row, [InAttribute, OutAttribute] T7[] column)
                 where T6 : struct
                 where T7 : struct { throw new NotImplementedException(); }
 
@@ -1975,7 +1975,7 @@ namespace OpenTK.Graphics.OpenGL
             [Obsolete("Use ref/array overloads instead")]
             [CLSCompliant(false)]
             public static
-            void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[,] row, [InAttribute, OutAttribute] T7[,] column)
+            void SeparableFilter2D<T6, T7>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[,] row, [InAttribute, OutAttribute] T7[,] column)
                 where T6 : struct
                 where T7 : struct { throw new NotImplementedException(); }
 
@@ -2027,7 +2027,7 @@ namespace OpenTK.Graphics.OpenGL
             [Obsolete("Use ref/array overloads instead")]
             [CLSCompliant(false)]
             public static
-            void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[,,] row, [InAttribute, OutAttribute] T7[,,] column)
+            void SeparableFilter2D<T6, T7>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[,,] row, [InAttribute, OutAttribute] T7[,,] column)
                 where T6 : struct
                 where T7 : struct { throw new NotImplementedException(); }
 
@@ -2282,7 +2282,7 @@ namespace OpenTK.Graphics.OpenGL
             [Obsolete("Use ref/array overloads instead")]
             [CLSCompliant(false)]
             public static
-            void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[] row, [InAttribute, OutAttribute] T7[,,] column)
+            void SeparableFilter2D<T6, T7>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[] row, [InAttribute, OutAttribute] T7[,,] column)
                 where T6 : struct
                 where T7 : struct { throw new NotImplementedException(); }
 
@@ -2333,7 +2333,7 @@ namespace OpenTK.Graphics.OpenGL
             [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glSeparableFilter2DEXT")]
             [Obsolete("Use ref/array overloads instead")]
             public static
-            void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[,] row, [InAttribute, OutAttribute] T7[,,] column)
+            void SeparableFilter2D<T6, T7>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] T6[,] row, [InAttribute, OutAttribute] T7[,,] column)
                 where T6 : struct
                 where T7 : struct { throw new NotImplementedException(); }
         }
@@ -2384,7 +2384,7 @@ namespace OpenTK.Graphics.OpenGL
         [AutoGenerated(Category = "ExtConvolution", Version = "1.0", EntryPoint = "glSeparableFilter2DEXT")]
         [Obsolete("Use ref/array overloads instead")]
         public static
-        void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T6 row, [InAttribute, OutAttribute] T7[,,] column)
+        void SeparableFilter2D<T6, T7>(OpenTK.Graphics.OpenGL.ExtConvolution target, OpenTK.Graphics.OpenGL.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, [InAttribute, OutAttribute] ref T6 row, [InAttribute, OutAttribute] T7[,,] column)
             where T6 : struct
             where T7 : struct { throw new NotImplementedException(); }
 
diff --git a/src/OpenTK/Graphics/OpenGL4/GL4.cs b/src/OpenTK/Graphics/OpenGL4/GL4.cs
index 5867bf12..bc3b786b 100644
--- a/src/OpenTK/Graphics/OpenGL4/GL4.cs
+++ b/src/OpenTK/Graphics/OpenGL4/GL4.cs
@@ -2982,7 +2982,7 @@ namespace OpenTK.Graphics.OpenGL4
             /// <param name="span">[length: 0]</param>
             [AutoGenerated(Category = "ARB_robustness", Version = "", EntryPoint = "glGetnSeparableFilterARB")]
             [CLSCompliant(false)]
-            public static void GetnSeparableFilter<T4,T6,T7>(OpenTK.Graphics.OpenGL4.All target, OpenTK.Graphics.OpenGL4.All format, OpenTK.Graphics.OpenGL4.All type, Int32 rowBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "rowBufSize")] T4[] row, Int32 columnBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "columnBufSize")] T6[] column, [InAttribute, OutAttribute, CountAttribute(Count = 0)] T7[] span)
+            public static void GetnSeparableFilter<T4, T6, T7>(OpenTK.Graphics.OpenGL4.All target, OpenTK.Graphics.OpenGL4.All format, OpenTK.Graphics.OpenGL4.All type, Int32 rowBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "rowBufSize")] T4[] row, Int32 columnBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "columnBufSize")] T6[] column, [InAttribute, OutAttribute, CountAttribute(Count = 0)] T7[] span)
                 where T4 : struct
                 where T6 : struct
                 where T7 : struct
@@ -2999,7 +2999,7 @@ namespace OpenTK.Graphics.OpenGL4
             /// <param name="span">[length: 0]</param>
             [AutoGenerated(Category = "ARB_robustness", Version = "", EntryPoint = "glGetnSeparableFilterARB")]
             [CLSCompliant(false)]
-            public static void GetnSeparableFilter<T4,T6,T7>(OpenTK.Graphics.OpenGL4.All target, OpenTK.Graphics.OpenGL4.All format, OpenTK.Graphics.OpenGL4.All type, Int32 rowBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "rowBufSize")] T4[,] row, Int32 columnBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "columnBufSize")] T6[,] column, [InAttribute, OutAttribute, CountAttribute(Count = 0)] T7[,] span)
+            public static void GetnSeparableFilter<T4, T6, T7>(OpenTK.Graphics.OpenGL4.All target, OpenTK.Graphics.OpenGL4.All format, OpenTK.Graphics.OpenGL4.All type, Int32 rowBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "rowBufSize")] T4[,] row, Int32 columnBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "columnBufSize")] T6[,] column, [InAttribute, OutAttribute, CountAttribute(Count = 0)] T7[,] span)
                 where T4 : struct
                 where T6 : struct
                 where T7 : struct
@@ -3016,7 +3016,7 @@ namespace OpenTK.Graphics.OpenGL4
             /// <param name="span">[length: 0]</param>
             [AutoGenerated(Category = "ARB_robustness", Version = "", EntryPoint = "glGetnSeparableFilterARB")]
             [CLSCompliant(false)]
-            public static void GetnSeparableFilter<T4,T6,T7>(OpenTK.Graphics.OpenGL4.All target, OpenTK.Graphics.OpenGL4.All format, OpenTK.Graphics.OpenGL4.All type, Int32 rowBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "rowBufSize")] T4[,,] row, Int32 columnBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "columnBufSize")] T6[,,] column, [InAttribute, OutAttribute, CountAttribute(Count = 0)] T7[,,] span)
+            public static void GetnSeparableFilter<T4, T6, T7>(OpenTK.Graphics.OpenGL4.All target, OpenTK.Graphics.OpenGL4.All format, OpenTK.Graphics.OpenGL4.All type, Int32 rowBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "rowBufSize")] T4[,,] row, Int32 columnBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "columnBufSize")] T6[,,] column, [InAttribute, OutAttribute, CountAttribute(Count = 0)] T7[,,] span)
                 where T4 : struct
                 where T6 : struct
                 where T7 : struct
@@ -3032,7 +3032,7 @@ namespace OpenTK.Graphics.OpenGL4
             /// <param name="column">[length: columnBufSize]</param>
             /// <param name="span">[length: 0]</param>
             [AutoGenerated(Category = "ARB_robustness", Version = "", EntryPoint = "glGetnSeparableFilterARB")]
-            public static void GetnSeparableFilter<T4,T6,T7>(OpenTK.Graphics.OpenGL4.All target, OpenTK.Graphics.OpenGL4.All format, OpenTK.Graphics.OpenGL4.All type, Int32 rowBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "rowBufSize")] ref T4 row, Int32 columnBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "columnBufSize")] ref T6 column, [InAttribute, OutAttribute, CountAttribute(Count = 0)] ref T7 span)
+            public static void GetnSeparableFilter<T4, T6, T7>(OpenTK.Graphics.OpenGL4.All target, OpenTK.Graphics.OpenGL4.All format, OpenTK.Graphics.OpenGL4.All type, Int32 rowBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "rowBufSize")] ref T4 row, Int32 columnBufSize, [InAttribute, OutAttribute, CountAttribute(Parameter = "columnBufSize")] ref T6 column, [InAttribute, OutAttribute, CountAttribute(Count = 0)] ref T7 span)
                 where T4 : struct
                 where T6 : struct
                 where T7 : struct
@@ -20443,7 +20443,7 @@ namespace OpenTK.Graphics.OpenGL4
         /// <param name="span"></param>
         [AutoGenerated(Category = "VERSION_4_5", Version = "4.5", EntryPoint = "glGetnSeparableFilter")]
         [CLSCompliant(false)]
-        public static void GetnSeparableFilter<T4,T6,T7>(OpenTK.Graphics.OpenGL4.All target, OpenTK.Graphics.OpenGL4.All format, OpenTK.Graphics.OpenGL4.All type, Int32 rowBufSize, [InAttribute, OutAttribute] T4[] row, Int32 columnBufSize, [InAttribute, OutAttribute] T6[] column, [InAttribute, OutAttribute] T7[] span)
+        public static void GetnSeparableFilter<T4, T6, T7>(OpenTK.Graphics.OpenGL4.All target, OpenTK.Graphics.OpenGL4.All format, OpenTK.Graphics.OpenGL4.All type, Int32 rowBufSize, [InAttribute, OutAttribute] T4[] row, Int32 columnBufSize, [InAttribute, OutAttribute] T6[] column, [InAttribute, OutAttribute] T7[] span)
             where T4 : struct
             where T6 : struct
             where T7 : struct
@@ -20460,7 +20460,7 @@ namespace OpenTK.Graphics.OpenGL4
         /// <param name="span"></param>
         [AutoGenerated(Category = "VERSION_4_5", Version = "4.5", EntryPoint = "glGetnSeparableFilter")]
         [CLSCompliant(false)]
-        public static void GetnSeparableFilter<T4,T6,T7>(OpenTK.Graphics.OpenGL4.All target, OpenTK.Graphics.OpenGL4.All format, OpenTK.Graphics.OpenGL4.All type, Int32 rowBufSize, [InAttribute, OutAttribute] T4[,] row, Int32 columnBufSize, [InAttribute, OutAttribute] T6[,] column, [InAttribute, OutAttribute] T7[,] span)
+        public static void GetnSeparableFilter<T4, T6, T7>(OpenTK.Graphics.OpenGL4.All target, OpenTK.Graphics.OpenGL4.All format, OpenTK.Graphics.OpenGL4.All type, Int32 rowBufSize, [InAttribute, OutAttribute] T4[,] row, Int32 columnBufSize, [InAttribute, OutAttribute] T6[,] column, [InAttribute, OutAttribute] T7[,] span)
             where T4 : struct
             where T6 : struct
             where T7 : struct
@@ -20477,7 +20477,7 @@ namespace OpenTK.Graphics.OpenGL4
         /// <param name="span"></param>
         [AutoGenerated(Category = "VERSION_4_5", Version = "4.5", EntryPoint = "glGetnSeparableFilter")]
         [CLSCompliant(false)]
-        public static void GetnSeparableFilter<T4,T6,T7>(OpenTK.Graphics.OpenGL4.All target, OpenTK.Graphics.OpenGL4.All format, OpenTK.Graphics.OpenGL4.All type, Int32 rowBufSize, [InAttribute, OutAttribute] T4[,,] row, Int32 columnBufSize, [InAttribute, OutAttribute] T6[,,] column, [InAttribute, OutAttribute] T7[,,] span)
+        public static void GetnSeparableFilter<T4, T6, T7>(OpenTK.Graphics.OpenGL4.All target, OpenTK.Graphics.OpenGL4.All format, OpenTK.Graphics.OpenGL4.All type, Int32 rowBufSize, [InAttribute, OutAttribute] T4[,,] row, Int32 columnBufSize, [InAttribute, OutAttribute] T6[,,] column, [InAttribute, OutAttribute] T7[,,] span)
             where T4 : struct
             where T6 : struct
             where T7 : struct
@@ -20493,7 +20493,7 @@ namespace OpenTK.Graphics.OpenGL4
         /// <param name="column"></param>
         /// <param name="span"></param>
         [AutoGenerated(Category = "VERSION_4_5", Version = "4.5", EntryPoint = "glGetnSeparableFilter")]
-        public static void GetnSeparableFilter<T4,T6,T7>(OpenTK.Graphics.OpenGL4.All target, OpenTK.Graphics.OpenGL4.All format, OpenTK.Graphics.OpenGL4.All type, Int32 rowBufSize, [InAttribute, OutAttribute] ref T4 row, Int32 columnBufSize, [InAttribute, OutAttribute] ref T6 column, [InAttribute, OutAttribute] ref T7 span)
+        public static void GetnSeparableFilter<T4, T6, T7>(OpenTK.Graphics.OpenGL4.All target, OpenTK.Graphics.OpenGL4.All format, OpenTK.Graphics.OpenGL4.All type, Int32 rowBufSize, [InAttribute, OutAttribute] ref T4 row, Int32 columnBufSize, [InAttribute, OutAttribute] ref T6 column, [InAttribute, OutAttribute] ref T7 span)
             where T4 : struct
             where T6 : struct
             where T7 : struct
@@ -23501,7 +23501,7 @@ namespace OpenTK.Graphics.OpenGL4
         /// </param>
         [AutoGenerated(Category = "ARB_imaging", Version = "", EntryPoint = "glGetSeparableFilter")]
         [CLSCompliant(false)]
-        public static void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL4.SeparableTarget target, OpenTK.Graphics.OpenGL4.PixelFormat format, OpenTK.Graphics.OpenGL4.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T3[] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T4[] column, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T5[] span)
+        public static void GetSeparableFilter<T3, T4, T5>(OpenTK.Graphics.OpenGL4.SeparableTarget target, OpenTK.Graphics.OpenGL4.PixelFormat format, OpenTK.Graphics.OpenGL4.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T3[] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T4[] column, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T5[] span)
             where T3 : struct
             where T4 : struct
             where T5 : struct
@@ -23530,7 +23530,7 @@ namespace OpenTK.Graphics.OpenGL4
         /// </param>
         [AutoGenerated(Category = "ARB_imaging", Version = "", EntryPoint = "glGetSeparableFilter")]
         [CLSCompliant(false)]
-        public static void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL4.SeparableTarget target, OpenTK.Graphics.OpenGL4.PixelFormat format, OpenTK.Graphics.OpenGL4.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T3[,] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T4[,] column, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T5[,] span)
+        public static void GetSeparableFilter<T3, T4, T5>(OpenTK.Graphics.OpenGL4.SeparableTarget target, OpenTK.Graphics.OpenGL4.PixelFormat format, OpenTK.Graphics.OpenGL4.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T3[,] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T4[,] column, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T5[,] span)
             where T3 : struct
             where T4 : struct
             where T5 : struct
@@ -23559,7 +23559,7 @@ namespace OpenTK.Graphics.OpenGL4
         /// </param>
         [AutoGenerated(Category = "ARB_imaging", Version = "", EntryPoint = "glGetSeparableFilter")]
         [CLSCompliant(false)]
-        public static void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL4.SeparableTarget target, OpenTK.Graphics.OpenGL4.PixelFormat format, OpenTK.Graphics.OpenGL4.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T3[,,] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T4[,,] column, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T5[,,] span)
+        public static void GetSeparableFilter<T3, T4, T5>(OpenTK.Graphics.OpenGL4.SeparableTarget target, OpenTK.Graphics.OpenGL4.PixelFormat format, OpenTK.Graphics.OpenGL4.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T3[,,] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T4[,,] column, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] T5[,,] span)
             where T3 : struct
             where T4 : struct
             where T5 : struct
@@ -23587,7 +23587,7 @@ namespace OpenTK.Graphics.OpenGL4
         /// Pointer to storage for the span filter image (currently unused).
         /// </param>
         [AutoGenerated(Category = "ARB_imaging", Version = "", EntryPoint = "glGetSeparableFilter")]
-        public static void GetSeparableFilter<T3,T4,T5>(OpenTK.Graphics.OpenGL4.SeparableTarget target, OpenTK.Graphics.OpenGL4.PixelFormat format, OpenTK.Graphics.OpenGL4.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] ref T3 row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] ref T4 column, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] ref T5 span)
+        public static void GetSeparableFilter<T3, T4, T5>(OpenTK.Graphics.OpenGL4.SeparableTarget target, OpenTK.Graphics.OpenGL4.PixelFormat format, OpenTK.Graphics.OpenGL4.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] ref T3 row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] ref T4 column, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type")] ref T5 span)
             where T3 : struct
             where T4 : struct
             where T5 : struct
@@ -33786,7 +33786,7 @@ namespace OpenTK.Graphics.OpenGL4
         /// </param>
         [AutoGenerated(Category = "ARB_imaging", Version = "", EntryPoint = "glSeparableFilter2D")]
         [CLSCompliant(false)]
-        public static void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL4.SeparableTarget target, OpenTK.Graphics.OpenGL4.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL4.PixelFormat format, OpenTK.Graphics.OpenGL4.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,width")] T6[] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,height")] T7[] column)
+        public static void SeparableFilter2D<T6, T7>(OpenTK.Graphics.OpenGL4.SeparableTarget target, OpenTK.Graphics.OpenGL4.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL4.PixelFormat format, OpenTK.Graphics.OpenGL4.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,width")] T6[] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,height")] T7[] column)
             where T6 : struct
             where T7 : struct
          { throw new NotImplementedException(); }
@@ -33820,7 +33820,7 @@ namespace OpenTK.Graphics.OpenGL4
         /// </param>
         [AutoGenerated(Category = "ARB_imaging", Version = "", EntryPoint = "glSeparableFilter2D")]
         [CLSCompliant(false)]
-        public static void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL4.SeparableTarget target, OpenTK.Graphics.OpenGL4.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL4.PixelFormat format, OpenTK.Graphics.OpenGL4.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,width")] T6[,] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,height")] T7[,] column)
+        public static void SeparableFilter2D<T6, T7>(OpenTK.Graphics.OpenGL4.SeparableTarget target, OpenTK.Graphics.OpenGL4.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL4.PixelFormat format, OpenTK.Graphics.OpenGL4.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,width")] T6[,] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,height")] T7[,] column)
             where T6 : struct
             where T7 : struct
          { throw new NotImplementedException(); }
@@ -33854,7 +33854,7 @@ namespace OpenTK.Graphics.OpenGL4
         /// </param>
         [AutoGenerated(Category = "ARB_imaging", Version = "", EntryPoint = "glSeparableFilter2D")]
         [CLSCompliant(false)]
-        public static void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL4.SeparableTarget target, OpenTK.Graphics.OpenGL4.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL4.PixelFormat format, OpenTK.Graphics.OpenGL4.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,width")] T6[,,] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,height")] T7[,,] column)
+        public static void SeparableFilter2D<T6, T7>(OpenTK.Graphics.OpenGL4.SeparableTarget target, OpenTK.Graphics.OpenGL4.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL4.PixelFormat format, OpenTK.Graphics.OpenGL4.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,width")] T6[,,] row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,height")] T7[,,] column)
             where T6 : struct
             where T7 : struct
          { throw new NotImplementedException(); }
@@ -33887,7 +33887,7 @@ namespace OpenTK.Graphics.OpenGL4
         /// Pointer to a one-dimensional array of pixel data that is processed to build the column filter kernel.
         /// </param>
         [AutoGenerated(Category = "ARB_imaging", Version = "", EntryPoint = "glSeparableFilter2D")]
-        public static void SeparableFilter2D<T6,T7>(OpenTK.Graphics.OpenGL4.SeparableTarget target, OpenTK.Graphics.OpenGL4.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL4.PixelFormat format, OpenTK.Graphics.OpenGL4.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,width")] ref T6 row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,height")] ref T7 column)
+        public static void SeparableFilter2D<T6, T7>(OpenTK.Graphics.OpenGL4.SeparableTarget target, OpenTK.Graphics.OpenGL4.PixelInternalFormat internalformat, Int32 width, Int32 height, OpenTK.Graphics.OpenGL4.PixelFormat format, OpenTK.Graphics.OpenGL4.PixelType type, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,width")] ref T6 row, [InAttribute, OutAttribute, CountAttribute(Computed = "target,format,type,height")] ref T7 column)
             where T6 : struct
             where T7 : struct
          { throw new NotImplementedException(); }
diff --git a/src/OpenTK/Platform/MacOS/HIDInput.cs b/src/OpenTK/Platform/MacOS/HIDInput.cs
index 846171a3..705f862e 100644
--- a/src/OpenTK/Platform/MacOS/HIDInput.cs
+++ b/src/OpenTK/Platform/MacOS/HIDInput.cs
@@ -1022,7 +1022,7 @@ namespace OpenTK.Platform.MacOS
                 }
                 else
                 {
-                    float f1 = (float)x; 
+                    float f1 = (float)x;
                     float f2 = (float)y;
                     p.X.Value = *(IntPtr *)&f1;
                     p.Y.Value = *(IntPtr *)&f2;
@@ -1599,7 +1599,7 @@ namespace OpenTK.Platform.MacOS
             Key.Unknown, /* Volume Up */
             Key.Unknown, /* Volume Down */
             Key.CapsLock, /* Locking Caps Lock */
-            Key.NumLock , /* Locking Num Lock */
+            Key.NumLock, /* Locking Num Lock */
             Key.ScrollLock, /* Locking Scroll Lock */
             Key.KeypadDecimal, /* Keypad Comma */
             Key.Unknown, /* Keypad Equal Sign for AS/400 */
diff --git a/src/OpenTK/Platform/MacOS/Quartz/DisplayServices.cs b/src/OpenTK/Platform/MacOS/Quartz/DisplayServices.cs
index f05e0082..9876c37e 100644
--- a/src/OpenTK/Platform/MacOS/Quartz/DisplayServices.cs
+++ b/src/OpenTK/Platform/MacOS/Quartz/DisplayServices.cs
@@ -60,10 +60,10 @@ namespace OpenTK.Platform.MacOS
         // CGSize -> NSSize
         // CGRect -> NSRect
 
-        [DllImport(lib,EntryPoint="CGGetActiveDisplayList")]
+        [DllImport(lib, EntryPoint="CGGetActiveDisplayList")]
         internal unsafe static extern CGDisplayErr GetActiveDisplayList(int maxDisplays, IntPtr* activeDspys, out int dspyCnt);
 
-        [DllImport(lib,EntryPoint="CGMainDisplayID")]
+        [DllImport(lib, EntryPoint="CGMainDisplayID")]
         internal static extern IntPtr MainDisplayID();
 
         // Note: sizeof(HIRect) == 16, which is larger than 8 bytes.
@@ -81,28 +81,28 @@ namespace OpenTK.Platform.MacOS
         [DllImport(lib, EntryPoint = "CGDisplayBounds")]
         private unsafe static extern void DisplayBounds(out NSRect rect, IntPtr display);
 
-        [DllImport(lib,EntryPoint="CGDisplayPixelsWide")]
+        [DllImport(lib, EntryPoint="CGDisplayPixelsWide")]
         internal static extern int DisplayPixelsWide(IntPtr display);
 
-        [DllImport(lib,EntryPoint="CGDisplayPixelsHigh")]
+        [DllImport(lib, EntryPoint="CGDisplayPixelsHigh")]
         internal static extern int DisplayPixelsHigh(IntPtr display);
 
-        [DllImport(lib,EntryPoint="CGDisplayCurrentMode")]
+        [DllImport(lib, EntryPoint="CGDisplayCurrentMode")]
         internal static extern IntPtr DisplayCurrentMode(IntPtr display);
 
-        [DllImport(lib,EntryPoint="CGDisplayCapture")]
+        [DllImport(lib, EntryPoint="CGDisplayCapture")]
         internal static extern CGDisplayErr DisplayCapture(IntPtr display);
 
-        [DllImport(lib,EntryPoint="CGCaptureAllDisplays")]
+        [DllImport(lib, EntryPoint="CGCaptureAllDisplays")]
         internal static extern CGDisplayErr CaptureAllDisplays();
 
-        [DllImport(lib,EntryPoint="CGShieldingWindowLevel")]
+        [DllImport(lib, EntryPoint="CGShieldingWindowLevel")]
         internal static extern uint ShieldingWindowLevel();
 
-        [DllImport(lib,EntryPoint="CGDisplayRelease")]
+        [DllImport(lib, EntryPoint="CGDisplayRelease")]
         internal static extern CGDisplayErr DisplayRelease(IntPtr display);
 
-        [DllImport(lib,EntryPoint="CGReleaseAllDisplays")]
+        [DllImport(lib, EntryPoint="CGReleaseAllDisplays")]
         internal static extern CGDisplayErr DisplayReleaseAll();
 
         [DllImport(lib, EntryPoint = "CGDisplayAvailableModes")]
diff --git a/src/OpenTK/Platform/Windows/WinGraphicsMode.cs b/src/OpenTK/Platform/Windows/WinGraphicsMode.cs
index c0633f3c..0835edcd 100644
--- a/src/OpenTK/Platform/Windows/WinGraphicsMode.cs
+++ b/src/OpenTK/Platform/Windows/WinGraphicsMode.cs
@@ -59,7 +59,7 @@ namespace OpenTK.Platform.Windows
         public GraphicsMode SelectGraphicsMode(ColorFormat color, int depth, int stencil, int samples,
             ColorFormat accum, int buffers, bool stereo)
         {
-            GraphicsMode mode = new GraphicsMode(color, depth, stencil, samples,accum, buffers, stereo);
+            GraphicsMode mode = new GraphicsMode(color, depth, stencil, samples, accum, buffers, stereo);
             GraphicsMode created_mode = ChoosePixelFormatARB(Device, mode);
 
             // If ChoosePixelFormatARB failed, iterate through all acceleration types in turn (ICD, MCD, None)
diff --git a/src/OpenTK/Platform/Windows/WinRawJoystick.cs b/src/OpenTK/Platform/Windows/WinRawJoystick.cs
index fe09fa2f..233a640f 100644
--- a/src/OpenTK/Platform/Windows/WinRawJoystick.cs
+++ b/src/OpenTK/Platform/Windows/WinRawJoystick.cs
@@ -51,7 +51,7 @@ namespace OpenTK.Platform.Windows
             internal readonly int XInputIndex;
 
             private readonly Dictionary<int, int> axes =
-                new Dictionary<int,int>();
+                new Dictionary<int, int>();
 
             private readonly Dictionary<int, int> buttons =
                 new Dictionary<int, int>();
diff --git a/src/OpenTK/Platform/X11/API.cs b/src/OpenTK/Platform/X11/API.cs
index 7f52d79b..0628fca1 100644
--- a/src/OpenTK/Platform/X11/API.cs
+++ b/src/OpenTK/Platform/X11/API.cs
@@ -1171,7 +1171,7 @@ XF86VidModeGetGammaRampSize(
         XF86MenuKB = 0x1008ff65,
         XF86Calculator = 0x1008ff1d,
         XF86Sleep = 0x1008ff2f,
-        XF86WakeUp = 0x1008ff2b ,
+        XF86WakeUp = 0x1008ff2b,
         XF86Explorer = 0x1008ff5d,
         XF86Send = 0x1008ff7b,
         XF86Xfer = 0x1008ff8a,
@@ -1190,7 +1190,7 @@ XF86VidModeGetGammaRampSize(
         XF86Favorites = 0x1008ff30,
         XF86MyComputer = 0x1008ff33,
         XF86Back = 0x1008ff26,
-        XF86Forward = 0x1008ff27 ,
+        XF86Forward = 0x1008ff27,
         XF86Eject = 0x1008ff2c,
         XF86AudioPlay = 0x1008ff14,
         XF86AudioStop = 0x1008ff15,
diff --git a/stylecop.ruleset b/stylecop.ruleset
index b26ed9d4..5cb6a671 100644
--- a/stylecop.ruleset
+++ b/stylecop.ruleset
@@ -7,7 +7,7 @@
 
     <!-- Spacing rules -->
     <Rule Id="SA1000" Action="Error" /> <!-- Keywords must be spaced correctly -->
-    <Rule Id="SA1001" Action="None" /> <!-- Commas must be spaced correctly -->
+    <Rule Id="SA1001" Action="Error" /> <!-- Commas must be spaced correctly -->
     <Rule Id="SA1002" Action="None" /> <!-- Semicolons must be spaced correctly -->
     <Rule Id="SA1003" Action="None" /> <!-- Symbols must be spaced correctly -->
     <Rule Id="SA1004" Action="None" /> <!-- Documentation lines must begin with single space -->