X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources%2Fresources.cpp;h=a2d9219b0f6075a97f7be5d6d54b3341a98f88e4;hb=20a86c5905e1f7527d3c9edc3f56f6b7679c268a;hp=68d9739e7a49d64039a0f47d53d46159021bf88c;hpb=fb1e7ede05b07625232c2092d99e9d6b2d54a153;p=libs%2Fgl.git

diff --git a/source/resources/resources.cpp b/source/resources/resources.cpp
index 68d9739e..a2d9219b 100644
--- a/source/resources/resources.cpp
+++ b/source/resources/resources.cpp
@@ -45,7 +45,7 @@ Resources::Resources():
 	add_type<Lighting>().suffix(".lightn").keyword("lighting");
 	add_type<Material>().suffix(".mat").creator(&Resources::create_material);
 	add_type<Mesh>().keyword("mesh").creator(&Resources::create_mesh);
-	add_type<Module>().suffix(".glsl").creator(&Resources::create_module);
+	add_type<Module>().suffix(".glsl").suffix(".spv").creator(&Resources::create_module);
 	add_type<Object>().keyword("object");
 	add_type<PipelineTemplate>().suffix(".pipe").keyword("pipeline");
 	add_type<Pose>().keyword("pose");
@@ -174,11 +174,24 @@ Texture2D *Resources::create_texture2d(const string &name)
 
 Module *Resources::create_module(const string &name)
 {
+	string ext = FS::extpart(name);
+	if(ext!=".glsl" && ext!=".spv")
+		return 0;
+
 	if(RefPtr<IO::Seekable> io = open_raw(name))
 	{
-		RefPtr<Module> module = new Module;
-		module->load_source(*io, this, name);
-		return module.release();
+		if(ext==".glsl")
+		{
+			RefPtr<GlslModule> module = new GlslModule;
+			module->load_source(*io, this, name);
+			return module.release();
+		}
+		else if(ext==".spv")
+		{
+			RefPtr<SpirVModule> module = new SpirVModule;
+			module->load_code(*io);
+			return module.release();
+		}
 	}
 
 	return 0;
@@ -189,7 +202,7 @@ Program *Resources::create_program(const string &name)
 	string ext = FS::extpart(name);
 	string base = FS::basepart(name);
 	string ext2 = FS::extpart(base);
-	if(ext==".shader" && ext2==".glsl")
+	if(ext==".shader" && (ext2==".glsl" || ext2==".spv"))
 	{
 		Module &module = get<Module>(base);
 		RefPtr<Program> shprog = new Program;