glsl: split default out layout qualifier merge
authorAndres Gomez <agomez@igalia.com>
Mon, 14 Nov 2016 10:23:32 +0000 (12:23 +0200)
committerAndres Gomez <agomez@igalia.com>
Fri, 25 Nov 2016 11:18:30 +0000 (13:18 +0200)
commitfe5c522edd2e809adc46d44d73a49574fc686929
tree964eb483a63de6ddc4c1f70b44369c7e99fe92f2
parent70456aca8d1934ec53c24cfe1cfb4273d2bc9397
glsl: split default out layout qualifier merge

Currently, the default out layout qualifier merge performs specific
validation and merge.

We want to split out the validation from the merge so they can be done
independently.

Additionally, for simplification, the direction of the validation and
merge is changed so the ast_type_qualifier calling the method is the
one validated and merged against the default out qualifier.

Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
Signed-off-by: Andres Gomez <agomez@igalia.com>
src/compiler/glsl/ast.h
src/compiler/glsl/ast_type.cpp
src/compiler/glsl/glsl_parser.yy