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

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 2e28d48a..373e0199 100644
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -10,62 +10,110 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-class InlineableFunctionLocator: public TraversingVisitor
+/** 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. */
+class InlineableFunctionLocator: private TraversingVisitor
 {
 private:
 	std::map<FunctionDeclaration *, unsigned> refcounts;
 	std::set<FunctionDeclaration *> inlineable;
-	FunctionDeclaration *in_function;
+	FunctionDeclaration *current_function;
+	unsigned return_count;
 
 public:
 	InlineableFunctionLocator();
 
-	const std::set<FunctionDeclaration *> &apply(Stage &s) { visit(s.content); return inlineable; }
+	const std::set<FunctionDeclaration *> &apply(Stage &s) { s.content.visit(*this); return inlineable; }
 
-	using TraversingVisitor::visit;
+private:
 	virtual void visit(FunctionCall &);
 	virtual void visit(FunctionDeclaration &);
+	virtual void visit(Conditional &);
+	virtual void visit(Iteration &);
+	virtual void visit(Return &);
 };
 
-class FunctionInliner: public TraversingVisitor
+/** Injects statements from one function into another.  Local variables are
+renamed to avoid conflicts.  After inlining, uses NodeReorderer to cause
+dependencies of the inlined statements to appear before the target function. */
+class InlineContentInjector: private TraversingVisitor
 {
 private:
+	FunctionDeclaration *source_func;
+	Block *target_block;
+	std::map<std::string, VariableDeclaration *> variable_map;
+	bool remap_names;
+	bool deps_only;
+	RefPtr<Statement> r_inlined_statement;
+	std::set<Node *> dependencies;
+	std::string r_result_name;
+
+public:
+	InlineContentInjector();
+
+	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 &);
+	virtual void visit(VariableDeclaration &);
+	virtual void visit(Return &);
+};
+
+/** Inlines functions.  Internally uses InlineableFunctionLocator to find
+candidate functions.  Only functions which consist of a single return statement
+are inlined. */
+class FunctionInliner: private TraversingVisitor
+{
+private:
+	Stage *stage;
 	std::set<FunctionDeclaration *> inlineable;
-	unsigned extract_result;
-	RefPtr<Expression> inline_result;
+	FunctionDeclaration *current_function;
+	NodeList<Statement>::iterator insert_point;
+	RefPtr<Expression> r_inline_result;
+	bool r_any_inlined;
 
 public:
 	FunctionInliner();
-	FunctionInliner(const std::set<FunctionDeclaration *> &);
 
-	void apply(Stage &s) { visit(s.content); }
+	bool apply(Stage &);
 
 private:
 	void visit_and_inline(RefPtr<Expression> &);
-public:
-	using TraversingVisitor::visit;
+
 	virtual void visit(Block &);
 	virtual void visit(UnaryExpression &);
 	virtual void visit(BinaryExpression &);
 	virtual void visit(MemberAccess &);
 	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 &);
 };
 
-class ConstantConditionEliminator: public BlockModifier
+/** Removes conditional statements and loops where the condition can be
+determined as constant at compile time. */
+class ConstantConditionEliminator: private TraversingVisitor
 {
 private:
-	unsigned scope_level;
 	bool record_only;
 	ExpressionEvaluator::ValueMap variable_values;
+	NodeList<Statement>::iterator insert_point;
+	std::set<Node *> nodes_to_remove;
 
 public:
 	ConstantConditionEliminator();
 
-	void apply(Stage &s) { visit(s.content); }
+	void apply(Stage &);
 
-	using BlockModifier::visit;
+private:
 	virtual void visit(Block &);
 	virtual void visit(UnaryExpression &);
 	virtual void visit(Assignment &);
@@ -74,7 +122,9 @@ public:
 	virtual void visit(Iteration &);
 };
 
-class UnusedVariableLocator: public TraversingVisitor
+/** Removes variable declarations with no references to them.  Assignment
+statements where the result is not used are also removed. */
+class UnusedVariableRemover: private TraversingVisitor
 {
 private:
 	struct VariableInfo
@@ -93,47 +143,47 @@ private:
 	std::map<VariableDeclaration *, Node *> aggregates;
 	Node *aggregate;
 	std::vector<BlockVariableMap> variables;
-	Assignment *assignment;
+	Assignment *r_assignment;
 	bool assignment_target;
-	bool assign_to_subscript;
-	bool global_scope;
+	bool r_assign_to_subscript;
+	bool r_side_effects;
 
 public:
-	UnusedVariableLocator();
+	UnusedVariableRemover();
 
-	const std::set<Node *> &apply(Stage &);
+	bool apply(Stage &);
 
-	using TraversingVisitor::visit;
+private:
 	virtual void visit(VariableReference &);
+	virtual void visit(InterfaceBlockReference &);
 	virtual void visit(MemberAccess &);
+	virtual void visit(UnaryExpression &);
 	virtual void visit(BinaryExpression &);
 	virtual void visit(Assignment &);
-private:
 	void record_assignment(VariableDeclaration &, Node &, bool);
 	void clear_assignments(VariableInfo &, bool);
-public:
+	virtual void visit(FunctionCall &);
 	virtual void visit(ExpressionStatement &);
 	virtual void visit(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);
 	virtual void visit(InterfaceBlock &);
 	virtual void visit(FunctionDeclaration &);
-private:
 	void merge_down_variables();
-public:
 	virtual void visit(Conditional &);
 	virtual void visit(Iteration &);
 };
 
-class UnusedFunctionLocator: public TraversingVisitor
+/** Removes function declarations with no references to them. */
+class UnusedFunctionRemover: private TraversingVisitor
 {
 private:
 	std::set<Node *> unused_nodes;
 	std::set<FunctionDeclaration *> used_definitions;
 
 public:
-	const std::set<Node *> &apply(Stage &s) { visit(s.content); return unused_nodes; }
+	bool apply(Stage &s);
 
-	using TraversingVisitor::visit;
+private:
 	virtual void visit(FunctionCall &);
 	virtual void visit(FunctionDeclaration &);
 };