X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.cpp;h=45765f27d88dbf0599e9de494a5ceea90dc64dd4;hp=1489eb9e2af7e04ec542deb1c740efa6d8fc4d7f;hb=76cc18518fc8b0b4fa11fda153e7d9b3899ed112;hpb=30904c6b6e7d885d9ade818328a2137c204e7efe

diff --git a/source/glsl/syntax.cpp b/source/glsl/syntax.cpp
index 1489eb9e..45765f27 100644
--- a/source/glsl/syntax.cpp
+++ b/source/glsl/syntax.cpp
@@ -78,8 +78,7 @@ NodeContainer<C>::NodeContainer(const NodeContainer &c):
 Block::Block(const Block &other):
 	Node(other),
 	body(other.body),
-	use_braces(other.use_braces),
-	parent(0)
+	use_braces(other.use_braces)
 { }
 
 void Block::visit(NodeVisitor &visitor)
@@ -402,10 +401,40 @@ string get_unused_variable_name(const Block &block, const string &base)
 	}
 }
 
-int get_layout_value(const Layout &layout, const string &name, int def_value)
+const TypeDeclaration *get_ultimate_base_type(const TypeDeclaration *type)
 {
-	auto i = find_member(layout.qualifiers, name, &Layout::Qualifier::name);
-	return (i!=layout.qualifiers.end() ? i->value : def_value);
+	if(!type)
+		return 0;
+	while(const BasicTypeDeclaration *basic = dynamic_cast<const BasicTypeDeclaration *>(type))
+	{
+		if(!basic->base_type)
+			break;
+		type = basic->base_type;
+	}
+	return type;
+}
+
+bool has_layout_qualifier(const Layout *layout, const string &name)
+{
+	if(!layout)
+		return false;
+	auto i = find_member(layout->qualifiers, name, &Layout::Qualifier::name);
+	return i!=layout->qualifiers.end();
+}
+
+int get_layout_value(const Layout *layout, const string &name, int def_value)
+{
+	if(!layout)
+		return def_value;
+	auto i = find_member(layout->qualifiers, name, &Layout::Qualifier::name);
+	return (i!=layout->qualifiers.end() ? i->value : def_value);
+}
+
+void add_layout_qualifier(RefPtr<Layout> &layout, const Layout::Qualifier &q)
+{
+	if(!layout)
+		layout = new Layout;
+	layout->qualifiers.push_back(q);
 }
 
 void add_to_chain(Assignment::Target &target, Assignment::Target::ChainType type, unsigned index)