X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources.cpp;h=2637b12b94f6e182976cf5081dc1442998cc88cc;hb=6dc2da27f0831d4172fcfeba4900616fd6c844b8;hp=bba69315de900890e5c365a1c7a325e356394e63;hpb=fa196218c247aba70dd7fb17178fa7474121acec;p=libs%2Fgl.git

diff --git a/source/resources.cpp b/source/resources.cpp
index bba69315..2637b12b 100644
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -1,5 +1,5 @@
+#include <msp/datafile/builtinsource.h>
 #include <msp/fs/utils.h>
-#include <msp/gl/extensions/sgis_generate_mipmap.h>
 #include "animation.h"
 #include "armature.h"
 #include "font.h"
@@ -23,8 +23,10 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+void init_shaderlib(DataFile::BuiltinSource &);
+
 Resources::Resources():
-	default_tex_filter(SGIS_generate_mipmap ? LINEAR_MIPMAP_LINEAR : LINEAR),
+	default_tex_filter(Texture::can_generate_mipmap() ? LINEAR_MIPMAP_LINEAR : LINEAR),
 	srgb_conversion(false),
 	resource_manager(0)
 {
@@ -43,6 +45,22 @@ Resources::Resources():
 	add_type<Texture3D>().base<Texture>().suffix(".tex3d").keyword("texture3d");
 	add_type<TextureCube>().base<Texture>().suffix(".texcb").keyword("texture_cube");
 	add_type<Texture2DArray>().base<Texture>().suffix(".tex2da").keyword("texture2d_array");
+
+	add_source(get_builtins());
+}
+
+const DataFile::CollectionSource &Resources::get_builtins()
+{
+	static DataFile::BuiltinSource builtins;
+	bool init_done = false;
+
+	if(!init_done)
+	{
+		init_shaderlib(builtins);
+		init_done = true;
+	}
+
+	return builtins;
 }
 
 void Resources::set_default_texture_filter(TextureFilter tf)
@@ -67,7 +85,7 @@ Mesh *Resources::create_mesh(const string &name)
 
 	if(RefPtr<IO::Seekable> io = open_from_sources(name))
 	{
-		RefPtr<GL::Mesh> mesh = new GL::Mesh(resource_manager);
+		RefPtr<Mesh> mesh = new Mesh(resource_manager);
 		resource_manager->set_resource_location(*mesh, *this, name);
 		return mesh.release();
 	}
@@ -87,7 +105,7 @@ Texture2D *Resources::create_texture2d(const string &name)
 		if(!resource_manager)
 			image.load_io(*io);
 
-		RefPtr<GL::Texture2D> tex = new GL::Texture2D(resource_manager);
+		RefPtr<Texture2D> tex = new Texture2D(resource_manager);
 
 		if(is_mipmapped(default_tex_filter))
 		{
@@ -117,7 +135,7 @@ Program *Resources::create_program(const string &name)
 	if(RefPtr<IO::Seekable> io = open_from_sources(name))
 	{
 		ProgramCompiler compiler;
-		compiler.compile(*io);
+		compiler.compile(*io, this);
 		RefPtr<Program> program = new Program;
 		compiler.add_shaders(*program);
 		program->link();