X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources%2Fresources.cpp;h=a2d9219b0f6075a97f7be5d6d54b3341a98f88e4;hb=7af200475facc657a0bbffaa17520d3ec9d809af;hp=ef8b93255fca8927104d35e4434e4a68cf5ee1bf;hpb=dccad64b2ec82249d850b9745614042171499972;p=libs%2Fgl.git

diff --git a/source/resources/resources.cpp b/source/resources/resources.cpp
index ef8b9325..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");
@@ -132,20 +132,23 @@ Texture2D *Resources::create_texture2d(const string &name)
 
 	if(RefPtr<IO::Seekable> io = open_raw(name))
 	{
-		Graphics::Image image;
-		if(!resource_manager)
-			image.load_io(*io);
-
-		RefPtr<Texture2D> tex = new Texture2D(resource_manager);
+		RefPtr<Texture2D> tex;
 
 		if(ext==".tex2d")
 		{
+			tex = new Texture2D(resource_manager);
 			DataFile::Parser parser(*io, name);
 			Texture2D::Loader ldr(*tex, *this);
 			ldr.load(parser);
 		}
 		else
 		{
+			// Verify that the image is loadable
+			Graphics::Image image;
+			if(!resource_manager)
+				image.load_io(*io);
+
+			tex = new Texture2D(resource_manager);
 			Sampler &samp = tex->get_default_sampler();
 			if(is_mipmapped(default_tex_filter))
 			{
@@ -156,12 +159,13 @@ Texture2D *Resources::create_texture2d(const string &name)
 				samp.set_mag_filter(default_tex_filter);
 			samp.set_min_filter(default_tex_filter);
 			samp.set_max_anisotropy(default_tex_anisotropy);
+
+			if(resource_manager)
+				resource_manager->set_resource_location(*tex, *this, name);
+			else
+				tex->image(image);
 		}
 
-		if(resource_manager)
-			resource_manager->set_resource_location(*tex, *this, name);
-		else
-			tex->image(image);
 		return tex.release();
 	}
 
@@ -170,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;
@@ -185,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;