-void ProgramData::uniform_matrix4(const string &name, const float *v)
-{
- uniform_matrix4(program.get_uniform_location(name), v);
-}
+ UniformBlock &block = *i->second.block;
+ if(i->second.dirty)
+ {
+ if(info)
+ {
+ for(vector<const Program::UniformInfo *>::const_iterator j=info->uniforms.begin(); j!=info->uniforms.end(); ++j)
+ {
+ // XXX individual array elements
+ UniformMap::const_iterator k = uniforms.find((*j)->name);
+ if(k!=uniforms.end())
+ block.attach(**j, *k->second);
+ }
+ }
+ else
+ {
+ for(UniformMap::const_iterator j=uniforms.begin(); j!=uniforms.end(); ++j)
+ {
+ int loc = prog.get_uniform_location(j->first);
+ if(loc>=0)
+ block.attach(loc, *j->second);
+ }
+ }
+ i->second.dirty = false;
+ }