Unify handling of variables and interface blocks in the GLSL compiler

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

diff --git a/source/glsl/finalize.h b/source/glsl/finalize.h
index f9502954f6b1d6ed9983e403c14414870ae63090..79ba54b81b027c8b16743e0f1281b3e961611319 100644 (file)
--- a/source/glsl/finalize.h
+++ b/source/glsl/finalize.h
@@ -41,7 +41,7 @@ private:
        std::map<unsigned, std::set<unsigned> > used_bindings;
        std::vector<VariableDeclaration *> unplaced_variables;
        std::vector<VariableDeclaration *> unbound_textures;
-       std::vector<InterfaceBlock *> unbound_blocks;
+       std::vector<VariableDeclaration *> unbound_blocks;
 
 public:
        void apply(Module &, const Features &, bool = true);
@@ -53,7 +53,6 @@ private:
 
        bool visit_uniform(const std::string &, RefPtr<Layout> &);
        virtual void visit(VariableDeclaration &);
-       virtual void visit(InterfaceBlock &);
        virtual void visit(FunctionDeclaration &) { }
 };
 
@@ -117,14 +116,12 @@ private:
        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 &);
-       virtual void visit(VariableDeclaration &);
        bool supports_interface_blocks(const std::string &) const;
-       virtual void visit(InterfaceBlock &);
+       virtual void visit(VariableDeclaration &);
 };
 
 /** Converts qualifiers on variables and blocksto match a particular set of
@@ -142,9 +139,8 @@ private:
        bool supports_sample_sampling() const;
        bool supports_uniform_location() const;
        bool supports_binding() const;
-       virtual void visit(VariableDeclaration &);
        bool supports_interface_block_location() const;
-       virtual void visit(InterfaceBlock &);
+       virtual void visit(VariableDeclaration &);
 };
 
 } // namespace SL