X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderpass.cpp;h=4e3b1f1332bbd0dcda294940821d61be091604f3;hb=b856ccc893a102536048e8d67a6577a31ebdf166;hp=b588ff2dc8a119624bcf5297ad5483f8fef972dc;hpb=cfd4d36c2b6b6095ada3aef8082e5d409a233a21;p=libs%2Fgl.git

diff --git a/source/renderpass.cpp b/source/renderpass.cpp
index b588ff2d..4e3b1f13 100644
--- a/source/renderpass.cpp
+++ b/source/renderpass.cpp
@@ -25,8 +25,10 @@ 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),
+	material_slot(other.material_slot),
 	texturing(other.texturing ? new Texturing(*other.texturing) : 0),
 	tex_names(other.tex_names),
 	back_faces(other.back_faces)
@@ -35,8 +37,10 @@ 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;
+	material_slot = other.material_slot;
 	texturing = other.texturing ? new Texturing(*other.texturing) : 0;
 	tex_names = other.tex_names;
 	back_faces = other.back_faces;
@@ -46,14 +50,34 @@ RenderPass &RenderPass::operator=(const RenderPass &other)
 RenderPass::~RenderPass()
 {
 	delete texturing;
-	delete shdata;
+}
+
+void RenderPass::ensure_private_shader_data()
+{
+	if(!shprog)
+		throw invalid_operation("RenderPass::ensure_private_shader_data");
+
+	if(!shdata)
+		shdata = new ProgramData(shprog);
+	else if(shdata.refcount() > 1)
+		shdata = new ProgramData(*shdata);
 }
 
 void RenderPass::set_shader_program(const Program *prog, const ProgramData *data)
 {
 	shprog = prog;
-	delete shdata;
-	shdata = new ProgramData(*data);
+	shdata = (data ? new ProgramData(*data) : 0);
+}
+
+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)
@@ -82,7 +106,7 @@ void RenderPass::apply(Renderer &renderer) const
 {
 	renderer.set_texturing(texturing);
 	renderer.set_material(material.get());
-	renderer.set_shader_program(shprog, shdata);
+	renderer.set_shader_program(shprog, shdata.get());
 	renderer.set_reverse_winding(back_faces);
 }
 
@@ -109,6 +133,7 @@ void RenderPass::Loader::init()
 	add("texunit",  &Loader::texunit);
 	add("texunit",  &Loader::texunit_named);
 	add("uniforms", &Loader::uniforms);
+	add("uniform_slot", &Loader::uniform_slot);
 }
 
 void RenderPass::Loader::material_inline()
@@ -139,17 +164,28 @@ void RenderPass::Loader::texunit_named(unsigned i, const string &n)
 {
 	texunit(i);
 	obj.tex_names[n] = i;
+	obj.ensure_private_shader_data();
+	obj.shdata->uniform(n, static_cast<int>(i));
 }
 
 void RenderPass::Loader::uniforms()
 {
-	if(!obj.shprog)
-		throw invalid_operation("RenderPass::Loader::uniforms");
+	obj.ensure_private_shader_data();
 	RefPtr<ProgramData> shd = new ProgramData(obj.shprog);
 	load_sub(*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;
+}
+
 
 RenderPass::TextureLoader::TextureLoader(Texturing &t, unsigned i, Collection *c):
 	DataFile::CollectionObjectLoader<Texturing>(t, c),