X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogram.cpp;h=270dbdc3e5675163017349d0cef901fcffaccdf8;hp=82308b3405e0c42cc2086925c7633bd6b6a08770;hb=e598e9d8dacad73b7ee1688e2be738e94b07b9fa;hpb=e9374cde7e471b0150140b37e5bd7cd5a0d720d9

diff --git a/source/program.cpp b/source/program.cpp
index 82308b34..270dbdc3 100644
--- a/source/program.cpp
+++ b/source/program.cpp
@@ -14,6 +14,8 @@
 #include "error.h"
 #include "misc.h"
 #include "program.h"
+#include "programcompiler.h"
+#include "resources.h"
 #include "shader.h"
 
 using namespace std;
@@ -35,6 +37,24 @@ Program::Program(const ProgramBuilder::StandardFeatures &features)
 	link();
 }
 
+Program::Program(const std::string &source)
+{
+	init();
+
+	ProgramCompiler compiler;
+	if(source.find(';')==string::npos && source.size()>5 && !source.compare(source.size()-5, 5, ".glsl"))
+	{
+		if(RefPtr<IO::Seekable> io = Resources::get_builtins().open(source))
+			compiler.compile(*io, source);
+		else
+			throw IO::file_not_found(source);
+	}
+	else
+		compiler.compile(source);
+	compiler.add_shaders(*this);
+	link();
+}
+
 Program::Program(const string &vert, const string &frag)
 {
 	init();