From: Samuel Iglesias Gonsalvez <sigles...@igalia.com> Also if GL_ARB_shading_language_420pack extension is enabled.
Signed-off-by: Samuel Iglesias Gonsalvez <sigles...@igalia.com> --- src/glsl/glsl_parser.yy | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index 59e4527..4dd5384 100644 --- a/src/glsl/glsl_parser.yy +++ b/src/glsl/glsl_parser.yy @@ -2595,9 +2595,15 @@ interface_block: { $$ = $1; } - | layout_qualifier basic_interface_block + | layout_qualifier interface_block { - ast_interface_block *block = $2; + ast_interface_block *block = (ast_interface_block *) $2; + + if (!state->has_420pack() && block->layout.has_layout()) { + _mesa_glsl_error(&@1, state, "duplicate layout(...) qualifiers"); + YYERROR; + } + if (!block->layout.merge_qualifier(& @1, state, $1)) { YYERROR; } -- 1.9.1 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev