KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Eric Anholt 2012-04-24 12:18:17 -07:00
parent 60a784d56e
commit f4fb6bf088
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/glsl/glsl_parser.yy
View File

@ -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;