X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompatibility.cpp;h=a9f38a35cda42481935864b5bbd97285bbf63462;hb=ab5f2e6f1ddd35f8f117460530d76c0ba0c9bc87;hp=398a7bd30a76eaa4b141b400d9cd4e08d0e87958;hpb=1fa69bb8eec3070f5da296d6dd0bd67aea62d3bf;p=libs%2Fgl.git

diff --git a/source/glsl/compatibility.cpp b/source/glsl/compatibility.cpp
index 398a7bd3..a9f38a35 100644
--- a/source/glsl/compatibility.cpp
+++ b/source/glsl/compatibility.cpp
@@ -14,25 +14,23 @@ namespace GL {
 namespace SL {
 
 DefaultPrecisionGenerator::DefaultPrecisionGenerator():
-	stage_type(Stage::SHARED),
-	toplevel(true)
+	stage(0)
 { }
 
-void DefaultPrecisionGenerator::apply(Stage &stage)
+void DefaultPrecisionGenerator::apply(Stage &s)
 {
-	SetForScope<Stage::Type> set_stage(stage_type, stage.type);
-	visit(stage.content);
+	stage = &s;
+	visit(s.content);
 }
 
 void DefaultPrecisionGenerator::visit(Block &block)
 {
-	if(toplevel)
+	for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); ++i)
 	{
-		SetForScope<bool> set(toplevel, false);
-		BlockModifier::visit(block);
+		if(&block==&stage->content)
+			insert_point = i;
+		(*i)->visit(*this);
 	}
-	else
-		TraversingVisitor::visit(block);
 }
 
 void DefaultPrecisionGenerator::visit(Precision &prec)
@@ -56,21 +54,27 @@ void DefaultPrecisionGenerator::visit(VariableDeclaration &var)
 		Precision *prec = new Precision;
 		if(!type.compare(0, 7, "sampler"))
 			prec->precision = "lowp";
-		else if(stage_type==Stage::FRAGMENT)
+		else if(stage->type==Stage::FRAGMENT)
 			prec->precision = "mediump";
 		else
 			prec->precision = "highp";
 		prec->type = type;
-		insert_nodes.push_back(prec);
+		stage->content.body.insert(insert_point, prec);
 
 		have_default.insert(type);
 	}
 }
 
 
-void PrecisionRemover::visit(Precision &)
+void PrecisionRemover::apply(Stage &stage)
+{
+	visit(stage.content);
+	NodeRemover().apply(stage, nodes_to_remove);
+}
+
+void PrecisionRemover::visit(Precision &prec)
 {
-	remove_node = true;
+	nodes_to_remove.insert(&prec);
 }
 
 void PrecisionRemover::visit(VariableDeclaration &var)
@@ -85,11 +89,21 @@ LegacyConverter::LegacyConverter():
 	frag_out(0)
 { }
 
-LegacyConverter::LegacyConverter(const Version &v):
-	target_api(get_gl_api()),
-	target_version(v),
-	frag_out(0)
-{ }
+void LegacyConverter::apply(Stage &s)
+{
+	stage = &s;
+	visit(s.content);
+}
+
+void LegacyConverter::visit(Block &block)
+{
+	for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); ++i)
+	{
+		if(&block==&stage->content)
+			uniform_insert_point = i;
+		(*i)->visit(*this);
+	}
+}
 
 bool LegacyConverter::check_version(const Version &feature_version) const
 {
@@ -113,12 +127,6 @@ bool LegacyConverter::check_extension(const Extension &extension) const
 	return true;
 }
 
-void LegacyConverter::apply(Stage &s)
-{
-	SetForScope<Stage *> set_stage(stage, &s);
-	visit(s.content);
-}
-
 bool LegacyConverter::supports_unified_interface_syntax() const
 {
 	if(target_api==OPENGL_ES2)
@@ -285,7 +293,7 @@ void LegacyConverter::visit(VariableDeclaration &var)
 		if(stage->type==Stage::FRAGMENT && var.interface=="out")
 		{
 			frag_out = &var;
-			remove_node = true;
+			nodes_to_remove.insert(&var);
 		}
 	}
 
@@ -312,7 +320,10 @@ bool LegacyConverter::supports_interface_blocks(const string &iface) const
 void LegacyConverter::visit(InterfaceBlock &iface)
 {
 	if(!supports_interface_blocks(iface.interface))
-		flatten_block(iface.members);
+	{
+		stage->content.body.splice(uniform_insert_point, iface.members.body);
+		nodes_to_remove.insert(&iface);
+	}
 }
 
 } // namespace SL