Check the flat qualifier from the correct member

[libs/gl.git] / source / resources / resources.cpp

diff --git a/source/resources/resources.cpp b/source/resources/resources.cpp
index e67405ac705489a56dbc435cd0c1224b1478e667..ab4b0a8dd52d560282ef7ca11d1afcd41c1c6cda 100644 (file)
--- a/source/resources/resources.cpp
+++ b/source/resources/resources.cpp
@@ -2,6 +2,7 @@
 #include <msp/fs/utils.h>
 #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<Mesh>);
        add_type<Module>().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<Module>);
        add_type<Object>().base<Renderable>().keyword("object");
        add_type<OccludedScene>().base<Scene>().base<Renderable>().suffix(".scene")
                .creator([this](const string &n) -> OccludedScene * { create_generic<Scene>(n); return 0; });
@@ -223,7 +225,11 @@ Module *Resources::create_module(const string &name)
        {
                if(ext==".glsl")
                {
-                       RefPtr<GlslModule> module = new GlslModule;
+                       RefPtr<Module> module;
+                       if(get_backend_api()==VULKAN)
+                               module = new SpirVModule;
+                       else
+                               module = new GlslModule;
                        module->load_source(*io, this, name);
                        return module.release();
                }