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

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index 9365c6c3..c0d1ef8d 100644
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -48,8 +48,13 @@ private:
 /** Forms links between nested blocks in the syntax tree. */
 class BlockHierarchyResolver: private TraversingVisitor
 {
+private:
+	bool r_any_resolved;
+
 public:
-	void apply(Stage &s) { s.content.visit(*this); }
+	BlockHierarchyResolver(): r_any_resolved(false) { }
+
+	bool apply(Stage &s) { r_any_resolved = false; s.content.visit(*this); return r_any_resolved; }
 
 private:
 	virtual void enter(Block &);
@@ -63,19 +68,23 @@ 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:
 	TypeResolver();
 
-	void apply(Stage &);
+	bool apply(Stage &);
 
 private:
-	TypeDeclaration *resolve_type(const std::string &);
+	TypeDeclaration *get_or_create_array_type(TypeDeclaration &);
+	void resolve_type(TypeDeclaration *&, const std::string &, bool);
 	virtual void visit(Block &);
 	virtual void visit(BasicTypeDeclaration &);
 	virtual void visit(ImageTypeDeclaration &);
 	virtual void visit(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);
+	virtual void visit(InterfaceBlock &);
 	virtual void visit(FunctionDeclaration &);
 };
 
@@ -86,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;
@@ -103,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 &);
@@ -149,7 +158,9 @@ 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 &);
 	virtual void visit(Assignment &);
 	virtual void visit(FunctionCall &);
@@ -163,9 +174,10 @@ class FunctionResolver: private TraversingVisitor
 private:
 	Stage *stage;
 	std::map<std::string, std::vector<FunctionDeclaration *> > declarations;
+	bool r_any_resolved;
 
 public:
-	void apply(Stage &);
+	bool apply(Stage &);
 
 private:
 	virtual void visit(FunctionCall &);
@@ -187,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;