X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.h;h=58bc4ca202e6bdbf60f5d625c1f5b5ba2004ef14;hb=3f44e477f81983c66947fe8a6d8640a3b2f9e0b3;hp=54e39f39aa0679088ea7d18dd98192c32645f07c;hpb=f639d088c478fe5d266f9f5779928735b5176976;p=libs%2Fgl.git

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index 54e39f39..58bc4ca2 100644
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -11,23 +11,6 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-/** Combines multiple declarations of the same identifier into one. */
-class DeclarationCombiner: private TraversingVisitor
-{
-private:
-	std::map<std::string, std::vector<FunctionDeclaration *> > functions;
-	std::map<std::string, VariableDeclaration *> variables;
-	std::set<Node *> nodes_to_remove;
-
-public:
-	void apply(Stage &);
-
-private:
-	virtual void visit(Block &);
-	virtual void visit(VariableDeclaration &);
-	virtual void visit(FunctionDeclaration &) { }
-};
-
 /** Manipulates specialization constants.  If values are specified, turns
 specialization constants into normal constants.  Without values assigns
 automatic constant_ids to specialization constants. */
@@ -48,8 +31,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 +51,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,11 +78,12 @@ 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;
-	VariableDeclaration *r_assignment_target;
+	Assignment::Target r_assignment_target;
+	std::vector<VariableDeclaration *> redeclared_builtins;
+	std::set<Node *> nodes_to_remove;
 
 public:
 	VariableResolver();
@@ -99,14 +92,16 @@ public:
 
 private:
 	virtual void enter(Block &);
-	void visit_and_replace(RefPtr<Expression> &);
+	virtual void visit(RefPtr<Expression> &);
+	void check_assignment_target(Statement *);
 	virtual void visit(VariableReference &);
 	virtual void visit(InterfaceBlockReference &);
+	void add_to_chain(Assignment::Target::ChainType, unsigned);
 	virtual void visit(MemberAccess &);
-	virtual void visit(UnaryExpression &);
+	virtual void visit(Swizzle &);
 	virtual void visit(BinaryExpression &);
 	virtual void visit(Assignment &);
-	virtual void visit(FunctionCall &);
+	void merge_layouts(Layout &, const Layout &);
 	virtual void visit(VariableDeclaration &);
 	virtual void visit(InterfaceBlock &);
 };
@@ -123,8 +118,15 @@ private:
 		SAME_TYPE
 	};
 
+	struct ArgumentInfo
+	{
+		BasicTypeDeclaration *type;
+		unsigned component_count;
+	};
+
 	Stage *stage;
 	std::vector<BasicTypeDeclaration *> basic_types;
+	NodeList<Statement>::iterator insert_point;
 	bool r_any_resolved;
 
 public:
@@ -142,17 +144,21 @@ private:
 	BasicTypeDeclaration *find_type(BasicTypeDeclaration &, BasicTypeDeclaration::Kind, unsigned);
 	void convert_to(RefPtr<Expression> &, BasicTypeDeclaration &);
 	bool convert_to_element(RefPtr<Expression> &, BasicTypeDeclaration &);
+	bool truncate_vector(RefPtr<Expression> &, unsigned);
 	void resolve(Expression &, TypeDeclaration *, bool);
 
+	virtual void visit(Block &);
 	virtual void visit(Literal &);
-	virtual void visit(ParenthesizedExpression &);
 	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(TernaryExpression &);
+	void visit_constructor(FunctionCall &);
 	virtual void visit(FunctionCall &);
 	virtual void visit(BasicTypeDeclaration &);
 	virtual void visit(VariableDeclaration &);
@@ -164,9 +170,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 &);
@@ -188,8 +195,8 @@ private:
 	std::string in_prefix;
 	std::string out_prefix;
 	bool function_scope;
-	InterfaceBlock *iface_block;
 	bool copy_block;
+	std::vector<VariableDeclaration *> declared_inputs;
 	Block *iface_target_block;
 	NodeList<Statement>::iterator iface_insert_point;
 	NodeList<Statement>::iterator assignment_insert_point;