Remove the using declarations from visitors

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

diff --git a/source/glsl/compatibility.h b/source/glsl/compatibility.h
index a391aab0f20f7dbcb8bd0a4477434570437e7697..852a6590bd67c287cf272d1a85bc9cfdb746a5c3 100644 (file)
--- a/source/glsl/compatibility.h
+++ b/source/glsl/compatibility.h
@@ -24,7 +24,6 @@ private:
        virtual void visit(Block &);
        virtual void visit(Precision &);
        virtual void visit(VariableDeclaration &);
-       using TraversingVisitor::visit;
 };
 
 class PrecisionRemover: private TraversingVisitor
@@ -38,15 +37,13 @@ public:
 private:
        virtual void visit(Precision &);
        virtual void visit(VariableDeclaration &);
-       using TraversingVisitor::visit;
 };
 
 class LegacyConverter: private TraversingVisitor
 {
 private:
        Stage *stage;
-       GLApi target_api;
-       Version target_version;
+       Features features;
        std::string type;
        VariableDeclaration *frag_out;
        NodeList<Statement>::iterator uniform_insert_point;
@@ -55,12 +52,13 @@ private:
 public:
        LegacyConverter();
 
-       virtual void apply(Stage &);
+       virtual void apply(Stage &, const Features &);
 
 private:
        virtual void visit(Block &);
        bool check_version(const Version &) const;
-       bool check_extension(const Extension &) 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(Assignment &);
@@ -72,7 +70,6 @@ private:
        virtual void visit(VariableDeclaration &);
        bool supports_interface_blocks(const std::string &) const;
        virtual void visit(InterfaceBlock &);
-       using TraversingVisitor::visit;
 };
 
 } // namespace SL