Refactor interface management

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

diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index 70b1bb39f3547d2f3fb838fe8359d5aa979b5e1c..4ff05fa1a09f9275760dcbfe617610dc6d21a2e3 100644 (file)
--- a/source/glsl/syntax.h
+++ b/source/glsl/syntax.h
@@ -3,6 +3,7 @@
 
 #include <list>
 #include <map>
+#include <set>
 #include <string>
 #include <vector>
 #include <msp/core/refptr.h>
@@ -90,6 +91,7 @@ class NodeArray: public NodeContainer<std::vector<RefPtr<T> > >
 
 struct StructDeclaration;
 struct VariableDeclaration;
+struct InterfaceBlock;
 struct FunctionDeclaration;
 
 struct Statement: Node
@@ -106,9 +108,9 @@ struct Block: Node
 {
        NodeList<Statement> body;
        bool use_braces;
-       bool anonymous;
        std::map<std::string, StructDeclaration *> types;
        std::map<std::string, VariableDeclaration *> variables;
+       std::set<InterfaceBlock *> interfaces;
        Block *parent;
 
        Block();
@@ -383,8 +385,6 @@ 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;
        Features required_features;