Improve support for interface blocks

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

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index ea772b3d841b1ef78171d99ebb9afef064a76dfd..38218966369213c5fbc8ba802d38bbf1e8bda420 100644 (file)
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -20,12 +20,11 @@ private:
 public:
        InlineableFunctionLocator();
 
-       const std::set<FunctionDeclaration *> &apply(Stage &s) { visit(s.content); return inlineable; }
+       const std::set<FunctionDeclaration *> &apply(Stage &s) { s.content.visit(*this); return inlineable; }
 
 private:
        virtual void visit(FunctionCall &);
        virtual void visit(FunctionDeclaration &);
-       using TraversingVisitor::visit;
 };
 
 class FunctionInliner: private TraversingVisitor
@@ -50,14 +49,11 @@ private:
        virtual void visit(FunctionCall &);
        virtual void visit(VariableDeclaration &);
        virtual void visit(Return &);
-       using TraversingVisitor::visit;
 };
 
 class ConstantConditionEliminator: private TraversingVisitor
 {
 private:
-       unsigned scope_level;
-       Block *current_block;
        bool record_only;
        ExpressionEvaluator::ValueMap variable_values;
        NodeList<Statement>::iterator insert_point;
@@ -75,7 +71,6 @@ private:
        virtual void visit(VariableDeclaration &);
        virtual void visit(Conditional &);
        virtual void visit(Iteration &);
-       using TraversingVisitor::visit;
 };
 
 class UnusedVariableRemover: private TraversingVisitor
@@ -100,7 +95,6 @@ private:
        Assignment *assignment;
        bool assignment_target;
        bool assign_to_subscript;
-       bool global_scope;
 
 public:
        UnusedVariableRemover();
@@ -109,6 +103,7 @@ public:
 
 private:
        virtual void visit(VariableReference &);
+       virtual void visit(InterfaceBlockReference &);
        virtual void visit(MemberAccess &);
        virtual void visit(BinaryExpression &);
        virtual void visit(Assignment &);
@@ -122,7 +117,6 @@ private:
        void merge_down_variables();
        virtual void visit(Conditional &);
        virtual void visit(Iteration &);
-       using TraversingVisitor::visit;
 };
 
 class UnusedFunctionRemover: private TraversingVisitor
@@ -137,7 +131,6 @@ public:
 private:
        virtual void visit(FunctionCall &);
        virtual void visit(FunctionDeclaration &);
-       using TraversingVisitor::visit;
 };
 
 } // namespace SL