X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.h;h=4968297635c074e975af19e42934c57fe1da78a7;hb=bd8816692056230c36504dcccd76c6946dff47b1;hp=a09c552f1fd9f05c5329edabae112ece237017b0;hpb=7a16308e72aef363727b21348779673edf8e5c07;p=libs%2Fgl.git

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index a09c552f..49682976 100644
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -11,28 +11,38 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-class DeclarationCombiner: public 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 &);
 
-	using StageVisitor::visit;
+private:
 	virtual void visit(Block &);
 	virtual void visit(FunctionDeclaration &);
 	virtual void visit(VariableDeclaration &);
 };
 
-class VariableResolver: public StageVisitor
+class BlockResolver: private TraversingVisitor
 {
+public:
+	void apply(Stage &s) { s.content.visit(*this); }
+
 private:
-	std::vector<Block *> blocks;
-	StructDeclaration *type;
-	bool anonymous;
+	virtual void enter(Block &);
+	virtual void visit(InterfaceBlock &);
+};
+
+class VariableResolver: private TraversingVisitor
+{
+private:
+	Block *builtins;
+	std::map<std::string, VariableDeclaration *> *members;
+	RefPtr<InterfaceBlockReference> iface_ref;
 	std::string block_interface;
 	bool record_target;
 	VariableDeclaration *assignment_target;
@@ -41,10 +51,14 @@ private:
 public:
 	VariableResolver();
 
-	virtual void apply(Stage &);
-	using StageVisitor::visit;
-	virtual void visit(Block &);
+	void apply(Stage &);
+
+private:
+	Block *next_block(Block &);
+
+	virtual void enter(Block &);
 	virtual void visit(VariableReference &);
+	virtual void visit(InterfaceBlockReference &);
 	virtual void visit(MemberAccess &);
 	virtual void visit(BinaryExpression &);
 	virtual void visit(Assignment &);
@@ -53,41 +67,50 @@ public:
 	virtual void visit(InterfaceBlock &);
 };
 
-class FunctionResolver: public StageVisitor
+class FunctionResolver: private TraversingVisitor
 {
 private:
 	std::map<std::string, std::vector<FunctionDeclaration *> > functions;
 
 public:
-	using StageVisitor::visit;
+	void apply(Stage &s) { s.content.visit(*this); }
+
+private:
 	virtual void visit(FunctionCall &);
 	virtual void visit(FunctionDeclaration &);
 };
 
-class InterfaceGenerator: public 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;
+	bool function_scope;
+	InterfaceBlock *iface_block;
+	NodeList<Statement>::iterator iface_insert_point;
+	NodeList<Statement>::iterator assignment_insert_point;
+	std::set<Node *> nodes_to_remove;
 
 public:
 	InterfaceGenerator();
 
+	void apply(Stage &);
+
+private:
 	static std::string get_out_prefix(Stage::Type);
-	virtual void apply(Stage &);
-	using StageVisitor::visit;
-	virtual void visit(Block &);
 	std::string change_prefix(const std::string &, const std::string &) const;
+	virtual void visit(Block &);
 	bool generate_interface(VariableDeclaration &, const std::string &, const std::string &);
 	ExpressionStatement &insert_assignment(const std::string &, Expression *);
 	virtual void visit(VariableReference &);
 	virtual void visit(VariableDeclaration &);
+	virtual void visit(InterfaceBlock &);
+	virtual void visit(FunctionDeclaration &);
 	virtual void visit(Passthrough &);
 };
 
-class DeclarationReorderer: public StageVisitor
+class DeclarationReorderer: private TraversingVisitor
 {
 private:
 	enum DeclarationKind
@@ -99,7 +122,6 @@ private:
 		FUNCTION
 	};
 
-	unsigned scope_level;
 	DeclarationKind kind;
 	std::set<Node *> ordered_funcs;
 	std::set<Node *> needed_funcs;
@@ -107,7 +129,9 @@ private:
 public:
 	DeclarationReorderer();
 
-	using StageVisitor::visit;
+	void apply(Stage &s) { s.content.visit(*this); }
+
+private:
 	virtual void visit(Block &);
 	virtual void visit(FunctionCall &);
 	virtual void visit(InterfaceLayout &) { kind = LAYOUT; }