Adjust GLSL builtins

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

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 1504acb224e27dd5290947e9700fa657750ba433..b7b39176a06e62490573cee96ec174fbcd276ad4 100644 (file)
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -27,7 +27,7 @@ private:
 
 /** Finds functions which are candidates for inlining.  Currently this means
 functions which have no flow control statements, no more than one return
-statement, and are only called once. */
+statement, and are either builtins or only called once. */
 class InlineableFunctionLocator: private TraversingVisitor
 {
 private:
@@ -280,6 +280,8 @@ private:
        Assignment *r_assignment;
        bool assignment_target;
        bool r_side_effects;
+       bool composite_reference;
+       Assignment::Target r_reference;
        std::set<Node *> unused_nodes;
 
 public:
@@ -291,9 +293,13 @@ private:
        void referenced(const Assignment::Target &, Node &);
        virtual void visit(VariableReference &);
        virtual void visit(InterfaceBlockReference &);
+       void visit_composite(Expression &);
+       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 &);
        void record_assignment(const Assignment::Target &, Node &);
        virtual void visit(ExpressionStatement &);