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

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index fa75e6d7..b7b39176 100644
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -3,16 +3,31 @@
 
 #include <map>
 #include <set>
-#include "evaluate.h"
 #include "visitor.h"
 
 namespace Msp {
 namespace GL {
 namespace SL {
 
+/** Assigns values to specialization constants, turning them into normal
+constants. */
+class ConstantSpecializer: private TraversingVisitor
+{
+private:
+	const std::map<std::string, int> *values;
+
+public:
+	ConstantSpecializer();
+
+	void apply(Stage &, const std::map<std::string, int> &);
+
+private:
+	virtual void visit(VariableDeclaration &);
+};
+
 /** Finds functions which are candidates for inlining.  Currently this means
-functions which have no parameters, contain no more than one return statement,
-and are only called once. */
+functions which have no flow control statements, no more than one return
+statement, and are either builtins or only called once. */
 class InlineableFunctionLocator: private TraversingVisitor
 {
 private:
@@ -24,7 +39,7 @@ private:
 public:
 	InlineableFunctionLocator();
 
-	const std::set<FunctionDeclaration *> &apply(Stage &s) { s.content.visit(*this); return inlineable; }
+	std::set<FunctionDeclaration *> apply(Stage &s) { s.content.visit(*this); return inlineable; }
 
 private:
 	virtual void visit(FunctionCall &);
@@ -40,23 +55,27 @@ dependencies of the inlined statements to appear before the target function. */
 class InlineContentInjector: private TraversingVisitor
 {
 private:
+	enum Pass
+	{
+		REFERENCED,
+		INLINE,
+		RENAME
+	};
+
 	FunctionDeclaration *source_func;
-	Block *target_block;
-	std::map<std::string, VariableDeclaration *> variable_map;
-	bool remap_names;
-	bool deps_only;
+	Block staging_block;
+	Pass pass;
 	RefPtr<Statement> r_inlined_statement;
 	std::set<Node *> dependencies;
+	std::set<std::string> referenced_names;
 	std::string r_result_name;
 
 public:
 	InlineContentInjector();
 
-	const std::string &apply(Stage &, FunctionDeclaration &, Block &, const NodeList<Statement>::iterator &, FunctionDeclaration &);
+	std::string apply(Stage &, FunctionDeclaration &, Block &, const NodeList<Statement>::iterator &, FunctionCall &);
 
 private:
-	std::string create_unused_name(const std::string &, bool);
-
 	virtual void visit(VariableReference &);
 	virtual void visit(InterfaceBlockReference &);
 	virtual void visit(FunctionCall &);
@@ -76,6 +95,7 @@ private:
 	NodeList<Statement>::iterator insert_point;
 	RefPtr<Expression> r_inline_result;
 	bool r_any_inlined;
+	bool r_inlined_here;
 
 public:
 	FunctionInliner();
@@ -104,7 +124,7 @@ private:
 		bool trivial;
 		bool available;
 
-		ExpressionInfo();
+		ExpressionInfo(): expression(0), assign_scope(0), inline_point(0), trivial(false), available(true) { }
 	};
 
 	std::map<Assignment::Target, ExpressionInfo> expressions;
@@ -137,19 +157,72 @@ private:
 	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 &);
+};
+
 /** Removes conditional statements and loops where the condition can be
 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 &);
 };
@@ -164,11 +237,7 @@ 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(RefPtr<Expression> &);
 	virtual void visit(BasicTypeDeclaration &);
 	virtual void visit(ImageTypeDeclaration &);
 	virtual void visit(StructDeclaration &);
@@ -211,6 +280,8 @@ private:
 	Assignment *r_assignment;
 	bool assignment_target;
 	bool r_side_effects;
+	bool composite_reference;
+	Assignment::Target r_reference;
 	std::set<Node *> unused_nodes;
 
 public:
@@ -222,9 +293,13 @@ private:
 	void referenced(const Assignment::Target &, Node &);
 	virtual void visit(VariableReference &);
 	virtual void visit(InterfaceBlockReference &);
+	void visit_composite(Expression &);
+	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 &);
 	void record_assignment(const Assignment::Target &, Node &);
 	virtual void visit(ExpressionStatement &);