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

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index 511a4607..49682976 100644
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -25,25 +25,24 @@ 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) { visit(s.content); }
+	void apply(Stage &s) { s.content.visit(*this); }
 
 private:
-	virtual void visit(Block &);
+	virtual void enter(Block &);
 	virtual void visit(InterfaceBlock &);
-	using TraversingVisitor::visit;
 };
 
 class VariableResolver: private TraversingVisitor
 {
 private:
 	Block *builtins;
-	StructDeclaration *type;
+	std::map<std::string, VariableDeclaration *> *members;
+	RefPtr<InterfaceBlockReference> iface_ref;
 	std::string block_interface;
 	bool record_target;
 	VariableDeclaration *assignment_target;
@@ -57,17 +56,15 @@ public:
 private:
 	Block *next_block(Block &);
 
-	virtual void visit(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 &);
 	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
@@ -76,12 +73,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
@@ -90,6 +86,8 @@ private:
 	Stage *stage;
 	std::string in_prefix;
 	std::string out_prefix;
+	bool function_scope;
+	InterfaceBlock *iface_block;
 	NodeList<Statement>::iterator iface_insert_point;
 	NodeList<Statement>::iterator assignment_insert_point;
 	std::set<Node *> nodes_to_remove;
@@ -107,8 +105,9 @@ private:
 	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 &);
-	using TraversingVisitor::visit;
 };
 
 class DeclarationReorderer: private TraversingVisitor
@@ -130,7 +129,7 @@ private:
 public:
 	DeclarationReorderer();
 
-	void apply(Stage &s) { visit(s.content); }
+	void apply(Stage &s) { s.content.visit(*this); }
 
 private:
 	virtual void visit(Block &);
@@ -140,7 +139,6 @@ private:
 	virtual void visit(VariableDeclaration &);
 	virtual void visit(InterfaceBlock &) { kind = VARIABLE; }
 	virtual void visit(FunctionDeclaration &);
-	using TraversingVisitor::visit;
 };
 
 } // namespace SL