X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foutput.cpp;h=f97b8cdb2e2958aeb7bee1d979bb9b0ecbbffeae;hb=ede0bc3f5c7124ef100576ad4b0890c9cd13c79d;hp=6e88fd1f870e6ba554a0fbfa0ddaba93d6347720;hpb=1fa69bb8eec3070f5da296d6dd0bd67aea62d3bf;p=libs%2Fgl.git

diff --git a/source/glsl/output.cpp b/source/glsl/output.cpp
index 6e88fd1f..f97b8cdb 100644
--- a/source/glsl/output.cpp
+++ b/source/glsl/output.cpp
@@ -18,7 +18,7 @@ Formatter::Formatter():
 
 const string &Formatter::apply(Stage &s)
 {
-	SetForScope<Stage *> set_stage(stage, &s);
+	stage = &s;
 
 	GLApi api = get_gl_api();
 	const Version &ver = s.required_version;
@@ -65,7 +65,7 @@ void Formatter::set_source(unsigned index, unsigned line)
 		else
 		{
 			unsigned l = line;
-			if(stage->required_version<Version(3, 30))
+			if(stage && stage->required_version<Version(3, 30))
 				--l;
 			formatted += format("#line %d %d\n", l, index);
 		}
@@ -214,7 +214,7 @@ void Formatter::visit(VariableDeclaration &var)
 	if(!var.interface.empty() && var.interface!=block_interface)
 	{
 		string interface = var.interface;
-		if(stage->required_version<Version(1, 30))
+		if(stage && stage->required_version<Version(1, 30))
 		{
 			if(stage->type==Stage::VERTEX && var.interface=="in")
 				interface = "attribute";