X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fparser.cpp;h=6a055c0cd3ebb718830e65175efa15aa3bf10ca1;hb=eb7ffda6876bd2eeeb64dcb7c82236f36fe5cf43;hp=ac35216a4cdd164aeb80b1d1f597e4b1fb4803ec;hpb=c315e77b7791fe92d42e1566b5adaddf2699a758;p=libs%2Fgl.git

diff --git a/source/glsl/parser.cpp b/source/glsl/parser.cpp
index ac35216a..6a055c0c 100644
--- a/source/glsl/parser.cpp
+++ b/source/glsl/parser.cpp
@@ -268,6 +268,8 @@ RefPtr<Statement> Parser::parse_global_declaration()
 		if(is_interface_qualifier(token) && tokenizer.peek_token(1)==";")
 		{
 			RefPtr<InterfaceLayout> iface_lo = create_node<InterfaceLayout>();
+			iface_lo->layout.source = layout->source;
+			iface_lo->layout.line = layout->line;
 			iface_lo->layout.qualifiers = layout->qualifiers;
 			iface_lo->interface = tokenizer.parse_token();
 			tokenizer.expect(";");
@@ -395,9 +397,8 @@ RefPtr<Layout> Parser::parse_layout()
 		if(token==")")
 			throw parse_error(tokenizer.get_location(), token, "a layout qualifier name");
 
-		layout->qualifiers.push_back(Layout::Qualifier());
+		layout->qualifiers.push_back(token);
 		Layout::Qualifier &qual = layout->qualifiers.back();
-		qual.name = token;
 
 		if((qual.has_value = check("=")))
 		{