Use a temporary staging block in InlineContentInjector

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

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 1262823f53ead86c058734fc0d62841b70f7dea3..08ee082b99cd9e070dd5003de3cdc936ef21d396 100644 (file)
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -40,11 +40,9 @@ class InlineContentInjector: private TraversingVisitor
 {
 private:
        FunctionDeclaration *source_func;
-       Block *target_block;
-       std::map<std::string, VariableDeclaration *> variable_map;
+       Block staging_block;
        std::string remap_prefix;
        unsigned remap_names;
-       bool deps_only;
        RefPtr<Statement> r_inlined_statement;
        std::set<Node *> dependencies;
        std::set<std::string> referenced_names;
@@ -75,6 +73,7 @@ private:
        NodeList<Statement>::iterator insert_point;
        RefPtr<Expression> r_inline_result;
        bool r_any_inlined;
+       bool r_inlined_here;
 
 public:
        FunctionInliner();
@@ -191,6 +190,7 @@ private:
 
        NodeList<Statement>::iterator insert_point;
        std::set<Node *> nodes_to_remove;
+       RefPtr<Expression> r_ternary_result;
 
 public:
        void apply(Stage &);
@@ -199,6 +199,8 @@ 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 &);
 };