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

diff --git a/source/resources.cpp b/source/resources.cpp
index 8f3b4b8b..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"
@@ -26,7 +26,7 @@ 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)
 {
@@ -49,7 +49,7 @@ Resources::Resources():
 	add_source(get_builtins());
 }
 
-DataFile::BuiltinSource &Resources::get_builtins()
+const DataFile::CollectionSource &Resources::get_builtins()
 {
 	static DataFile::BuiltinSource builtins;
 	bool init_done = false;
@@ -85,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();
 	}
@@ -105,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))
 		{