Fix a name conflict in certain inlining scenarios

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

diff --git a/source/glsl/validate.h b/source/glsl/validate.h
index b47a9911d95c6a147034f1937243f34bd69ebca9..a09f9f643002b11ecae0bfba1237d07d76121cd9 100644 (file)
--- a/source/glsl/validate.h
+++ b/source/glsl/validate.h
@@ -39,13 +39,14 @@ private:
                FUNCTION
        };
 
+       Features features;
        ScopeType scope = GLOBAL;
        InterfaceLayout *iface_layout = 0;
        InterfaceBlock *iface_block = 0;
        VariableDeclaration *variable = 0;
 
 public:
-       void apply(Stage &s) { stage = &s; s.content.visit(*this); }
+       void apply(Stage &, const Features &);
 
 private:
        static const char *describe_variable(ScopeType);
@@ -174,8 +175,6 @@ public:
        void apply(Stage &s) { stage = &s; s.content.visit(*this); }
 
 private:
-       int get_location(const Layout &);
-
        virtual void visit(VariableDeclaration &);
        virtual void visit(FunctionDeclaration &) { }
 };