Support inlining GLSL functions with parameters

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

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index ca22c9d8259fdf198c0c63cc5221361ee010c8a6..6d4b1bcb5d2c2e5d883d7ab640390481c8c7e84e 100644 (file)
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -3,7 +3,6 @@
 
 #include <map>
 #include <set>
-#include "evaluate.h"
 #include "visitor.h"
 
 namespace Msp {
@@ -11,8 +10,8 @@ namespace GL {
 namespace SL {
 
 /** 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 only called once. */
 class InlineableFunctionLocator: private TraversingVisitor
 {
 private:
@@ -40,23 +39,29 @@ dependencies of the inlined statements to appear before the target function. */
 class InlineContentInjector: private TraversingVisitor
 {
 private:
+       enum Pass
+       {
+               DEPENDS,
+               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;
+       std::string remap_prefix;
+       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 &);
+       const 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 +81,7 @@ private:
        NodeList<Statement>::iterator insert_point;
        RefPtr<Expression> r_inline_result;
        bool r_any_inlined;
+       bool r_inlined_here;
 
 public:
        FunctionInliner();
@@ -122,7 +128,6 @@ public:
        bool apply(Stage &);
 
 private:
-       void visit_and_record(RefPtr<Expression> &);
        void inline_expression(Expression &, RefPtr<Expression> &);
        virtual void visit(Block &);
        virtual void visit(RefPtr<Expression> &);
@@ -138,19 +143,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 &);
 };