Disable core version of primitive restart on Radeon as well

[libs/gl.git] / source / resources.cpp

diff --git a/source/resources.cpp b/source/resources.cpp
index 48e986cea064b2742eadf3d2625f418ccf1cef24..db01b30badee3eca568eb5e11d5062b03c79670e 100644 (file)
--- 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;
        }