glsl: split default in layout qualifier merge
authorAndres Gomez <agomez@igalia.com>
Mon, 14 Nov 2016 15:46:05 +0000 (17:46 +0200)
committerAndres Gomez <agomez@igalia.com>
Fri, 25 Nov 2016 11:18:30 +0000 (13:18 +0200)
commit65df02c00287449efedc4ec3d57ceee38abaacdb
tree3bfe9e92d40b45b1c975075bc30c373e630981b0
parentfe5c522edd2e809adc46d44d73a49574fc686929
glsl: split default in layout qualifier merge

Currently, the default in 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 in 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