Slightly refactor layout qualifiers in the GLSL parser

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

diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index 05bcee545f4a62431ddf8c00978d766e6c670565..70b1bb39f3547d2f3fb838fe8359d5aa979b5e1c 100644 (file)
--- a/source/glsl/syntax.h
+++ b/source/glsl/syntax.h
@@ -6,9 +6,8 @@
 #include <string>
 #include <vector>
 #include <msp/core/refptr.h>
-#include "extension.h"
+#include "features.h"
 #include "sourcemap.h"
-#include "uniform.h"
 
 #pragma push_macro("interface")
 #undef interface
@@ -107,10 +106,13 @@ struct Block: Node
 {
        NodeList<Statement> body;
        bool use_braces;
+       bool anonymous;
        std::map<std::string, StructDeclaration *> types;
        std::map<std::string, VariableDeclaration *> variables;
+       Block *parent;
 
        Block();
+       Block(const Block &);
 
        virtual Block *clone() const { return new Block(*this); }
        virtual void visit(NodeVisitor &);
@@ -240,9 +242,9 @@ struct Layout: Node
 {
        struct Qualifier
        {
-               // TODO the standard calls this name, not identifier
-               std::string identifier;
-               std::string value;
+               std::string name;
+               bool has_value;
+               int value;
        };
 
        std::vector<Qualifier> qualifiers;
@@ -384,8 +386,7 @@ struct Stage
        std::map<std::string, VariableDeclaration *> in_variables;
        std::map<std::string, VariableDeclaration *> out_variables;
        std::map<std::string, unsigned> locations;
-       Version required_version;
-       std::vector<const Extension *> required_extensions;
+       Features required_features;
 
        Stage(Type);