X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources.cpp;h=6f5b0712c1e4a2a403e39b9823ed6577afadc0d8;hb=4fe225bf15048fcb7a678370f87d09f2de37031a;hp=48e986cea064b2742eadf3d2625f418ccf1cef24;hpb=859015dce969a0d9ba2bc603d6dbb2685159e393;p=libs%2Fgl.git diff --git a/source/resources.cpp b/source/resources.cpp index 48e986ce..6f5b0712 100644 --- a/source/resources.cpp +++ b/source/resources.cpp @@ -1,3 +1,4 @@ +#include #include #include #include "animation.h" @@ -23,7 +24,7 @@ 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), @@ -49,14 +50,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; }