diff options
| author | Andres Gomez <[email protected]> | 2016-11-14 17:46:05 +0200 |
|---|---|---|
| committer | Andres Gomez <[email protected]> | 2016-11-25 13:18:30 +0200 |
| commit | 65df02c00287449efedc4ec3d57ceee38abaacdb (patch) | |
| tree | 3bfe9e92d40b45b1c975075bc30c373e630981b0 /src/compiler/glsl/ast.h | |
| parent | fe5c522edd2e809adc46d44d73a49574fc686929 (diff) | |
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 <[email protected]>
Signed-off-by: Andres Gomez <[email protected]>
Diffstat (limited to 'src/compiler/glsl/ast.h')
| -rw-r--r-- | src/compiler/glsl/ast.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/compiler/glsl/ast.h b/src/compiler/glsl/ast.h index 14936f1cebe..62ccb9d4d34 100644 --- a/src/compiler/glsl/ast.h +++ b/src/compiler/glsl/ast.h @@ -768,10 +768,18 @@ struct ast_type_qualifier { _mesa_glsl_parse_state *state, ast_node* &node, bool create_node); - bool merge_in_qualifier(YYLTYPE *loc, - _mesa_glsl_parse_state *state, - const ast_type_qualifier &q, - ast_node* &node, bool create_node); + /** + * Validate current qualifier against the global in one. + */ + bool validate_in_qualifier(YYLTYPE *loc, + _mesa_glsl_parse_state *state); + + /** + * Merge current qualifier into the global in one. + */ + bool merge_into_in_qualifier(YYLTYPE *loc, + _mesa_glsl_parse_state *state, + ast_node* &node, bool create_node); bool validate_flags(YYLTYPE *loc, _mesa_glsl_parse_state *state, |