X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.h;h=ce95754eb4d68f9d28addbbceaa06839988be507;hb=ab5f2e6f1ddd35f8f117460530d76c0ba0c9bc87;hp=0c2a0ad8fce4b03aee235202f9a4eaebe0937d59;hpb=0ca367ce305ae6f2025739b3b199a7f75d4132db;p=libs%2Fgl.git

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index 0c2a0ad8..ce95754e 100644
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -11,23 +11,24 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-class DeclarationCombiner: private BlockModifier
+class DeclarationCombiner: private TraversingVisitor
 {
 private:
 	bool toplevel;
 	std::map<std::string, std::vector<FunctionDeclaration *> > functions;
 	std::map<std::string, VariableDeclaration *> variables;
+	std::set<Node *> nodes_to_remove;
 
 public:
 	DeclarationCombiner();
 
-	void apply(Stage &s) { visit(s.content); }
+	void apply(Stage &);
 
 private:
 	virtual void visit(Block &);
 	virtual void visit(FunctionDeclaration &);
 	virtual void visit(VariableDeclaration &);
-	using BlockModifier::visit;
+	using TraversingVisitor::visit;
 };
 
 class VariableResolver: private TraversingVisitor
@@ -72,14 +73,17 @@ private:
 	using TraversingVisitor::visit;
 };
 
-class InterfaceGenerator: private BlockModifier
+class InterfaceGenerator: private TraversingVisitor
 {
 private:
 	Stage *stage;
 	std::string in_prefix;
 	std::string out_prefix;
 	unsigned scope_level;
-	std::map<std::string, RefPtr<VariableDeclaration> > iface_declarations;
+	Block *current_block;
+	NodeList<Statement>::iterator iface_insert_point;
+	NodeList<Statement>::iterator assignment_insert_point;
+	std::set<Node *> nodes_to_remove;
 
 public:
 	InterfaceGenerator();
@@ -95,7 +99,7 @@ private:
 	virtual void visit(VariableReference &);
 	virtual void visit(VariableDeclaration &);
 	virtual void visit(Passthrough &);
-	using BlockModifier::visit;
+	using TraversingVisitor::visit;
 };
 
 class DeclarationReorderer: private TraversingVisitor