From 93f90d7795ba414c01ab6fe905f8b3f61eeaf7ef Mon Sep 17 00:00:00 2001 From: Andres Gomez Date: Fri, 7 Oct 2016 01:52:08 +0300 Subject: glsl: simplified ast_type_qualifier::merge_into_[in|out]_qualifier API Since we modified the way in which multiple repetitions of the same layout-qualifier-name in a single declaration collapse into the ast_type_qualifier class, we can simplify the merge_into_[in|out]_qualifier APIs through removing the create_node parameter. Reviewed-by: Timothy Arceri Signed-off-by: Andres Gomez --- src/compiler/glsl/glsl_parser.yy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/compiler/glsl/glsl_parser.yy') diff --git a/src/compiler/glsl/glsl_parser.yy b/src/compiler/glsl/glsl_parser.yy index 5a8f854ece8..5529f1116c1 100644 --- a/src/compiler/glsl/glsl_parser.yy +++ b/src/compiler/glsl/glsl_parser.yy @@ -2957,14 +2957,14 @@ layout_defaults: | layout_in_defaults { $$ = NULL; - if (!$1.merge_into_in_qualifier(& @1, state, $$, true)) { + if (!$1.merge_into_in_qualifier(& @1, state, $$)) { YYERROR; } } | layout_out_defaults { $$ = NULL; - if (!$1.merge_into_out_qualifier(& @1, state, $$, true)) { + if (!$1.merge_into_out_qualifier(& @1, state, $$)) { YYERROR; } } -- cgit v1.2.3