Use template functions for setting vector and matrix uniforms

[libs/gl.git] / source / render / programdata.cpp

diff --git a/source/render/programdata.cpp b/source/render/programdata.cpp
index 0f641a4afbdf1f75dde9bb5803f5458f90abcc55..d934b48782c23ce181a5022b5fcfeb6009ad83b4 100644 (file)
--- a/source/render/programdata.cpp
+++ b/source/render/programdata.cpp
@@ -237,11 +237,6 @@ void ProgramData::uniform(Tag tag, float v0, float v1, float v2)
        uniform3(tag, va);
 }
 
-void ProgramData::uniform(Tag tag, const Vector3 &v)
-{
-       uniform(tag, v.x, v.y, v.z);
-}
-
 void ProgramData::uniform3(Tag tag, const int *v)
 {
        uniform<Uniform3i>(tag, v);
@@ -264,11 +259,6 @@ void ProgramData::uniform(Tag tag, float v0, float v1, float v2, float v3)
        uniform4(tag, va);
 }
 
-void ProgramData::uniform(Tag tag, const Vector4 &v)
-{
-       uniform(tag, v.x, v.y, v.z, v.w);
-}
-
 void ProgramData::uniform(Tag tag, const Color &c)
 {
        uniform(tag, c.r, c.g, c.b, c.a);
@@ -284,81 +274,41 @@ void ProgramData::uniform4(Tag tag, const float *v)
        uniform<Uniform4f>(tag, v);
 }
 
-void ProgramData::uniform(Tag tag, const LinAl::Matrix<float, 2, 2> &m)
-{
-       uniform_matrix2(tag, &m(0, 0));
-}
-
 void ProgramData::uniform_matrix2(Tag tag, const float *v)
 {
        uniform<UniformMatrix2x2f>(tag, v);
 }
 
-void ProgramData::uniform(Tag tag, const LinAl::Matrix<float, 2, 3> &m)
-{
-       uniform_matrix3x2(tag, &m(0, 0));
-}
-
 void ProgramData::uniform_matrix3x2(Tag tag, const float *v)
 {
        uniform<UniformMatrix3x2f>(tag, v);
 }
 
-void ProgramData::uniform(Tag tag, const LinAl::Matrix<float, 2, 4> &m)
-{
-       uniform_matrix4x2(tag, &m(0, 0));
-}
-
 void ProgramData::uniform_matrix4x2(Tag tag, const float *v)
 {
        uniform<UniformMatrix4x2f>(tag, v);
 }
 
-void ProgramData::uniform(Tag tag, const LinAl::Matrix<float, 3, 2> &m)
-{
-       uniform_matrix2x3(tag, &m(0, 0));
-}
-
 void ProgramData::uniform_matrix2x3(Tag tag, const float *v)
 {
        uniform<UniformMatrix2x3f>(tag, v);
 }
 
-void ProgramData::uniform(Tag tag, const LinAl::Matrix<float, 3, 3> &m)
-{
-       uniform_matrix3(tag, &m(0, 0));
-}
-
 void ProgramData::uniform_matrix3(Tag tag, const float *v)
 {
        uniform<UniformMatrix3x3f>(tag, v);
 }
 
-void ProgramData::uniform(Tag tag, const LinAl::Matrix<float, 3, 4> &m)
-{
-       uniform_matrix4x3(tag, &m(0, 0));
-}
-
 void ProgramData::uniform_matrix4x3(Tag tag, const float *v)
 {
        uniform<UniformMatrix4x3f>(tag, v);
 }
 
-void ProgramData::uniform(Tag tag, const LinAl::Matrix<float, 4, 2> &m)
-{
-       uniform_matrix2x4(tag, &m(0, 0));
-}
-
 void ProgramData::uniform_matrix2x4(Tag tag, const float *v)
 {
        uniform<UniformMatrix2x4f>(tag, v);
 }
 
-void ProgramData::uniform(Tag tag, const LinAl::Matrix<float, 4, 3> &m)
-{
-       uniform_matrix3x4(tag, &m(0, 0));
-}
-
 void ProgramData::uniform_matrix3x4(Tag tag, const float *v)
 {
        uniform<UniformMatrix3x4f>(tag, v);
@@ -374,6 +324,16 @@ void ProgramData::uniform_matrix4(Tag tag, const float *v)
        uniform<UniformMatrix4x4f>(tag, v);
 }
 
+void ProgramData::uniform_array(Tag tag, unsigned n, const int *v)
+{
+       uniform_array<Uniform1i>(tag, n, v);
+}
+
+void ProgramData::uniform_array(Tag tag, unsigned n, const float *v)
+{
+       uniform_array<Uniform1f>(tag, n, v);
+}
+
 void ProgramData::uniform1_array(Tag tag, unsigned n, const int *v)
 {
        uniform_array<Uniform1i>(tag, n, v);