X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogramdata.cpp;h=79a8bb1bd98fe434542504487bdcf5f23b047e50;hp=ca6ae5ba44dbae3ee8b5ee992b6c85ff785fde5f;hb=332352298ef41b8ac3a4c57b467dd146c0b05e0b;hpb=53953f28255e782ed640a9e8d2d42c9b218943ad

diff --git a/source/programdata.cpp b/source/programdata.cpp
index ca6ae5ba..79a8bb1b 100644
--- a/source/programdata.cpp
+++ b/source/programdata.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/maputils.h>
 #include <msp/gl/extensions/arb_direct_state_access.h>
 #include "buffer.h"
 #include "color.h"
@@ -104,6 +105,11 @@ void ProgramData::uniform(const string &name, Uniform *uni)
 	}
 }
 
+void ProgramData::uniform(const string &name, const Uniform &u)
+{
+	uniform(name, u.clone());
+}
+
 void ProgramData::uniform(const string &name, int v)
 {
 	uniform(name, new Uniform1i(v));
@@ -289,6 +295,19 @@ void ProgramData::remove_uniform(const string &name)
 	}
 }
 
+vector<string> ProgramData::get_uniform_names() const
+{
+	vector<string> names;
+	for(SlotMap::const_iterator i=uniform_slots.begin(); i!=uniform_slots.end(); ++i)
+		names.push_back(i->first);
+	return names;
+}
+
+const Uniform &ProgramData::get_uniform(const string &name) const
+{
+	return *uniforms[get_item(uniform_slots, name)];
+}
+
 unsigned ProgramData::compute_slot_mask(const Program::UniformBlockInfo &block) const
 {
 	unsigned mask = 0;
@@ -436,7 +455,7 @@ ProgramData::ProgramBlock::ProgramBlock():
 
 ProgramData::ProgramBlock::ProgramBlock(int p, SharedBlock *b):
 	bind_point(p),
-	block(b ? b->block : 0),
+	block((b && b->used) ? b->block : 0),
 	shared(b)
 { }