X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Foptimize.h;h=34c0b2455bd4e4ac60126b72e53586a016d16425;hp=67d064c5328574bafe6f5bffdba2b1be081d9a94;hb=7335009e18ecbf53ad9f59d64eed2ed5abbe7b8b;hpb=f526938b407e061c7424adedc34af4d1ff687f90

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 67d064c5..34c0b245 100644
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -83,21 +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(Assignment &a) { visit(static_cast<BinaryExpression &>(a)); }
-	virtual void visit(MemberAccess &);
-	virtual void visit(Swizzle &);
 	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
@@ -120,7 +110,7 @@ private:
 		ExpressionInfo();
 	};
 
-	std::map<VariableDeclaration *, ExpressionInfo> expressions;
+	std::map<Assignment::Target, ExpressionInfo> expressions;
 	ExpressionInfo *r_ref_info;
 	bool r_any_inlined;
 	bool r_trivial;
@@ -138,6 +128,7 @@ private:
 	void visit_and_record(RefPtr<Expression> &, const Operator *, bool);
 	void inline_expression(Expression &, RefPtr<Expression> &, const Operator *, const Operator *, bool);
 	virtual void visit(Block &);
+	virtual void visit(RefPtr<Expression> &);
 	virtual void visit(VariableReference &);
 	virtual void visit(MemberAccess &);
 	virtual void visit(Swizzle &);
@@ -146,9 +137,7 @@ private:
 	virtual void visit(Assignment &);
 	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
@@ -195,26 +184,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();
@@ -222,22 +221,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(Swizzle &);
 	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 &);
 };