X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fparser.cpp;h=56e4b1b50fcf75573230c949256e0c5c33655d64;hb=c6b29fbf9927467b21dca65539a1fa2c98f96e0e;hp=9e1f1913491cf98800352d25619557a3e120bfdc;hpb=d8bdf61007978e2c3670a22a58e2f105e8347537;p=libs%2Fgl.git diff --git a/source/glsl/parser.cpp b/source/glsl/parser.cpp index 9e1f1913..56e4b1b5 100644 --- a/source/glsl/parser.cpp +++ b/source/glsl/parser.cpp @@ -268,11 +268,19 @@ RefPtr Parser::parse_global_declaration() if(is_interface_qualifier(token) && tokenizer.peek_token(1)==";") { RefPtr iface_lo = create_node(); + 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(";"); return iface_lo; } + else if(is_interface_qualifier(token) && tokenizer.peek_token(2)=="{") + { + RefPtr iface = parse_interface_block(); + iface->layout = layout; + return iface; + } else { RefPtr var = parse_variable_declaration();