X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.h;h=4663c12ec12e6ffcaf4fe946fff5bbc36cc5ed90;hb=daff631cf87db75bcae616605e759d281258d9e4;hp=373e0199dd316cad4e3390f3e66cd1473aa7f8db;hpb=8173340a7737e32cb25b21b67049102bd1526beb;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 373e0199..4663c12e 100644
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -88,7 +88,9 @@ private:
 	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 &);
@@ -98,30 +100,96 @@ private:
 	virtual void visit(Return &);
 };
 
+/** Inlines variables into expressions.  Variables with trivial values (those
+consisting of a single literal or variable reference) are always inlined.
+Variables which are only referenced once are also inlined. */
+class ExpressionInliner: private TraversingVisitor
+{
+private:
+	struct ExpressionInfo
+	{
+		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<Assignment::Target, ExpressionInfo> expressions;
+	ExpressionInfo *r_ref_info;
+	bool r_any_inlined;
+	bool r_trivial;
+	bool mutating;
+	bool iteration_init;
+	Block *iteration_body;
+	const Operator *r_oper;
+
+public:
+	ExpressionInliner();
+
+	bool apply(Stage &);
+
+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(VariableReference &);
+	virtual void visit(MemberAccess &);
+	virtual void visit(Swizzle &);
+	virtual void visit(UnaryExpression &);
+	virtual void visit(BinaryExpression &);
+	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
 determined as constant at compile time. */
 class ConstantConditionEliminator: private TraversingVisitor
 {
 private:
-	bool record_only;
-	ExpressionEvaluator::ValueMap variable_values;
 	NodeList<Statement>::iterator insert_point;
 	std::set<Node *> nodes_to_remove;
 
 public:
-	ConstantConditionEliminator();
-
 	void apply(Stage &);
 
 private:
 	virtual void visit(Block &);
-	virtual void visit(UnaryExpression &);
-	virtual void visit(Assignment &);
-	virtual void visit(VariableDeclaration &);
 	virtual void visit(Conditional &);
 	virtual void visit(Iteration &);
 };
 
+/** Removes types which are not used anywhere. */
+class UnusedTypeRemover: private TraversingVisitor
+{
+private:
+	std::set<Node *> unused_nodes;
+
+public:
+	bool apply(Stage &);
+
+private:
+	virtual void visit(Literal &);
+	virtual void visit(UnaryExpression &);
+	virtual void visit(BinaryExpression &);
+	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 &);
+};
+
 /** Removes variable declarations with no references to them.  Assignment
 statements where the result is not used are also removed. */
 class UnusedVariableRemover: private TraversingVisitor
@@ -129,23 +197,24 @@ class UnusedVariableRemover: private TraversingVisitor
 private:
 	struct VariableInfo
 	{
-		bool local;
 		std::vector<Node *> assignments;
+		bool local;
+		bool output;
 		bool conditionally_assigned;
 		bool referenced;
+		InterfaceBlock *interface_block;
 
 		VariableInfo();
 	};
 
-	typedef std::map<VariableDeclaration *, VariableInfo> BlockVariableMap;
+	typedef std::map<Assignment::Target, VariableInfo> BlockVariableMap;
 
+	Stage *stage;
 	std::set<Node *> unused_nodes;
-	std::map<VariableDeclaration *, Node *> aggregates;
-	Node *aggregate;
 	std::vector<BlockVariableMap> variables;
+	InterfaceBlock *interface_block;
 	Assignment *r_assignment;
 	bool assignment_target;
-	bool r_assign_to_subscript;
 	bool r_side_effects;
 
 public:
@@ -154,17 +223,18 @@ public:
 	bool apply(Stage &);
 
 private:
+	void reference_used(Statement &);
 	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 record_assignment(const Assignment::Target &, Node &, bool);
 	void clear_assignments(VariableInfo &, bool);
 	virtual void visit(FunctionCall &);
 	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 &);
 	virtual void visit(FunctionDeclaration &);