Refactor add_to_chain as a common utility function

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

diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index 9bc3c5a872e865ea9f6506bfcc4d1ba04524144e..3518cb4c3e3145b281661aad152be938120cc556 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,8 @@ struct Layout: Node
                std::string name;
                bool has_value;
                int value;
+
+               Qualifier(): has_value(false), value(0) { }
        };
 
        std::vector<Qualifier> qualifiers;
@@ -429,8 +432,9 @@ struct VariableDeclaration: Statement
 
 struct InterfaceBlock: Statement
 {
+       NodePtr<Layout> layout;
        std::string interface;
-       std::string name;
+       std::string block_name;
        NodePtr<Block> members;
        std::string instance_name;
        bool array;
@@ -531,6 +535,8 @@ struct Stage
        std::map<std::string, InterfaceBlock *> interface_blocks;
        std::map<std::string, FunctionDeclaration *> functions;
        std::map<std::string, unsigned> locations;
+       std::map<std::string, unsigned> texture_bindings;
+       std::map<std::string, unsigned> uniform_block_bindings;
        Features required_features;
        std::vector<Diagnostic> diagnostics;
 
@@ -550,6 +556,10 @@ struct Module
 
 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
 } // namespace Msp