Make variable renaming while inlining more robust

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

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 0604a39c1b24e9224dedffde7323ed3b0e5fa68f..8a888e15bec7c11e019b172570e758a06f46963b 100644 (file)
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -43,10 +43,12 @@ private:
        FunctionDeclaration *source_func;
        Block *target_block;
        std::map<std::string, VariableDeclaration *> variable_map;
-       bool remap_names;
+       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;
        std::string r_result_name;
 
 public:
@@ -55,8 +57,6 @@ public:
        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 &);
@@ -101,9 +101,6 @@ private:
                Expression *expression;
                Block *assign_scope;
                RefPtr<Expression> *inline_point;
-               const Operator *inner_oper;
-               const Operator *outer_oper;
-               bool inline_on_rhs;
                bool trivial;
                bool available;
 
@@ -125,8 +122,7 @@ public:
        bool apply(Stage &);
 
 private:
-       void visit_and_record(RefPtr<Expression> &, const Operator *, bool);
-       void inline_expression(Expression &, RefPtr<Expression> &, const Operator *, const Operator *, bool);
+       void inline_expression(Expression &, RefPtr<Expression> &);
        virtual void visit(Block &);
        virtual void visit(RefPtr<Expression> &);
        virtual void visit(VariableReference &);