- int loc = prog.get_uniform_location(j->first);
- if(loc>=0)
- block.attach(loc, *j->second);
+ 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);
+ }