#include <msp/core/hash.h>
#include <msp/strings/format.h>
#include "basicmaterial.h"
-#include "gl.h"
#include "pbrmaterial.h"
+#include "program.h"
#include "resources.h"
-#include "texturing.h"
-#include "uniform.h"
#include "unlitmaterial.h"
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);
- 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);
+ for(const auto &kvp: extra_spec)
+ spec_values[kvp.first] = kvp.second;
- string name = format("_material_%016x.shader", hash64(info));
- Program *shprog = coll.find<Program>(name);
+ uint64_t info_hash = hash<64>(module_name);
+ for(const auto &kvp: spec_values)
+ {
+ info_hash = hash_update<64>(info_hash, kvp.first);
+ info_hash = hash_update<64>(info_hash, kvp.second);
+ }
+
+ Resources &res = Resources::get_global();
+ string name = format("_material_%016x.shader", info_hash);
+ 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(...)
{
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
+void Material::set_debug_name(const string &name)
{
- if(!tex)
- return;
-
- int unit = -1;
-
- if(const Uniform *uni = tex_shdata.find_uniform(name))
- if(const Uniform1i *uni_int = dynamic_cast<const Uniform1i *>(uni))
- unit = uni_int->get();
-
- if(unit<0)
- unit = texturing.find_free_unit(name);
- if(unit<0)
- throw runtime_error("no free texunit");
-
- texturing.attach(unit, *tex, sampler);
- tex_shdata.uniform(name, unit);
+#ifdef DEBUG
+ shdata.set_debug_name(name+" [UBO]");
+#else
+ (void)name;
+#endif
}
-#pragma GCC diagnostic pop
-Material::MaterialRegistry &Material::get_material_registry()
+Material::GenericLoader::TypeRegistry &Material::get_material_registry()
{
- static MaterialRegistry registry;
+ static GenericLoader::TypeRegistry registry;
static bool initialized = false;
if(!initialized)
{
}
-Material::Loader::Loader(Material &m):
- CollectionObjectLoader(m, 0)
-{ }
-
Material::Loader::Loader(Material &m, Collection &c):
CollectionObjectLoader(m, &c)
{ }
obj.sampler = &get_collection().get<Sampler>(name);
}
-
-DataFile::Loader::ActionMap Material::GenericLoader::shared_actions;
-
-Material::GenericLoader::GenericLoader(DataFile::Collection *c):
- coll(c)
-{
- set_actions(shared_actions);
-}
-
-void Material::GenericLoader::init_actions()
-{
- get_material_registry().add_all(*this);
-}
-
} // namespace GL
} // namespace Msp