glsl: Reduce a bit of extra code in the merging of layout qualifiers.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy
index 9ad67e27881923fab914bab74177288184b0fcd2..531d257c9d1a4ff02aaa7b5ec89e6313a5674086 100644 (file)
--- a/src/glsl/glsl_parser.yy
+++ b/src/glsl/glsl_parser.yy
@@ -1100,13 +1100,8 @@ layout_qualifier_id_list:
              YYERROR;
           }
 
-          $$.flags.i = $1.flags.i | $3.flags.i;
-
-          if ($1.flags.q.explicit_location)
-             $$.location = $1.location;
-
-          if ($1.flags.q.explicit_index)
-             $$.index = $1.index;
+          $$ = $1;
+          $$.flags.i |= $3.flags.i;
 
           if ($3.flags.q.explicit_location)
              $$.location = $3.location;