Set OpenGL debug labels on various objects loaded from Resources

[libs/gl.git] / source / materials / material.cpp

diff --git a/source/materials/material.cpp b/source/materials/material.cpp
index eaabad157002b793f64a9d1575238618856e9223..ace87e70954847d299061205826d9dacf9029919 100644 (file)
--- a/source/materials/material.cpp
+++ b/source/materials/material.cpp
@@ -13,12 +13,15 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-const Program *Material::create_compatible_shader(DataFile::Collection &coll) const
+const Program *Material::create_compatible_shader(DataFile::Collection &coll, 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);
@@ -43,6 +46,8 @@ const Program *Material::create_compatible_shader(DataFile::Collection &coll) co
        return shprog;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 void Material::attach_texture_to(const Texture *tex, Texturing &texturing, ProgramData &tex_shdata, const string &name) const
 {
        if(!tex)
@@ -62,6 +67,16 @@ void Material::attach_texture_to(const Texture *tex, Texturing &texturing, Progr
        texturing.attach(unit, *tex, sampler);
        tex_shdata.uniform(name, unit);
 }
+#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()
 {
@@ -100,14 +115,27 @@ void Material::Loader::sampler(const string &name)
 DataFile::Loader::ActionMap Material::GenericLoader::shared_actions;
 
 Material::GenericLoader::GenericLoader(DataFile::Collection *c):
-       coll(c)
+       coll(c),
+       material(0),
+       mat_loader(0)
 {
        set_actions(shared_actions);
 }
 
+Material::GenericLoader::~GenericLoader()
+{
+       delete material;
+       delete mat_loader;
+}
+
 void Material::GenericLoader::init_actions()
 {
-       get_material_registry().add_all(*this);
+       add("type", &GenericLoader::type);
+}
+
+void Material::GenericLoader::type(const DataFile::Symbol &sym)
+{
+       get_material_registry().invoke(sym.name, *this);
 }
 
 } // namespace GL