X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.cpp;fp=source%2Fglsl%2Fcompiler.cpp;h=8a18fdf48df64d6224f9fc3f8d0b00d6a749be7e;hp=e9933e2f9b67c4ec414999438a9e8c1c0ec60ba9;hb=8c4d64c71df5c4dcab1838d81412d7a7244ada58;hpb=22d5405729048ee2677a1e45e309e6328de64a26

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index e9933e2f..8a18fdf4 100644
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -24,12 +24,14 @@ namespace SL {
 Compiler::Compiler():
 	features(Features::from_context()),
 	module(0),
+	compiled(false),
 	specialized(false)
 { }
 
 Compiler::Compiler(const Features &f):
 	features(f),
 	module(0),
+	compiled(false),
 	specialized(false)
 { }
 
@@ -96,10 +98,15 @@ void Compiler::compile(Mode mode)
 	}
 	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
 		finalize(*i, mode);
+
+	compiled = true;
 }
 
 string Compiler::get_combined_glsl() const
 {
+	if(!compiled)
+		throw invalid_operation("Compiler::get_combined_glsl");
+
 	string glsl;
 
 	unsigned source_count = module->source_map.get_count();
@@ -126,6 +133,8 @@ vector<Stage::Type> Compiler::get_stages() const
 
 string Compiler::get_stage_glsl(Stage::Type stage_type) const
 {
+	if(!compiled)
+		throw invalid_operation("Compiler::get_stage_glsl");
 	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
 		if(i->type==stage_type)
 			return Formatter().apply(*i);
@@ -134,6 +143,8 @@ string Compiler::get_stage_glsl(Stage::Type stage_type) const
 
 const map<string, unsigned> &Compiler::get_vertex_attributes() const
 {
+	if(!compiled)
+		throw invalid_operation("Compiler::get_vertex_attributes");
 	for(list<Stage>::const_iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
 		if(i->type==Stage::VERTEX)
 			return i->locations;
@@ -142,6 +153,8 @@ const map<string, unsigned> &Compiler::get_vertex_attributes() const
 
 const map<string, unsigned> &Compiler::get_fragment_outputs() const
 {
+	if(!compiled)
+		throw invalid_operation("Compiler::get_fragment_outputs");
 	for(list<Stage>::const_iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
 		if(i->type==Stage::FRAGMENT)
 			return i->locations;