Fix a name conflict in certain inlining scenarios

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

diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index a3b217d40895f2d6e4ae790abec56082094b6e95..a1c62d4b11aa2a97f5ff2b17af1bed66e51a028c 100644 (file)
--- a/source/glsl/syntax.h
+++ b/source/glsl/syntax.h
@@ -525,7 +525,7 @@ struct Stage
        };
 
        Type type;
-       Stage *previous;
+       Stage *previous = 0;
        Block content;
        std::map<std::string, TypeDeclaration *> types;
        std::map<std::string, InterfaceBlock *> interface_blocks;
@@ -533,6 +533,7 @@ struct Stage
        std::map<std::string, unsigned> locations;
        std::map<std::string, unsigned> texture_bindings;
        std::map<std::string, unsigned> uniform_block_bindings;
+       unsigned n_clip_distances = 0;
        Features required_features;
        std::vector<Diagnostic> diagnostics;
 
@@ -551,9 +552,12 @@ struct Module
 };
 
 std::string get_unused_variable_name(const Block &, const std::string &);
-
-int get_layout_value(const Layout &, const std::string &, int = -1);
+const TypeDeclaration *get_ultimate_base_type(const TypeDeclaration *);
+bool has_layout_qualifier(const Layout *, const std::string &);
+int get_layout_value(const Layout *, const std::string &, int = -1);
+void add_layout_qualifier(RefPtr<Layout> &, const Layout::Qualifier &);
 void add_to_chain(Assignment::Target &, Assignment::Target::ChainType, unsigned);
+bool targets_overlap(const Assignment::Target &, const Assignment::Target &);
 
 } // namespace SL
 } // namespace GL