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

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 1c044fb4..373e0199 100644
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -11,13 +11,15 @@ namespace GL {
 namespace SL {
 
 /** Finds functions which are candidates for inlining.  Currently this means
-functions which have no parameters and are only called once. */
+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();
@@ -27,22 +29,39 @@ public:
 private:
 	virtual void visit(FunctionCall &);
 	virtual void visit(FunctionDeclaration &);
+	virtual void visit(Conditional &);
+	virtual void visit(Iteration &);
+	virtual void visit(Return &);
 };
 
-/** Collects declarations referenced by a function. */
-class InlineDependencyCollector: private 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:
-	const std::set<Node *> &apply(FunctionDeclaration &f) { f.visit(*this); return dependencies; }
+	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
@@ -54,9 +73,9 @@ private:
 	Stage *stage;
 	std::set<FunctionDeclaration *> inlineable;
 	FunctionDeclaration *current_function;
-	unsigned extract_result;
-	RefPtr<Expression> inline_result;
-	bool any_inlined;
+	NodeList<Statement>::iterator insert_point;
+	RefPtr<Expression> r_inline_result;
+	bool r_any_inlined;
 
 public:
 	FunctionInliner();
@@ -71,8 +90,11 @@ private:
 	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 &);
 };
 
@@ -121,10 +143,10 @@ 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 side_effects;
+	bool r_assign_to_subscript;
+	bool r_side_effects;
 
 public:
 	UnusedVariableRemover();