+ const Program *prog = Program::current();
+ if(!prog)
+ throw invalid_operation("ProgramData::apply");
+
+ const UniformBlock &block = get_block(*prog);
+ block.apply(-1);
+}
+
+
+ProgramData::Block::Block():
+ dirty(false),
+ block(0)
+{ }
+
+
+ProgramData::Loader::Loader(ProgramData &pd):
+ DataFile::ObjectLoader<ProgramData>(pd)
+{
+ add("uniform1i", &Loader::uniform1i);
+ add("uniform1f", &Loader::uniform1f);
+ add("uniform2f", &Loader::uniform2f);
+ add("uniform3f", &Loader::uniform3f);
+ add("uniform4f", &Loader::uniform4f);
+}
+
+void ProgramData::Loader::uniform1i(const string &n, int v)
+{
+ obj.uniform(n, v);
+}
+
+void ProgramData::Loader::uniform1f(const string &n, float v)
+{
+ obj.uniform(n, v);
+}
+
+void ProgramData::Loader::uniform2f(const string &n, float v0, float v1)
+{
+ obj.uniform(n, v0, v1);
+}
+
+void ProgramData::Loader::uniform3f(const string &n, float v0, float v1, float v2)
+{
+ obj.uniform(n, v0, v1, v2);
+}
+
+void ProgramData::Loader::uniform4f(const string &n, float v0, float v1, float v2, float v3)
+{
+ obj.uniform(n, v0, v1, v2, v3);