void ProgramData::uniform(const string &name, Uniform *uni)
{
if(name[name.size()-1]==']')
+ {
+ delete uni;
throw invalid_argument("ProgramData::uniform");
+ }
SlotMap::iterator i = uniform_slots.find(name);
if(i!=uniform_slots.end())
uniform(name, new UniformArray<UniformMatrix4x4f>(n, v));
}
+void ProgramData::remove_uniform(const string &name)
+{
+ SlotMap::iterator i = uniform_slots.find(name);
+ if(i!=uniform_slots.end())
+ {
+ vector<Uniform *>::iterator j = uniforms.begin()+i->second;
+ delete *j;
+ uniforms.erase(j);
+
+ for(SlotMap::iterator k=uniform_slots.begin(); k!=uniform_slots.end(); ++k)
+ if(k->second>i->second)
+ --k->second;
+
+ uniform_slots.erase(i);
+
+ dirty = ALL_ONES;
+ }
+}
+
unsigned ProgramData::compute_slot_mask(const Program::UniformBlockInfo &block) const
{
unsigned mask = 0;