X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterials%2Frenderpass.cpp;h=74b734128ba5d30710aedbc12ce30f505ea8ca3c;hp=35692a4eaa69d49e54666e5684ff46b04f03c324;hb=fe2fc291a4fc618425c64112c9ffd3519f0b8a3e;hpb=cb7db94f7837e6a3be037d07575dc248177d9426

diff --git a/source/materials/renderpass.cpp b/source/materials/renderpass.cpp
index 35692a4e..74b73412 100644
--- a/source/materials/renderpass.cpp
+++ b/source/materials/renderpass.cpp
@@ -33,7 +33,7 @@ void RenderPass::set_material_textures()
 		set_texture(*tag, material->get_texture(*tag), material->get_sampler());
 }
 
-void RenderPass::maybe_create_material_shader(DataFile::Collection *coll)
+void RenderPass::maybe_create_material_shader()
 {
 	if(shprog && !shprog_from_material)
 		return;
@@ -42,13 +42,7 @@ void RenderPass::maybe_create_material_shader(DataFile::Collection *coll)
 	if(receive_shadows)
 		extra_spec["use_shadow_map"] = true;
 
-	if(coll)
-	{
-		shprog = material->create_compatible_shader(*coll, extra_spec);
-		shprog.keep();
-	}
-	else
-		throw invalid_operation("RenderPass::maybe_create_material_shader");
+	shprog = material->create_compatible_shader(extra_spec);
 
 	if(shdata)
 		shdata = new ProgramData(*shdata, shprog.get());
@@ -72,11 +66,11 @@ Tag RenderPass::get_slotted_uniform_tag(Tag slot) const
 	return i->second;
 }
 
-void RenderPass::set_material(const Material *mat, DataFile::Collection *coll)
+void RenderPass::set_material(const Material *mat)
 {
 	material = mat;
 	material.keep();
-	maybe_create_material_shader(coll);
+	maybe_create_material_shader();
 	set_material_textures();
 }
 
@@ -130,6 +124,11 @@ int RenderPass::get_texture_index(const string &n) const
 	return (shprog && i!=textures.end() ? shprog->get_uniform_binding(i->tag) : -1);
 }
 
+void RenderPass::set_back_faces(bool bf)
+{
+	back_faces = bf;
+}
+
 void RenderPass::set_receive_shadows(bool rs)
 {
 	receive_shadows = rs;
@@ -144,6 +143,16 @@ void RenderPass::apply(Renderer &renderer) const
 	renderer.set_reverse_winding(back_faces);
 }
 
+void RenderPass::set_debug_name(const string &name)
+{
+#ifdef DEBUG
+	if(shdata.refcount()==1)
+		shdata->set_debug_name(name+" [UBO]");
+#else
+	(void)name;
+#endif
+}
+
 
 DataFile::Loader::ActionMap RenderPass::Loader::shared_actions;
 
@@ -181,7 +190,7 @@ void RenderPass::Loader::init_actions()
 void RenderPass::Loader::finish()
 {
 	if(obj.material)
-		obj.maybe_create_material_shader(coll);
+		obj.maybe_create_material_shader();
 }
 
 // Temporary compatibility feature