Rename members of visitors to indicate which are "return values"

[libs/gl.git] / source / glsl / optimize.h

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index ed016ca0b9ddd26dd5e8e871b25a0f15484e2881..373e0199dd316cad4e3390f3e66cd1473aa7f8db 100644 (file)
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -11,14 +11,15 @@ 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, 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();
@@ -28,6 +29,39 @@ public:
 private:
        virtual void visit(FunctionCall &);
        virtual void visit(FunctionDeclaration &);
+       virtual void visit(Conditional &);
+       virtual void visit(Iteration &);
+       virtual void visit(Return &);
+};
+
+/** 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
@@ -36,14 +70,17 @@ 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();
 
-       void apply(Stage &);
+       bool apply(Stage &);
 
 private:
        void visit_and_inline(RefPtr<Expression> &);
@@ -53,7 +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 &);
 };
 
@@ -102,9 +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 r_assign_to_subscript;
+       bool r_side_effects;
 
 public:
        UnusedVariableRemover();
@@ -115,10 +157,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 &);