X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.cpp;h=b4b63e27637c32231341a2631383c0b972be8019;hb=a4cd67f1c9f1f375bacacfbb421d40f78a22644b;hp=c5f0a9a3d05b6fd640f9afe5a5cba5a05e0ec5ab;hpb=a1ba04add302e7712d127b46d8d11386987a0aea;p=libs%2Fgl.git

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index c5f0a9a3..b4b63e27 100644
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -108,7 +108,7 @@ string Compiler::get_combined_glsl() const
 	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
 	{
 		glsl += format("#pragma MSP stage(%s)\n", Stage::get_stage_name(i->type));
-		glsl += Formatter().apply(*i, MODULE);
+		glsl += Formatter().apply(*i);
 		glsl += '\n';
 	}
 
@@ -128,7 +128,7 @@ string Compiler::get_stage_glsl(Stage::Type stage_type) const
 {
 	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
 		if(i->type==stage_type)
-			return Formatter().apply(*i, PROGRAM);
+			return Formatter().apply(*i);
 	throw key_error(Stage::get_stage_name(stage_type));
 }
 
@@ -214,7 +214,6 @@ void Compiler::append_stage(Stage &stage)
 		target->required_features.glsl_version = stage.required_features.glsl_version;
 	for(NodeList<Statement>::iterator i=stage.content.body.begin(); i!=stage.content.body.end(); ++i)
 		target->content.body.push_back(*i);
-	DeclarationCombiner().apply(*target);
 }
 
 void Compiler::import(DataFile::Collection *resources, const string &name)