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

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index 0c2a0ad8..511a4607 100644
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -11,31 +11,39 @@ 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 BlockResolver: private TraversingVisitor
+{
+public:
+	void apply(Stage &s) { visit(s.content); }
+
+private:
+	virtual void visit(Block &);
+	virtual void visit(InterfaceBlock &);
+	using TraversingVisitor::visit;
 };
 
 class VariableResolver: private TraversingVisitor
 {
 private:
-	std::vector<Block *> blocks;
+	Block *builtins;
 	StructDeclaration *type;
-	bool anonymous;
 	std::string block_interface;
 	bool record_target;
 	VariableDeclaration *assignment_target;
@@ -47,6 +55,8 @@ public:
 	void apply(Stage &);
 
 private:
+	Block *next_block(Block &);
+
 	virtual void visit(Block &);
 	virtual void visit(VariableReference &);
 	virtual void visit(MemberAccess &);
@@ -55,6 +65,8 @@ private:
 	virtual void visit(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);
 	virtual void visit(InterfaceBlock &);
+	virtual void visit(FunctionDeclaration &);
+	virtual void visit(Iteration &);
 	using TraversingVisitor::visit;
 };
 
@@ -72,14 +84,15 @@ 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;
+	NodeList<Statement>::iterator iface_insert_point;
+	NodeList<Statement>::iterator assignment_insert_point;
+	std::set<Node *> nodes_to_remove;
 
 public:
 	InterfaceGenerator();
@@ -95,7 +108,7 @@ private:
 	virtual void visit(VariableReference &);
 	virtual void visit(VariableDeclaration &);
 	virtual void visit(Passthrough &);
-	using BlockModifier::visit;
+	using TraversingVisitor::visit;
 };
 
 class DeclarationReorderer: private TraversingVisitor
@@ -110,7 +123,6 @@ private:
 		FUNCTION
 	};
 
-	unsigned scope_level;
 	DeclarationKind kind;
 	std::set<Node *> ordered_funcs;
 	std::set<Node *> needed_funcs;