From 75db59c202b58b771613bf167e63d39073c146a6 Mon Sep 17 00:00:00 2001
From: the_fiddler <the_fiddler@ebc5dd9b-fb1d-0410-b6f8-d24c324e9604>
Date: Sun, 12 Apr 2009 19:59:12 +0000
Subject: [PATCH] Fixed Uniform[234] overloads for Vector[234] (they were all
 named Uniform2). Removed 'count' parameter from UniformMatrix4 overload for
 Matrix4 (it is always 16).

---
 Source/OpenTK/Graphics/GL/GLHelper.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/OpenTK/Graphics/GL/GLHelper.cs b/Source/OpenTK/Graphics/GL/GLHelper.cs
index a4ffb344..457c0767 100644
--- a/Source/OpenTK/Graphics/GL/GLHelper.cs
+++ b/Source/OpenTK/Graphics/GL/GLHelper.cs
@@ -833,13 +833,13 @@ namespace OpenTK.Graphics
             }
         }
 
-        public static void UniformMatrix4(int location, int count, bool transpose, ref Matrix4 matrix)
+        public static void UniformMatrix4(int location, bool transpose, ref Matrix4 matrix)
         {
             unsafe
             {
                 fixed (float* matrix_ptr = &matrix.Row0.X)
                 {
-                    GL.UniformMatrix4(location, count, transpose, matrix_ptr);
+                    GL.UniformMatrix4(location, 16, transpose, matrix_ptr);
                 }
             }
         }
@@ -890,7 +890,7 @@ namespace OpenTK.Graphics
             }
         }
 
-        public static void Uniform2(int location, Vector3 vector)
+        public static void Uniform3(int location, Vector3 vector)
         {
             unsafe
             {
@@ -898,7 +898,7 @@ namespace OpenTK.Graphics
             }
         }
 
-        public static void Uniform2(int location, Vector4 vector)
+        public static void Uniform4(int location, Vector4 vector)
         {
             unsafe
             {