X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources%2Fresources.cpp;h=ab4b0a8dd52d560282ef7ca11d1afcd41c1c6cda;hb=HEAD;hp=7cbdd2c5069f3bc8f51311bfa52e3183f7457787;hpb=147ec71f9fe3bd6b7ce25a7b74122f0282a99393;p=libs%2Fgl.git

diff --git a/source/resources/resources.cpp b/source/resources/resources.cpp
index 7cbdd2c5..ab4b0a8d 100644
--- 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"
@@ -43,7 +44,6 @@ void init_builtin_data(DataFile::BuiltinSource &);
 Resources *Resources::global_resources = 0;
 
 Resources::Resources(bool set_as_global):
-	srgb_conversion(false),
 	resource_manager(0)
 {
 	add_type<Animation>().suffix(".anim").keyword("animation");
@@ -63,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; });
@@ -140,11 +141,6 @@ const DataFile::CollectionSource &Resources::get_builtins()
 	return builtins;
 }
 
-void Resources::set_srgb_conversion(bool c)
-{
-	srgb_conversion = c;
-}
-
 void Resources::set_resource_manager(ResourceManager *m)
 {
 	resource_manager = m;
@@ -229,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();
 		}