X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Fmaterial.cpp;h=b2ee973ad11c0b8d55fc4d6ea14dabaebf31a3a8;hb=3ac3a51c623271da815c8ee60c484445871753bf;hp=36d0958f5afb18aaa5270750f7c8e031193583a4;hpb=a4b9ae04a0a89bb2cf3ab4235d7376d3ff70af7b;p=libs%2Fgl.git

diff --git a/source/materials/material.cpp b/source/materials/material.cpp
index 36d0958f..b2ee973a 100644
--- a/source/materials/material.cpp
+++ b/source/materials/material.cpp
@@ -13,26 +13,30 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-const Program *Material::create_compatible_shader(DataFile::Collection &coll) const
+const Program *Material::create_compatible_shader(const map<string, int> &extra_spec) const
 {
 	string module_name;
 	map<string, int> spec_values;
 	fill_program_info(module_name, spec_values);
 
+	for(map<string, int>::const_iterator i=extra_spec.begin(); i!=extra_spec.end(); ++i)
+		spec_values[i->first] = i->second;
+
 	string info = module_name;
 	for(map<string, int>::const_iterator i=spec_values.begin(); i!=spec_values.end(); ++i)
 		info += format(",%s:%d", i->first, i->second);
 
+	Resources &res = Resources::get_global();
 	string name = format("_material_%016x.shader", hash64(info));
-	Program *shprog = coll.find<Program>(name);
+	Program *shprog = res.find<Program>(name);
 	if(shprog)
 		return shprog;
 
-	const Module &module = coll.get<Module>(module_name);
+	const Module &module = res.get<Module>(module_name);
 	shprog = new Program(module, spec_values);
 	try
 	{
-		coll.add(name, shprog);
+		res.add(name, shprog);
 	}
 	catch(...)
 	{
@@ -66,6 +70,15 @@ void Material::attach_texture_to(const Texture *tex, Texturing &texturing, Progr
 }
 #pragma GCC diagnostic pop
 
+void Material::set_debug_name(const string &name)
+{
+#ifdef DEBUG
+	shdata.set_debug_name(name+" [UBO]");
+#else
+	(void)name;
+#endif
+}
+
 Material::MaterialRegistry &Material::get_material_registry()
 {
 	static MaterialRegistry registry;