X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources%2Fresources.cpp;h=ab4b0a8dd52d560282ef7ca11d1afcd41c1c6cda;hb=HEAD;hp=e67405ac705489a56dbc435cd0c1224b1478e667;hpb=f64d903f902ad72596284e9fbd17ad06262b2fc9;p=libs%2Fgl.git diff --git a/source/resources/resources.cpp b/source/resources/resources.cpp index e67405ac..ab4b0a8d 100644 --- a/source/resources/resources.cpp +++ b/source/resources/resources.cpp @@ -2,6 +2,7 @@ #include #include "animation.h" #include "armature.h" +#include "backend.h" #include "basicmaterial.h" #include "camera.h" #include "directionallight.h" @@ -62,7 +63,8 @@ Resources::Resources(bool set_as_global): .creator([this](const string &n){ return create_mesh(n); }) .notify(&set_debug_name); add_type().suffix(".glsl").suffix(".spv") - .creator([this](const string &n){ return create_module(n); }); + .creator([this](const string &n){ return create_module(n); }) + .notify(&set_debug_name); add_type().base().keyword("object"); add_type().base().base().suffix(".scene") .creator([this](const string &n) -> OccludedScene * { create_generic(n); return 0; }); @@ -223,7 +225,11 @@ Module *Resources::create_module(const string &name) { if(ext==".glsl") { - RefPtr module = new GlslModule; + RefPtr module; + if(get_backend_api()==VULKAN) + module = new SpirVModule; + else + module = new GlslModule; module->load_source(*io, this, name); return module.release(); }