Store types and interface blocks in Stage

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

diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index 7729611c2a5e2a3d013b2e8a5112391af52ae668..49699f2ed3811880e5ecbfb0495549379ff41784 100644 (file)
--- a/source/glsl/syntax.h
+++ b/source/glsl/syntax.h
@@ -108,9 +108,7 @@ struct Block: Node
 {
        NodeList<Statement> body;
        bool use_braces;
-       std::map<std::string, StructDeclaration *> types;
        std::map<std::string, VariableDeclaration *> variables;
-       std::map<std::string, InterfaceBlock *> interfaces;
        Block *parent;
 
        Block();
@@ -401,6 +399,8 @@ struct Stage
        Type type;
        Stage *previous;
        Block content;
+       std::map<std::string, StructDeclaration *> types;
+       std::map<std::string, InterfaceBlock *> interface_blocks;
        std::map<std::string, unsigned> locations;
        Features required_features;