X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.h;h=7a372dc59e2402d5f1872da7aa24415c66c1e783;hb=0585e361d8714ac4efc3ae3e1d5c8c9aa8841c34;hp=a3b217d40895f2d6e4ae790abec56082094b6e95;hpb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;p=libs%2Fgl.git

diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index a3b217d4..7a372dc5 100644
--- a/source/glsl/syntax.h
+++ b/source/glsl/syntax.h
@@ -354,6 +354,7 @@ struct BasicTypeDeclaration: TypeDeclaration
 	Kind kind = ALIAS;
 	unsigned size = 0;
 	bool sign = true;
+	bool extended_alignment = false;
 	std::string base;
 
 	TypeDeclaration *base_type = 0;
@@ -390,6 +391,7 @@ struct ImageTypeDeclaration: TypeDeclaration
 struct StructDeclaration: TypeDeclaration
 {
 	Block members;
+	bool extended_alignment = false;
 
 	InterfaceBlock *interface_block = 0;
 
@@ -525,7 +527,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 +535,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 +554,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