Migrate from LoadableTypeRegistry to TypeRegistry

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

diff --git a/source/materials/material.cpp b/source/materials/material.cpp
index 17fa546bbf0ba9f94fb7e08688afd3a46a2d7cee..d87f2f830afd7583df377b641a0a70873829e5e6 100644 (file)
--- a/source/materials/material.cpp
+++ b/source/materials/material.cpp
@@ -13,20 +13,23 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Program *Material::create_compatible_shader() const
-{
-       return new Program(create_program_source());
-}
-
 const Program *Material::create_compatible_shader(DataFile::Collection &coll) const
 {
-       string source = create_program_source();
-       string name = format("_material_%016x.glsl", hash64(source));
+       string module_name;
+       map<string, int> spec_values;
+       fill_program_info(module_name, spec_values);
+
+       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);
+
+       string name = format("_material_%016x.shader", hash64(info));
        Program *shprog = coll.find<Program>(name);
        if(shprog)
                return shprog;
 
-       shprog = new Program(create_program_source());
+       const Module &module = coll.get<Module>(module_name);
+       shprog = new Program(module, spec_values);
        try
        {
                coll.add(name, shprog);
@@ -40,6 +43,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)
@@ -59,6 +64,7 @@ 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
 
 Material::MaterialRegistry &Material::get_material_registry()
 {
@@ -88,7 +94,7 @@ void Material::Loader::init_actions()
        add("sampler", &Loader::sampler);
 }
 
-void Material::Loader::sampler(const std::string &name)
+void Material::Loader::sampler(const string &name)
 {
        obj.sampler = &get_collection().get<Sampler>(name);
 }
@@ -104,7 +110,7 @@ Material::GenericLoader::GenericLoader(DataFile::Collection *c):
 
 void Material::GenericLoader::init_actions()
 {
-       get_material_registry().add_all(*this);
+       get_material_registry().invoke_all(*this);
 }
 
 } // namespace GL