X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.h;h=f904021ad726fcf544f469c0787311bd056c9aea;hb=90c89817585b41fdd1ab24153fec41d28d56cab0;hp=1867cc3e2a7d1a909ec3f59368216f6d69e17d23;hpb=488ffa4e7136cb163004befa67f20f553bc82f2e;p=libs%2Fgl.git

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index 1867cc3e..f904021a 100644
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -14,29 +14,34 @@ namespace SL {
 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 &);
 
 private:
 	virtual void visit(Block &);
 	virtual void visit(FunctionDeclaration &);
 	virtual void visit(VariableDeclaration &);
-	using TraversingVisitor::visit;
+};
+
+class BlockResolver: private TraversingVisitor
+{
+public:
+	void apply(Stage &s) { s.content.visit(*this); }
+
+private:
+	virtual void enter(Block &);
+	virtual void visit(InterfaceBlock &);
 };
 
 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;
@@ -48,7 +53,9 @@ public:
 	void apply(Stage &);
 
 private:
-	virtual void visit(Block &);
+	Block *next_block(Block &);
+
+	virtual void enter(Block &);
 	virtual void visit(VariableReference &);
 	virtual void visit(MemberAccess &);
 	virtual void visit(BinaryExpression &);
@@ -56,9 +63,6 @@ private:
 	virtual void visit(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);
 	virtual void visit(InterfaceBlock &);
-	virtual void visit(FunctionDeclaration &);
-	virtual void visit(Iteration &);
-	using TraversingVisitor::visit;
 };
 
 class FunctionResolver: private TraversingVisitor
@@ -67,12 +71,11 @@ private:
 	std::map<std::string, std::vector<FunctionDeclaration *> > functions;
 
 public:
-	void apply(Stage &s) { visit(s.content); }
+	void apply(Stage &s) { s.content.visit(*this); }
 
 private:
 	virtual void visit(FunctionCall &);
 	virtual void visit(FunctionDeclaration &);
-	using TraversingVisitor::visit;
 };
 
 class InterfaceGenerator: private TraversingVisitor
@@ -81,8 +84,6 @@ private:
 	Stage *stage;
 	std::string in_prefix;
 	std::string out_prefix;
-	unsigned scope_level;
-	Block *current_block;
 	NodeList<Statement>::iterator iface_insert_point;
 	NodeList<Statement>::iterator assignment_insert_point;
 	std::set<Node *> nodes_to_remove;
@@ -100,8 +101,8 @@ private:
 	ExpressionStatement &insert_assignment(const std::string &, Expression *);
 	virtual void visit(VariableReference &);
 	virtual void visit(VariableDeclaration &);
+	virtual void visit(FunctionDeclaration &);
 	virtual void visit(Passthrough &);
-	using TraversingVisitor::visit;
 };
 
 class DeclarationReorderer: private TraversingVisitor
@@ -116,7 +117,6 @@ private:
 		FUNCTION
 	};
 
-	unsigned scope_level;
 	DeclarationKind kind;
 	std::set<Node *> ordered_funcs;
 	std::set<Node *> needed_funcs;
@@ -124,7 +124,7 @@ private:
 public:
 	DeclarationReorderer();
 
-	void apply(Stage &s) { visit(s.content); }
+	void apply(Stage &s) { s.content.visit(*this); }
 
 private:
 	virtual void visit(Block &);
@@ -134,7 +134,6 @@ private:
 	virtual void visit(VariableDeclaration &);
 	virtual void visit(InterfaceBlock &) { kind = VARIABLE; }
 	virtual void visit(FunctionDeclaration &);
-	using TraversingVisitor::visit;
 };
 
 } // namespace SL