Refactor layout qualifier creation with constructors

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

diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index c8324c87460065a2a0d452d455600d017de8eabb..2a9dcf84869261298d404248c3fd138de41fc498 100644 (file)
--- a/source/glsl/syntax.h
+++ b/source/glsl/syntax.h
@@ -187,6 +187,7 @@ struct MemberAccess: Expression
        std::string member;
 
        VariableDeclaration *declaration;
+       int index;
 
        MemberAccess();
        MemberAccess(const MemberAccess &);
@@ -313,6 +314,9 @@ struct Layout: Node
                std::string name;
                bool has_value;
                int value;
+
+               Qualifier(const std::string &n = std::string()): name(n), has_value(false), value(0) { }
+               Qualifier(const std::string &n, int v): name(n), has_value(true), value(v) { }
        };
 
        std::vector<Qualifier> qualifiers;
@@ -555,6 +559,7 @@ std::string get_unused_variable_name(const Block &, const std::string &);
 
 bool is_same_type(const TypeDeclaration &, const TypeDeclaration &);
 int get_layout_value(const Layout &, const std::string &, int = -1);
+void add_to_chain(Assignment::Target &, Assignment::Target::ChainType, unsigned);
 
 } // namespace SL
 } // namespace GL