Refactor a common part in LocationAllocator into a function

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

diff --git a/source/glsl/validate.h b/source/glsl/validate.h
index 52ae136bb61da6053f425cd1d70cc2ad87231be9..558803ff8277b74902f3dcff65d2cdc454526c50 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);
@@ -113,8 +114,16 @@ is indicated by a null result type. */
 class ExpressionValidator: private Validator
 {
 private:
+       enum ConstantKind
+       {
+               NOT_CONSTANT,
+               FIXED_CONSTANT,
+               SPEC_CONSTANT
+       };
+
        FunctionDeclaration *current_function = 0;
-       bool constant_expression = false;
+       bool in_struct = false;
+       ConstantKind constant_expression = NOT_CONSTANT;
 
 public:
        void apply(Stage &s) { stage = &s; s.content.visit(*this); }
@@ -127,6 +136,7 @@ private:
        virtual void visit(BinaryExpression &);
        virtual void visit(Assignment &);
        virtual void visit(TernaryExpression &);
+       virtual void visit(StructDeclaration &);
        virtual void visit(VariableDeclaration &);
        virtual void visit(FunctionDeclaration &);
        virtual void visit(Conditional &);