X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.cpp;h=ded9f8a7bb242c38f5606b9cc1dce7bef67d4b2a;hb=5dd4b17dafb2223d28ef6cb83e6ca3fb88aee8af;hp=1ecd3a1dc42eaef6a62785f3fa4f07e1809a6405;hpb=8f7d5b6460ef68e7316c7f556b7152d9c9f7bfe2;p=libs%2Fgl.git

diff --git a/source/programdata.cpp b/source/programdata.cpp
index 1ecd3a1d..ded9f8a7 100644
--- a/source/programdata.cpp
+++ b/source/programdata.cpp
@@ -129,18 +129,18 @@ void ProgramData::uniform_matrix3(const string &name, const float *v)
 	uniform(name, new UniformMatrix3x3f(v));
 }
 
-void ProgramData::uniform_matrix4(const string &name, const float *v)
-{
-	uniform(name, new UniformMatrix4x4f(v));
-}
-
-void ProgramData::uniform_matrix4(const string &name, const Matrix &m)
+void ProgramData::uniform(const string &name, const Matrix &m)
 {
 	float v[16];
 	copy(m.data(), m.data()+16, v);
 	uniform_matrix4(name, v);
 }
 
+void ProgramData::uniform_matrix4(const string &name, const float *v)
+{
+	uniform(name, new UniformMatrix4x4f(v));
+}
+
 void ProgramData::uniform1_array(const string &name, unsigned n, const float *v)
 {
 	uniform(name, new UniformArray<Uniform1f>(n, v));