Fix flattening of GLSL interface blocks

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

diff --git a/source/glsl/finalize.h b/source/glsl/finalize.h
index 1fe5fa45a494b02988c90f37068ee4c34e760ca1..4f6ee4193bd869ba61ace5191cc1cd9382b14b4e 100644 (file)
--- a/source/glsl/finalize.h
+++ b/source/glsl/finalize.h
@@ -86,6 +86,8 @@ private:
        VariableDeclaration *frag_out = 0;
        NodeList<Statement>::iterator uniform_insert_point;
        std::set<Node *> nodes_to_remove;
+       RefPtr<Expression> r_replaced_reference;
+       bool r_flattened_interface = false;
 
 public:
        virtual void apply(Stage &, const Features &);
@@ -94,11 +96,14 @@ private:
        void unsupported(const std::string &);
 
        virtual void visit(Block &);
+       virtual void visit(RefPtr<Expression> &);
        bool check_version(const Version &) const;
        bool check_extension(bool Features::*) const;
        bool supports_stage(Stage::Type) const;
        bool supports_unified_interface_syntax() const;
        virtual void visit(VariableReference &);
+       virtual void visit(InterfaceBlockReference &);
+       virtual void visit(MemberAccess &);
        virtual void visit(Assignment &);
        bool supports_unified_sampling_functions() const;
        virtual void visit(FunctionCall &);