X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.h;h=ca22c9d8259fdf198c0c63cc5221361ee010c8a6;hb=bde40be11da83206f3d33a8225963d47a413662e;hp=92e19c8c9be08a8a649586929c0755607e558fab;hpb=ff00056daddbce2e6e16f7c09dcfcb5cde66e85c;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 92e19c8c..ca22c9d8 100644
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -83,19 +83,11 @@ public:
 	bool apply(Stage &);
 
 private:
-	void visit_and_inline(RefPtr<Expression> &);
-
+	virtual void visit(RefPtr<Expression> &);
 	virtual void visit(Block &);
-	virtual void visit(UnaryExpression &);
-	virtual void visit(BinaryExpression &);
-	virtual void visit(MemberAccess &);
 	virtual void visit(FunctionCall &);
-	virtual void visit(ExpressionStatement &);
-	virtual void visit(VariableDeclaration &);
 	virtual void visit(FunctionDeclaration &);
-	virtual void visit(Conditional &);
 	virtual void visit(Iteration &);
-	virtual void visit(Return &);
 };
 
 /** Inlines variables into expressions.  Variables with trivial values (those
@@ -109,16 +101,13 @@ private:
 		Expression *expression;
 		Block *assign_scope;
 		RefPtr<Expression> *inline_point;
-		const Operator *inner_oper;
-		const Operator *outer_oper;
-		bool inline_on_rhs;
 		bool trivial;
 		bool available;
 
 		ExpressionInfo();
 	};
 
-	std::map<VariableDeclaration *, ExpressionInfo> expressions;
+	std::map<Assignment::Target, ExpressionInfo> expressions;
 	ExpressionInfo *r_ref_info;
 	bool r_any_inlined;
 	bool r_trivial;
@@ -133,19 +122,20 @@ public:
 	bool apply(Stage &);
 
 private:
-	void visit_and_record(RefPtr<Expression> &, const Operator *, bool);
-	void inline_expression(Expression &, RefPtr<Expression> &, const Operator *, const Operator *, bool);
+	void visit_and_record(RefPtr<Expression> &);
+	void inline_expression(Expression &, RefPtr<Expression> &);
 	virtual void visit(Block &);
+	virtual void visit(RefPtr<Expression> &);
 	virtual void visit(VariableReference &);
 	virtual void visit(MemberAccess &);
+	virtual void visit(Swizzle &);
 	virtual void visit(UnaryExpression &);
 	virtual void visit(BinaryExpression &);
 	virtual void visit(Assignment &);
+	virtual void visit(TernaryExpression &);
 	virtual void visit(FunctionCall &);
 	virtual void visit(VariableDeclaration &);
-	virtual void visit(Conditional &);
 	virtual void visit(Iteration &);
-	virtual void visit(Return &);
 };
 
 /** Removes conditional statements and loops where the condition can be
@@ -175,10 +165,16 @@ public:
 	bool apply(Stage &);
 
 private:
+	virtual void visit(Literal &);
+	virtual void visit(UnaryExpression &);
+	virtual void visit(BinaryExpression &);
+	virtual void visit(TernaryExpression &);
+	virtual void visit(FunctionCall &);
 	virtual void visit(BasicTypeDeclaration &);
 	virtual void visit(ImageTypeDeclaration &);
 	virtual void visit(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);
+	virtual void visit(InterfaceBlock &);
 	virtual void visit(FunctionDeclaration &);
 };
 
@@ -187,26 +183,36 @@ statements where the result is not used are also removed. */
 class UnusedVariableRemover: private TraversingVisitor
 {
 private:
+	struct AssignmentInfo
+	{
+		Node *node;
+		Assignment::Target target;
+		std::vector<Node *> used_by;
+
+		AssignmentInfo(): node(0) { }
+	};
+
 	struct VariableInfo
 	{
-		bool local;
-		std::vector<Node *> assignments;
-		bool conditionally_assigned;
+		InterfaceBlock *interface_block;
+		std::vector<AssignmentInfo *> assignments;
+		bool initialized;
+		bool output;
 		bool referenced;
 
-		VariableInfo();
+		VariableInfo(): interface_block(0), initialized(false), output(false), referenced(false) { }
 	};
 
-	typedef std::map<VariableDeclaration *, VariableInfo> BlockVariableMap;
+	typedef std::map<Statement *, VariableInfo> BlockVariableMap;
 
-	std::set<Node *> unused_nodes;
-	std::map<VariableDeclaration *, Node *> aggregates;
-	Node *aggregate;
-	std::vector<BlockVariableMap> variables;
+	Stage *stage;
+	BlockVariableMap variables;
+	std::list<AssignmentInfo> assignments;
+	InterfaceBlock *interface_block;
 	Assignment *r_assignment;
 	bool assignment_target;
-	bool r_assign_to_subfield;
 	bool r_side_effects;
+	std::set<Node *> unused_nodes;
 
 public:
 	UnusedVariableRemover();
@@ -214,21 +220,21 @@ public:
 	bool apply(Stage &);
 
 private:
+	void referenced(const Assignment::Target &, Node &);
 	virtual void visit(VariableReference &);
 	virtual void visit(InterfaceBlockReference &);
-	virtual void visit(MemberAccess &);
 	virtual void visit(UnaryExpression &);
 	virtual void visit(BinaryExpression &);
 	virtual void visit(Assignment &);
-	void record_assignment(VariableDeclaration &, Node &, bool);
-	void clear_assignments(VariableInfo &, bool);
 	virtual void visit(FunctionCall &);
+	void record_assignment(const Assignment::Target &, Node &);
 	virtual void visit(ExpressionStatement &);
-	virtual void visit(StructDeclaration &);
+	// Ignore structs because their members can't be accessed directly.
+	virtual void visit(StructDeclaration &) { }
 	virtual void visit(VariableDeclaration &);
 	virtual void visit(InterfaceBlock &);
+	void merge_variables(const BlockVariableMap &);
 	virtual void visit(FunctionDeclaration &);
-	void merge_down_variables();
 	virtual void visit(Conditional &);
 	virtual void visit(Iteration &);
 };