X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.h;h=c0d1ef8d62b7cdea8e4e7d41d402745b62ceb943;hb=f526938b407e061c7424adedc34af4d1ff687f90;hp=a728e99ced3a8bccd24aaa89de94cbbddee09664;hpb=c1d3a1d7c1997bc71a30af2e2c25cb4a2b66784b;p=libs%2Fgl.git

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index a728e99c..c0d1ef8d 100644
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -68,6 +68,7 @@ private:
 	std::map<TypeDeclaration *, TypeDeclaration *> alias_map;
 	std::map<TypeDeclaration *, TypeDeclaration *> array_types;
 	NodeList<Statement>::iterator type_insert_point;
+	InterfaceBlock *iface_block;
 	bool r_any_resolved;
 
 public:
@@ -83,6 +84,7 @@ private:
 	virtual void visit(ImageTypeDeclaration &);
 	virtual void visit(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);
+	virtual void visit(InterfaceBlock &);
 	virtual void visit(FunctionDeclaration &);
 };
 
@@ -93,7 +95,6 @@ class VariableResolver: private TraversingVisitor
 private:
 	Stage *stage;
 	RefPtr<Expression> r_replacement_expr;
-	std::string block_interface;
 	bool r_any_resolved;
 	bool record_target;
 	bool r_self_referencing;
@@ -110,6 +111,7 @@ private:
 	virtual void visit(VariableReference &);
 	virtual void visit(InterfaceBlockReference &);
 	virtual void visit(MemberAccess &);
+	virtual void visit(Swizzle &);
 	virtual void visit(UnaryExpression &);
 	virtual void visit(BinaryExpression &);
 	virtual void visit(Assignment &);
@@ -156,6 +158,7 @@ private:
 	virtual void visit(VariableReference &);
 	virtual void visit(InterfaceBlockReference &);
 	virtual void visit(MemberAccess &);
+	virtual void visit(Swizzle &);
 	virtual void visit(UnaryExpression &);
 	void visit(BinaryExpression &, bool);
 	virtual void visit(BinaryExpression &);
@@ -196,7 +199,6 @@ private:
 	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;