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

diff --git a/source/programdata.cpp b/source/programdata.cpp
index 65e660f0..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));
@@ -265,14 +270,15 @@ void ProgramData::apply() const
 	Program::LayoutHash layout = prog->get_uniform_layout_hash();
 	ProgramUniforms &pu = programs[layout];
 
-	if((dirty&pu.used)|pu.dirty)
+	Mask force_dirty = (dirty==ALL_ONES ? ALL_ONES : 0U);
+	Mask affected = (dirty&pu.used) | force_dirty;
+	if(affected|pu.dirty)
 	{
 		/* If the global dirty flag affects this program, add it to per-program
 		dirty flags and clear the global flag.  A previously unseen program will
 		always cause this to happen. */
-		if(dirty&pu.used)
+		if(affected)
 		{
-			Mask force_dirty = (dirty==ALL_ONES ? ALL_ONES : 0U);
 			for(BlockMap::iterator i=blocks.begin(); i!=blocks.end(); ++i)
 				i->second.dirty |= (dirty&i->second.used) | force_dirty;
 			for(ProgramMap::iterator i=programs.begin(); i!=programs.end(); ++i)
@@ -360,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);
 }