summaryrefslogtreecommitdiffstats
path: root/src/compiler/glsl/glsl_parser.yy
diff options
context:
space:
mode:
authorAndres Gomez <[email protected]>2016-10-07 01:52:08 +0300
committerAndres Gomez <[email protected]>2016-11-25 13:18:30 +0200
commit93f90d7795ba414c01ab6fe905f8b3f61eeaf7ef (patch)
tree000792678a152e6810f6f4573860c447aeeb48c3 /src/compiler/glsl/glsl_parser.yy
parentbe54a58da3ee5485d18c04e1ccc0a1c6137a46a3 (diff)
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 <[email protected]> Signed-off-by: Andres Gomez <[email protected]>
Diffstat (limited to 'src/compiler/glsl/glsl_parser.yy')
-rw-r--r--src/compiler/glsl/glsl_parser.yy4
1 files changed, 2 insertions, 2 deletions
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;
}
}