Validate location overlap and type matching for GLSL interfaces

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

diff --git a/source/glsl/validate.h b/source/glsl/validate.h
index 35cc049c8d0809edbb007cca63b35d42e560e483..63af3610a3b9a81e7bc3c73921eb6c16c3808964 100644 (file)
--- a/source/glsl/validate.h
+++ b/source/glsl/validate.h
@@ -24,24 +24,42 @@ protected:
        void add_info(Node &, const std::string &);
 };
 
-class TypeValidator: private Validator
+class DeclarationValidator: private Validator
 {
 private:
-       bool in_struct;
+       enum ScopeType
+       {
+               GLOBAL,
+               STRUCT,
+               INTERFACE_BLOCK,
+               FUNCTION_PARAM,
+               FUNCTION
+       };
+
+       ScopeType scope;
+       InterfaceLayout *iface_layout;
+       InterfaceBlock *iface_block;
+       VariableDeclaration *variable;
 
 public:
-       TypeValidator();
+       DeclarationValidator();
 
        void apply(Stage &s) { stage = &s; s.content.visit(*this); }
 
 private:
+       static const char *describe_variable(ScopeType);
+
+       virtual void visit(Layout &);
+       virtual void visit(InterfaceLayout &);
        virtual void visit(BasicTypeDeclaration &);
        virtual void visit(ImageTypeDeclaration &);
        virtual void visit(StructDeclaration &);
        virtual void visit(VariableDeclaration &);
+       virtual void visit(InterfaceBlock &);
+       virtual void visit(FunctionDeclaration &);
 };
 
-class DeclarationValidator: private Validator
+class IdentifierValidator: private Validator
 {
 private:
        typedef std::map<std::string, Statement *> BlockDeclarationMap;
@@ -52,7 +70,7 @@ private:
        bool anonymous_block;
 
 public:
-       DeclarationValidator();
+       IdentifierValidator();
 
        void apply(Stage &s) { stage = &s; s.content.visit(*this); }
 
@@ -90,7 +108,12 @@ private:
 
 class ExpressionValidator: private Validator
 {
+private:
+       FunctionDeclaration *current_function;
+
 public:
+       ExpressionValidator();
+
        void apply(Stage &s) { stage = &s; s.content.visit(*this); }
 
 private:
@@ -98,7 +121,52 @@ private:
        virtual void visit(UnaryExpression &);
        virtual void visit(BinaryExpression &);
        virtual void visit(Assignment &);
+       virtual void visit(TernaryExpression &);
        virtual void visit(VariableDeclaration &);
+       virtual void visit(FunctionDeclaration &);
+       virtual void visit(Return &);
+};
+
+class StageInterfaceValidator: private Validator
+{
+private:
+       std::map<std::string, std::map<unsigned, VariableDeclaration *> > used_locations;
+
+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 &) { }
+};
+
+class GlobalInterfaceValidator: private Validator
+{
+private:
+       struct Binding
+       {
+               Node *node;
+               TypeDeclaration *type;
+               std::string name;
+
+               Binding(VariableDeclaration &v): node(&v), type(v.type_declaration), name(v.name) { }
+               Binding(InterfaceBlock &i): node(&i), type(i.struct_declaration), name(i.block_name) { }
+       };
+
+       std::map<unsigned, std::map<unsigned, Binding> > used_bindings;
+
+public:
+       void apply(Module &);
+
+private:
+       void get_binding(const Layout &, unsigned &, int &);
+       void check_binding(const Layout &, const Binding &);
+
+       virtual void visit(VariableDeclaration &);
+       virtual void visit(InterfaceBlock &);
+       virtual void visit(FunctionDeclaration &) { }
 };
 
 } // namespace SL