X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frenderpass.cpp;h=eb4ae1f93ba145b029ff5a23847b02e557f56c37;hp=4b458f6d5f9b57ca555b542e4724ed3b08d0b5ae;hb=42c1534d95e1551c37e64a1dae288e8b75e8d8ba;hpb=a6e46d61c4f3c54b6f44b0863e18581b889820dd

diff --git a/source/renderpass.cpp b/source/renderpass.cpp
index 4b458f6d..eb4ae1f9 100644
--- a/source/renderpass.cpp
+++ b/source/renderpass.cpp
@@ -25,7 +25,8 @@ RenderPass::RenderPass():
 
 RenderPass::RenderPass(const RenderPass &other):
 	shprog(other.shprog),
-	shdata(other.shdata ? new ProgramData(*other.shdata) : 0),
+	shdata(other.shdata),
+	uniform_slots(other.uniform_slots),
 	material(other.material),
 	texturing(other.texturing ? new Texturing(*other.texturing) : 0),
 	tex_names(other.tex_names),
@@ -35,7 +36,8 @@ RenderPass::RenderPass(const RenderPass &other):
 RenderPass &RenderPass::operator=(const RenderPass &other)
 {
 	shprog = other.shprog;
-	shdata = other.shdata ? new ProgramData(*other.shdata) : 0;
+	shdata = other.shdata;
+	uniform_slots = other.uniform_slots;
 	material = other.material;
 	texturing = other.texturing ? new Texturing(*other.texturing) : 0;
 	tex_names = other.tex_names;
@@ -51,8 +53,18 @@ RenderPass::~RenderPass()
 void RenderPass::set_shader_program(const Program *prog, const ProgramData *data)
 {
 	shprog = prog;
-	shdata = data;
-	shdata.keep();
+	shdata = new ProgramData(*data);
+}
+
+const string &RenderPass::get_slotted_uniform_name(const string &slot) const
+{
+	map<string, string>::const_iterator i = uniform_slots.find(slot);
+	if(i==uniform_slots.end())
+	{
+		static string empty;
+		return empty;
+	}
+	return i->second;
 }
 
 void RenderPass::set_material(const Material *mat)
@@ -103,10 +115,12 @@ void RenderPass::Loader::init()
 	add("shader",   &RenderPass::shprog);
 	add("material", &Loader::material_inline);
 	add("material", &Loader::material);
+	add("material_slot", &RenderPass::material_slot);
 	add("back_faces",&RenderPass::back_faces);
 	add("texunit",  &Loader::texunit);
 	add("texunit",  &Loader::texunit_named);
 	add("uniforms", &Loader::uniforms);
+	add("uniform_slot", &Loader::uniform_slot);
 }
 
 void RenderPass::Loader::material_inline()
@@ -145,7 +159,17 @@ void RenderPass::Loader::uniforms()
 		throw invalid_operation("RenderPass::Loader::uniforms");
 	RefPtr<ProgramData> shd = new ProgramData(obj.shprog);
 	load_sub(*shd);
-	obj.shdata = shd;
+	obj.shdata = shd.release();
+}
+
+void RenderPass::Loader::uniform_slot(const string &name)
+{
+	uniform_slot2(name, name);
+}
+
+void RenderPass::Loader::uniform_slot2(const string &name, const string &slot)
+{
+	obj.uniform_slots[slot] = name;
 }