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

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index ed016ca0..1c044fb4 100644
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -11,8 +11,7 @@ namespace GL {
 namespace SL {
 
 /** Finds functions which are candidates for inlining.  Currently this means
-functions which have no parameters, are only called once, and that call occurs
-after the definition of the function. */
+functions which have no parameters and are only called once. */
 class InlineableFunctionLocator: private TraversingVisitor
 {
 private:
@@ -30,20 +29,39 @@ private:
 	virtual void visit(FunctionDeclaration &);
 };
 
+/** Collects declarations referenced by a function. */
+class InlineDependencyCollector: private TraversingVisitor
+{
+private:
+	std::set<Node *> dependencies;
+
+public:
+	const std::set<Node *> &apply(FunctionDeclaration &f) { f.visit(*this); return dependencies; }
+
+private:
+	virtual void visit(VariableReference &);
+	virtual void visit(InterfaceBlockReference &);
+	virtual void visit(FunctionCall &);
+	virtual void visit(VariableDeclaration &);
+};
+
 /** 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;
+	FunctionDeclaration *current_function;
 	unsigned extract_result;
 	RefPtr<Expression> inline_result;
+	bool any_inlined;
 
 public:
 	FunctionInliner();
 
-	void apply(Stage &);
+	bool apply(Stage &);
 
 private:
 	void visit_and_inline(RefPtr<Expression> &);
@@ -54,6 +72,7 @@ private:
 	virtual void visit(MemberAccess &);
 	virtual void visit(FunctionCall &);
 	virtual void visit(VariableDeclaration &);
+	virtual void visit(FunctionDeclaration &);
 	virtual void visit(Return &);
 };
 
@@ -105,6 +124,7 @@ private:
 	Assignment *assignment;
 	bool assignment_target;
 	bool assign_to_subscript;
+	bool side_effects;
 
 public:
 	UnusedVariableRemover();
@@ -115,10 +135,12 @@ 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 &);
 	void record_assignment(VariableDeclaration &, Node &, bool);
 	void clear_assignments(VariableInfo &, bool);
+	virtual void visit(FunctionCall &);
 	virtual void visit(ExpressionStatement &);
 	virtual void visit(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);