Refactor interface management

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

diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index 05bcee545f4a62431ddf8c00978d766e6c670565..4ff05fa1a09f9275760dcbfe617610dc6d21a2e3 100644 (file)
--- a/source/glsl/syntax.h
+++ b/source/glsl/syntax.h
@@ -3,12 +3,12 @@
 
 #include <list>
 #include <map>
+#include <set>
 #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
@@ -91,6 +91,7 @@ class NodeArray: public NodeContainer<std::vector<RefPtr<T> > >
 
 struct StructDeclaration;
 struct VariableDeclaration;
+struct InterfaceBlock;
 struct FunctionDeclaration;
 
 struct Statement: Node
@@ -109,8 +110,11 @@ struct Block: Node
        bool use_braces;
        std::map<std::string, StructDeclaration *> types;
        std::map<std::string, VariableDeclaration *> variables;
+       std::set<InterfaceBlock *> interfaces;
+       Block *parent;
 
        Block();
+       Block(const Block &);
 
        virtual Block *clone() const { return new Block(*this); }
        virtual void visit(NodeVisitor &);
@@ -240,9 +244,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;
@@ -381,11 +385,8 @@ struct Stage
        Type type;
        Stage *previous;
        Block content;
-       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);