X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fresources%2Fresources.cpp;h=dc034746652c0559a60972b8613e4d93956bb054;hp=11099ae077d935b8daf66318d37cf64e5eb768f4;hb=9a63244c1342337915c4610401a24c09fa72cc3d;hpb=c1b0303f65ee966a973197cbdbf177c571478674

diff --git a/source/resources/resources.cpp b/source/resources/resources.cpp
index 11099ae0..dc034746 100644
--- a/source/resources/resources.cpp
+++ b/source/resources/resources.cpp
@@ -28,6 +28,7 @@ namespace Msp {
 namespace GL {
 
 void init_shaderlib(DataFile::BuiltinSource &);
+void init_builtin_data(DataFile::BuiltinSource &);
 
 Resources::Resources():
 	default_tex_filter(Texture::can_generate_mipmap() ? LINEAR_MIPMAP_LINEAR : LINEAR),
@@ -65,6 +66,7 @@ const DataFile::CollectionSource &Resources::get_builtins()
 
 	if(!init_done)
 	{
+		init_builtin_data(builtins);
 		init_shaderlib(builtins);
 		init_done = true;
 	}
@@ -173,7 +175,8 @@ Program *Resources::create_program(const string &name)
 	if(RefPtr<IO::Seekable> io = open_raw(name))
 	{
 		SL::Compiler compiler;
-		compiler.compile(*io, this, name);
+		compiler.load_source(*io, this, name);
+		compiler.compile();
 		RefPtr<Program> program = new Program;
 		compiler.add_shaders(*program);
 		program->link();