X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompatibility.h;h=a391aab0f20f7dbcb8bd0a4477434570437e7697;hb=ad21753804fd949a6c80e44c6f3de8ea8988af0f;hp=732f3477db5f9b401550ff999bde3d6f50af0718;hpb=1fa69bb8eec3070f5da296d6dd0bd67aea62d3bf;p=libs%2Fgl.git

diff --git a/source/glsl/compatibility.h b/source/glsl/compatibility.h
index 732f3477..a391aab0 100644
--- a/source/glsl/compatibility.h
+++ b/source/glsl/compatibility.h
@@ -8,35 +8,40 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-class DefaultPrecisionGenerator: public BlockModifier
+class DefaultPrecisionGenerator: private TraversingVisitor
 {
 private:
-	Stage::Type stage_type;
-	bool toplevel;
+	Stage *stage;
 	std::set<std::string> have_default;
+	NodeList<Statement>::iterator insert_point;
 
 public:
 	DefaultPrecisionGenerator();
 
 	void apply(Stage &);
 
-	using BlockModifier::visit;
+private:
 	virtual void visit(Block &);
 	virtual void visit(Precision &);
 	virtual void visit(VariableDeclaration &);
+	using TraversingVisitor::visit;
 };
 
-class PrecisionRemover: public BlockModifier
+class PrecisionRemover: private TraversingVisitor
 {
+private:
+	std::set<Node *> nodes_to_remove;
+
 public:
-	void apply(Stage &s) { visit(s.content); }
+	void apply(Stage &);
 
-	using BlockModifier::visit;
+private:
 	virtual void visit(Precision &);
 	virtual void visit(VariableDeclaration &);
+	using TraversingVisitor::visit;
 };
 
-class LegacyConverter: public BlockModifier
+class LegacyConverter: private TraversingVisitor
 {
 private:
 	Stage *stage;
@@ -44,18 +49,18 @@ private:
 	Version target_version;
 	std::string type;
 	VariableDeclaration *frag_out;
+	NodeList<Statement>::iterator uniform_insert_point;
+	std::set<Node *> nodes_to_remove;
 
 public:
 	LegacyConverter();
-	LegacyConverter(const Version &);
+
+	virtual void apply(Stage &);
 
 private:
+	virtual void visit(Block &);
 	bool check_version(const Version &) const;
 	bool check_extension(const Extension &) const;
-public:
-	using BlockModifier::visit;
-	virtual void apply(Stage &);
-private:
 	bool supports_unified_interface_syntax() const;
 	virtual void visit(VariableReference &);
 	virtual void visit(Assignment &);
@@ -67,6 +72,7 @@ private:
 	virtual void visit(VariableDeclaration &);
 	bool supports_interface_blocks(const std::string &) const;
 	virtual void visit(InterfaceBlock &);
+	using TraversingVisitor::visit;
 };
 
 } // namespace SL