X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.cpp;h=f47fed76b156de63ee77a2121f8695091c618452;hb=3ba81ebaaec0c271d68cc12afbea86c394c3403d;hp=01927063377b693b72c9ede4cabdb050ecd91067;hpb=08e19bc2b4eba572bc7699378cf55cd8772ac67e;p=libs%2Fgl.git

diff --git a/source/programdata.cpp b/source/programdata.cpp
index 01927063..f47fed76 100644
--- a/source/programdata.cpp
+++ b/source/programdata.cpp
@@ -65,7 +65,10 @@ ProgramData::~ProgramData()
 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())
@@ -256,6 +259,25 @@ void ProgramData::uniform_matrix4_array(const string &name, unsigned n, const fl
 	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;