X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.cpp;h=9b27af5031070c389e7c232af1cf56606b33db31;hb=7a7e1c4c249c4e8a3287d07f81a9f0fa944f894b;hp=4b39d196affa388f2db9d005a50be087a2ed6f14;hpb=8dbd6316d277d2f9cbf85e7e61f2541421e01292;p=libs%2Fgl.git

diff --git a/source/programdata.cpp b/source/programdata.cpp
index 4b39d196..9b27af50 100644
--- a/source/programdata.cpp
+++ b/source/programdata.cpp
@@ -177,6 +177,11 @@ 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 int *v)
+{
+	uniform(name, new UniformArray<Uniform1i>(n, v));
+}
+
 void ProgramData::uniform1_array(const string &name, unsigned n, const float *v)
 {
 	uniform(name, new UniformArray<Uniform1f>(n, v));
@@ -361,10 +366,15 @@ ProgramData::ProgramUniforms::ProgramUniforms():
 ProgramData::Loader::Loader(ProgramData &pd):
 	DataFile::ObjectLoader<ProgramData>(pd)
 {
+	add("uniform", &Loader::uniform1i);
 	add("uniform1i", &Loader::uniform1i);
+	add("uniform", &Loader::uniform1f);
 	add("uniform1f", &Loader::uniform1f);
+	add("uniform", &Loader::uniform2f);
 	add("uniform2f", &Loader::uniform2f);
+	add("uniform", &Loader::uniform3f);
 	add("uniform3f", &Loader::uniform3f);
+	add("uniform", &Loader::uniform4f);
 	add("uniform4f", &Loader::uniform4f);
 }