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

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index f904021a..f1f10b89 100644
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -34,14 +34,15 @@ public:
 
 private:
 	virtual void enter(Block &);
-	virtual void visit(InterfaceBlock &);
 };
 
 class VariableResolver: private TraversingVisitor
 {
 private:
+	Stage *stage;
 	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,6 +58,7 @@ private:
 
 	virtual void enter(Block &);
 	virtual void visit(VariableReference &);
+	virtual void visit(InterfaceBlockReference &);
 	virtual void visit(MemberAccess &);
 	virtual void visit(BinaryExpression &);
 	virtual void visit(Assignment &);
@@ -84,6 +86,10 @@ private:
 	Stage *stage;
 	std::string in_prefix;
 	std::string out_prefix;
+	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;
@@ -98,9 +104,11 @@ private:
 	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 &);
 };