Check the flat qualifier from the correct member

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

diff --git a/source/glsl/validate.h b/source/glsl/validate.h
index a09f9f643002b11ecae0bfba1237d07d76121cd9..3166c39bf9bd304c15067c77984e089fd417b22a 100644 (file)
--- a/source/glsl/validate.h
+++ b/source/glsl/validate.h
@@ -42,8 +42,12 @@ private:
        Features features;
        ScopeType scope = GLOBAL;
        InterfaceLayout *iface_layout = 0;
-       InterfaceBlock *iface_block = 0;
+       VariableDeclaration *iface_block = 0;
        VariableDeclaration *variable = 0;
+       bool have_input_primitive = false;
+       bool have_output_primitive = false;
+       bool have_output_vertex_count = false;
+       bool have_workgroup_size = false;
 
 public:
        void apply(Stage &, const Features &);
@@ -57,7 +61,6 @@ private:
        virtual void visit(ImageTypeDeclaration &);
        virtual void visit(StructDeclaration &);
        virtual void visit(VariableDeclaration &);
-       virtual void visit(InterfaceBlock &);
        virtual void visit(FunctionDeclaration &);
 };
 
@@ -69,7 +72,7 @@ private:
        typedef std::map<std::string, Statement *> BlockDeclarationMap;
 
        std::map<Block *, BlockDeclarationMap> declarations;
-       std::map<std::string, InterfaceBlock *> interface_blocks;
+       std::map<std::string, VariableDeclaration *> interface_blocks;
        std::map<std::string, FunctionDeclaration *> overloaded_functions;
        bool anonymous_block = false;
 
@@ -87,7 +90,6 @@ private:
        virtual void visit(ImageTypeDeclaration &t) { visit(static_cast<TypeDeclaration &>(t)); }
        virtual void visit(StructDeclaration &);
        virtual void visit(VariableDeclaration &);
-       virtual void visit(InterfaceBlock &);
        virtual void visit(FunctionDeclaration &);
 };
 
@@ -102,10 +104,8 @@ private:
        virtual void visit(ImageTypeDeclaration &);
        virtual void visit(VariableReference &);
        virtual void visit(MemberAccess &);
-       virtual void visit(InterfaceBlockReference &);
        virtual void visit(FunctionCall &);
        virtual void visit(VariableDeclaration &);
-       virtual void visit(InterfaceBlock &);
        virtual void visit(FunctionDeclaration &);
 };
 
@@ -130,7 +130,6 @@ public:
 
 private:
        virtual void visit(VariableReference &);
-       virtual void visit(InterfaceBlockReference &);
        virtual void visit(Swizzle &);
        virtual void visit(UnaryExpression &);
        virtual void visit(BinaryExpression &);
@@ -207,7 +206,6 @@ private:
        void check_uniform(const Uniform &);
 
        virtual void visit(VariableDeclaration &);
-       virtual void visit(InterfaceBlock &);
        virtual void visit(FunctionDeclaration &) { }
 };