X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.h;h=f1f10b897c281e9ec4a39ff032a167963b936b8a;hb=b006be7a2eccaeff9647b5b403d7d0a4ff13da3b;hp=90cf272219b9f2ba6bde8b5c4e6c349f5676218a;hpb=1fa69bb8eec3070f5da296d6dd0bd67aea62d3bf;p=libs%2Fgl.git

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index 90cf2722..f1f10b89 100644
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -11,30 +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 &s) { visit(s.content); }
+	void apply(Stage &);
 
-	using BlockModifier::visit;
+private:
 	virtual void visit(Block &);
 	virtual void visit(FunctionDeclaration &);
 	virtual void visit(VariableDeclaration &);
 };
 
-class VariableResolver: public TraversingVisitor
+class BlockResolver: private TraversingVisitor
+{
+public:
+	void apply(Stage &s) { s.content.visit(*this); }
+
+private:
+	virtual void enter(Block &);
+};
+
+class VariableResolver: private TraversingVisitor
 {
 private:
-	std::vector<Block *> blocks;
-	StructDeclaration *type;
-	bool anonymous;
+	Stage *stage;
+	Block *builtins;
+	std::map<std::string, VariableDeclaration *> *members;
+	RefPtr<InterfaceBlockReference> iface_ref;
 	std::string block_interface;
 	bool record_target;
 	VariableDeclaration *assignment_target;
@@ -45,9 +53,12 @@ public:
 
 	void apply(Stage &);
 
-	using TraversingVisitor::visit;
-	virtual void visit(Block &);
+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 &);
@@ -56,45 +67,53 @@ public:
 	virtual void visit(InterfaceBlock &);
 };
 
-class FunctionResolver: public TraversingVisitor
+class FunctionResolver: private TraversingVisitor
 {
 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); }
 
-	using TraversingVisitor::visit;
+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;
+	bool copy_block;
+	Block *iface_target_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);
-	using BlockModifier::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 &);
+	bool generate_interface(InterfaceBlock &);
 	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 TraversingVisitor
+class DeclarationReorderer: private TraversingVisitor
 {
 private:
 	enum DeclarationKind
@@ -106,7 +125,6 @@ private:
 		FUNCTION
 	};
 
-	unsigned scope_level;
 	DeclarationKind kind;
 	std::set<Node *> ordered_funcs;
 	std::set<Node *> needed_funcs;
@@ -114,9 +132,9 @@ private:
 public:
 	DeclarationReorderer();
 
-	void apply(Stage &s) { visit(s.content); }
+	void apply(Stage &s) { s.content.visit(*this); }
 
-	using TraversingVisitor::visit;
+private:
 	virtual void visit(Block &);
 	virtual void visit(FunctionCall &);
 	virtual void visit(InterfaceLayout &) { kind = LAYOUT; }