Fixed Uniform[234] overloads for Vector[234] (they were all named Uniform2).
Removed 'count' parameter from UniformMatrix4 overload for Matrix4 (it is always 16).
This commit is contained in:
parent
6f352bd9e1
commit
75db59c202
1 changed files with 4 additions and 4 deletions
|
@ -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
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue