X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.h;h=6250130fb30a39bfd9b18c82cdc9acf654c347ad;hb=59347f76bc985e8c9c769d4a3eee672cba9c920b;hp=b7b39176a06e62490573cee96ec174fbcd276ad4;hpb=305b62cf4f7e2a4ca3cc56109003aed6bde61c25;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index b7b39176..6250130f 100644
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -116,22 +116,32 @@ Variables which are only referenced once are also inlined. */
 class ExpressionInliner: private TraversingVisitor
 {
 private:
+	struct ExpressionUse
+	{
+		RefPtr<Expression> *reference;
+		Block *ref_scope;
+		bool blocked;
+
+		ExpressionUse(): reference(0), ref_scope(0), blocked(false) { }
+	};
+
 	struct ExpressionInfo
 	{
-		Expression *expression;
+		Assignment::Target target;
+		RefPtr<Expression> expression;
 		Block *assign_scope;
-		RefPtr<Expression> *inline_point;
+		std::vector<ExpressionUse> uses;
 		bool trivial;
-		bool available;
 
-		ExpressionInfo(): expression(0), assign_scope(0), inline_point(0), trivial(false), available(true) { }
+		ExpressionInfo(): expression(0), assign_scope(0), trivial(false) { }
 	};
 
-	std::map<Assignment::Target, ExpressionInfo> expressions;
+	std::list<ExpressionInfo> expressions;
+	std::map<Assignment::Target, ExpressionInfo *> assignments;
 	ExpressionInfo *r_ref_info;
-	bool r_any_inlined;
 	bool r_trivial;
-	bool mutating;
+	bool access_read;
+	bool access_write;
 	bool iteration_init;
 	Block *iteration_body;
 	const Operator *r_oper;
@@ -142,8 +152,6 @@ public:
 	bool apply(Stage &);
 
 private:
-	void inline_expression(Expression &, RefPtr<Expression> &);
-	virtual void visit(Block &);
 	virtual void visit(RefPtr<Expression> &);
 	virtual void visit(VariableReference &);
 	virtual void visit(MemberAccess &);
@@ -175,13 +183,16 @@ public:
 	bool apply(Stage &s) { s.content.visit(*this); return r_any_folded; }
 
 private:
-	static BasicTypeDeclaration::Kind get_value_kind(const Variant &);
 	template<typename T>
 	static T evaluate_logical(char, T, T);
 	template<typename T>
 	static bool evaluate_relation(const char *, T, T);
 	template<typename T>
 	static T evaluate_arithmetic(char, T, T);
+	template<typename T>
+	static T evaluate_int_special_op(char, T, T);
+	template<typename T>
+	void convert_to_result(const Variant &);
 	void set_result(const Variant &, bool = false);
 
 	virtual void visit(RefPtr<Expression> &);
@@ -227,6 +238,26 @@ private:
 	virtual void visit(Iteration &);
 };
 
+class UnreachableCodeRemover: private TraversingVisitor
+{
+private:
+	bool reachable;
+	std::set<Node *> unreachable_nodes;
+
+public:
+	UnreachableCodeRemover();
+
+	virtual bool apply(Stage &);
+
+private:
+	virtual void visit(Block &);
+	virtual void visit(FunctionDeclaration &);
+	virtual void visit(Conditional &);
+	virtual void visit(Iteration &);
+	virtual void visit(Return &) { reachable = false; }
+	virtual void visit(Jump &) { reachable = false; }
+};
+
 /** Removes types which are not used anywhere. */
 class UnusedTypeRemover: private TraversingVisitor
 {
@@ -256,6 +287,7 @@ private:
 		Node *node;
 		Assignment::Target target;
 		std::vector<Node *> used_by;
+		unsigned in_loop;
 
 		AssignmentInfo(): node(0) { }
 	};
@@ -280,7 +312,10 @@ private:
 	Assignment *r_assignment;
 	bool assignment_target;
 	bool r_side_effects;
+	bool in_struct;
 	bool composite_reference;
+	unsigned in_loop;
+	std::vector<Node *> loop_ext_refs;
 	Assignment::Target r_reference;
 	std::set<Node *> unused_nodes;
 
@@ -303,8 +338,7 @@ private:
 	virtual void visit(FunctionCall &);
 	void record_assignment(const Assignment::Target &, Node &);
 	virtual void visit(ExpressionStatement &);
-	// Ignore structs because their members can't be accessed directly.
-	virtual void visit(StructDeclaration &) { }
+	virtual void visit(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);
 	virtual void visit(InterfaceBlock &);
 	void merge_variables(const BlockVariableMap &);