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

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 34c0b245..16038806 100644
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -3,7 +3,6 @@
 
 #include <map>
 #include <set>
-#include "evaluate.h"
 #include "visitor.h"
 
 namespace Msp {
@@ -43,10 +42,12 @@ private:
 	FunctionDeclaration *source_func;
 	Block *target_block;
 	std::map<std::string, VariableDeclaration *> variable_map;
-	bool remap_names;
+	std::string remap_prefix;
+	unsigned remap_names;
 	bool deps_only;
 	RefPtr<Statement> r_inlined_statement;
 	std::set<Node *> dependencies;
+	std::set<std::string> referenced_names;
 	std::string r_result_name;
 
 public:
@@ -55,8 +56,6 @@ public:
 	const std::string &apply(Stage &, FunctionDeclaration &, Block &, const NodeList<Statement>::iterator &, FunctionDeclaration &);
 
 private:
-	std::string create_unused_name(const std::string &, bool);
-
 	virtual void visit(VariableReference &);
 	virtual void visit(InterfaceBlockReference &);
 	virtual void visit(FunctionCall &);
@@ -101,9 +100,6 @@ 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;
 
@@ -125,8 +121,7 @@ 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 inline_expression(Expression &, RefPtr<Expression> &);
 	virtual void visit(Block &);
 	virtual void visit(RefPtr<Expression> &);
 	virtual void visit(VariableReference &);
@@ -135,6 +130,48 @@ private:
 	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(Iteration &);
+};
+
+/** Replaces expressions consisting entirely of literals with the results of
+evaluating the expression.*/
+class ConstantFolder: private TraversingVisitor
+{
+private:
+	VariableDeclaration *iteration_var;
+	Variant iter_init_value;
+	Variant r_constant_value;
+	bool iteration_init;
+	bool r_constant;
+	bool r_literal;
+	bool r_uses_iter_var;
+	bool r_any_folded;
+
+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);
+	void set_result(const Variant &, bool = false);
+
+	virtual void visit(RefPtr<Expression> &);
+	virtual void visit(Literal &);
+	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(Iteration &);
@@ -145,14 +182,26 @@ determined as constant at compile time. */
 class ConstantConditionEliminator: private TraversingVisitor
 {
 private:
+	enum ConstantStatus
+	{
+		CONSTANT_FALSE,
+		CONSTANT_TRUE,
+		NOT_CONSTANT
+	};
+
 	NodeList<Statement>::iterator insert_point;
 	std::set<Node *> nodes_to_remove;
+	RefPtr<Expression> r_ternary_result;
 
 public:
 	void apply(Stage &);
 
 private:
+	ConstantStatus check_constant_condition(const Expression &);
+
 	virtual void visit(Block &);
+	virtual void visit(RefPtr<Expression> &);
+	virtual void visit(TernaryExpression &);
 	virtual void visit(Conditional &);
 	virtual void visit(Iteration &);
 };
@@ -170,6 +219,7 @@ 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 &);