+ uniform(name, new UniformArray<UniformMatrix4x4f>(n, v));
+}
+
+void ProgramData::find_uniforms_for_block(Block &block, const Program::UniformBlockInfo &info) const
+{
+ block.uniforms.clear();
+ for(vector<const Program::UniformInfo *>::const_iterator i=info.uniforms.begin(); i!=info.uniforms.end(); ++i)
+ {
+ // XXX individual array elements
+ UniformMap::const_iterator j = uniforms.find((*i)->name);
+ if(j!=uniforms.end())
+ block.uniforms[(*i)->location] = &j->second;
+ }
+}
+
+UniformBlock *ProgramData::create_block(const Program::UniformBlockInfo &info) const
+{
+ UniformBlock *block = new UniformBlock(info.data_size);
+ if(!buffer)
+ {
+ buffer = new Buffer(UNIFORM_BUFFER);
+ buffer->set_usage(STREAM_DRAW);
+ }
+ block->use_buffer(buffer, last_block);
+ last_block = block;
+ return block;
+}
+
+const UniformBlock *ProgramData::get_block(const Program &prog, const Program::UniformBlockInfo *info) const
+{
+ if(changes)
+ {
+ for(BlockMap::iterator i=blocks.begin(); i!=blocks.end(); ++i)
+ if(i->second.changes<changes)
+ i->second.changes = changes;
+ changes = NO_CHANGES;
+ }
+
+ unsigned layout_hash = (info ? info->layout_hash : prog.get_uniform_layout_hash());
+
+ 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;
+ }
+
+ if(!i->second.block)
+ return 0;
+
+ UniformBlock &block = *i->second.block;
+ if(i->second.changes)
+ {
+ if(info)
+ {
+ vector<const Program::UniformInfo *>::const_iterator j = info->uniforms.begin();
+ map<unsigned, const Uniform *const *>::const_iterator k = i->second.uniforms.begin();
+ while(j!=info->uniforms.end() && k!=i->second.uniforms.end())
+ {
+ if(k->first==(*j)->location)
+ {
+ block.attach(**j, **k->second);
+ ++k;
+ }
+ ++j;
+ }
+ }
+ 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.changes = NO_CHANGES;
+ }
+
+ return █
+}
+
+const UniformBlock *ProgramData::get_block(const Program &prog, const string &name) const
+{
+ if(name.empty())
+ return get_block(prog, 0);
+ else
+ return get_block(prog, &prog.get_uniform_block_info(name));