X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources.cpp;h=db01b30badee3eca568eb5e11d5062b03c79670e;hb=ad3238a5acffa0f200a550c5668c18d931d1c569;hp=48e986cea064b2742eadf3d2625f418ccf1cef24;hpb=859015dce969a0d9ba2bc603d6dbb2685159e393;p=libs%2Fgl.git

diff --git a/source/resources.cpp b/source/resources.cpp
index 48e986ce..db01b30b 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,10 +23,10 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-extern const char singlepass_glsl_data[];
+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,14 +49,14 @@ 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;
 
 	if(!init_done)
 	{
-		builtins.add_object("singlepass.glsl", singlepass_glsl_data);
+		init_shaderlib(builtins);
 		init_done = true;
 	}