diff options
| author | Timothy Arceri <timothy.arceri@collabora.com> | 2016-01-12 12:41:32 +1100 |
|---|---|---|
| committer | Timothy Arceri <timothy.arceri@collabora.com> | 2016-03-05 19:39:01 +1100 |
| commit | 5a27fefffec30a88a0e0779583f45ca01aae54a4 (patch) | |
| tree | 67d2db3c0833dcf17eaef964816be8d44610aa68 /src/compiler/glsl/ast_type.cpp | |
| parent | 22b0082b9d32229e735a4ed7e9d9298b2ea14115 (diff) | |
| download | external_mesa3d-5a27fefffec30a88a0e0779583f45ca01aae54a4.zip external_mesa3d-5a27fefffec30a88a0e0779583f45ca01aae54a4.tar.gz external_mesa3d-5a27fefffec30a88a0e0779583f45ca01aae54a4.tar.bz2 | |
glsl: parse align layout qualifier
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Diffstat (limited to 'src/compiler/glsl/ast_type.cpp')
| -rw-r--r-- | src/compiler/glsl/ast_type.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/compiler/glsl/ast_type.cpp b/src/compiler/glsl/ast_type.cpp index 6b446a1..07ed4f2 100644 --- a/src/compiler/glsl/ast_type.cpp +++ b/src/compiler/glsl/ast_type.cpp @@ -73,6 +73,7 @@ ast_type_qualifier::has_layout() const || this->flags.q.column_major || this->flags.q.row_major || this->flags.q.packed + || this->flags.q.explicit_align || this->flags.q.explicit_location || this->flags.q.explicit_image_format || this->flags.q.explicit_index @@ -287,6 +288,9 @@ ast_type_qualifier::merge_qualifier(YYLTYPE *loc, return false; } + if (q.flags.q.explicit_align) + this->align = q.align; + if (q.flags.q.explicit_location) this->location = q.location; |