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

diff --git a/source/renderpass.cpp b/source/renderpass.cpp
index eb4ae1f9..4e3b1f13 100644
--- a/source/renderpass.cpp
+++ b/source/renderpass.cpp
@@ -28,6 +28,7 @@ RenderPass::RenderPass(const RenderPass &other):
 	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)
@@ -39,6 +40,7 @@ RenderPass &RenderPass::operator=(const RenderPass &other)
 	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;
@@ -50,10 +52,21 @@ RenderPass::~RenderPass()
 	delete texturing;
 }
 
+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;
-	shdata = new ProgramData(*data);
+	shdata = (data ? new ProgramData(*data) : 0);
 }
 
 const string &RenderPass::get_slotted_uniform_name(const string &slot) const
@@ -151,12 +164,13 @@ 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();