-void ProgramData::uniform4(const string &name, const float *v)
-{
- uniform4(program.get_uniform_location(name), v);
-}
+ map<unsigned, Block>::iterator i = blocks.find(layout_hash);
+ if(i==blocks.end())
+ {
+ i = blocks.insert(BlockMap::value_type(layout_hash, Block())).first;
+ if(info)
+ {
+ find_uniforms_for_block(i->second, *info);
+
+ if(!i->second.uniforms.empty())
+ {
+ i->second.block = create_block(*info);
+ i->second.changes = VALUES_CHANGED;
+ }
+ }
+ else
+ {
+ i->second.block = new UniformBlock;
+ i->second.changes = VALUES_CHANGED;
+ }
+ }
+ else if(info && i->second.changes==KEYS_CHANGED)
+ {
+ find_uniforms_for_block(i->second, *info);
+ if(!i->second.uniforms.empty())
+ {
+ if(!i->second.block)
+ i->second.block = create_block(*info);
+ i->second.changes = VALUES_CHANGED;
+ }
+ else
+ i->second.changes = NO_CHANGES;
+ }