OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compiler: Handle nested arrays correctly for computing CL size/alignment

Browse Source 
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Sil Vilerino <sivileri@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20111>
This commit is contained in:
Jesse Natalie
2022-12-01 11:09:44 -08:00
parent 4a976d371b
commit d4c70e483d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/compiler/glsl_types.cpp
View File

@@ -3333,7 +3333,7 @@ glsl_type::cl_alignment() const
if (this->is_scalar() || this->is_vector()) if (this->is_scalar() || this->is_vector())
return this->cl_size(); return this->cl_size();
else if (this->is_array()) else if (this->is_array())
return this->without_array()->cl_alignment(); return this->fields.array->cl_alignment();
else if (this->is_struct()) { else if (this->is_struct()) {
/* Packed Structs are 0x1 aligned despite their size. */ /* Packed Structs are 0x1 aligned despite their size. */
if (this->packed) if (this->packed)
@@ -3356,7 +3356,7 @@ glsl_type::cl_size() const
return util_next_power_of_two(this->vector_elements) * return util_next_power_of_two(this->vector_elements) *
explicit_type_scalar_byte_size(this); explicit_type_scalar_byte_size(this);
} else if (this->is_array()) { } else if (this->is_array()) {
unsigned size = this->without_array()->cl_size(); unsigned size = this->fields.array->cl_size();
return size * this->length; return size * this->length;
} else if (this->is_struct()) { } else if (this->is_struct()) {
unsigned size = 0; unsigned size = 0;