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

compiler/types: Allow interfaces in get_explicit_type_for_size_align

Browse Source 
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6210>
This commit is contained in:
Jason Ekstrand
2020-07-28 18:01:19 -05:00
committed by Marge Bot
parent df9596353a
commit a880f97d59
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/compiler/glsl_types.cpp
View File

@@ -2439,7 +2439,7 @@ glsl_type::get_explicit_type_for_size_align(glsl_type_size_align_func type_info,
*size = stride * (this->length - 1) + elem_size;
*alignment = elem_align;
return glsl_type::get_array_instance(explicit_element, this->length, stride);
} else if (this->is_struct()) {
} else if (this->is_struct() || this->is_interface()) {
struct glsl_struct_field *fields = (struct glsl_struct_field *)
malloc(sizeof(struct glsl_struct_field) * this->length);
@@ -2458,7 +2458,15 @@ glsl_type::get_explicit_type_for_size_align(glsl_type_size_align_func type_info,
*alignment = MAX2(*alignment, field_align);
}
const glsl_type *type = glsl_type::get_struct_instance(fields, this->length, this->name, false);
const glsl_type *type;
if (this->is_struct()) {
type = get_struct_instance(fields, this->length, this->name, false);
} else {
type = get_interface_instance(fields, this->length,
(enum glsl_interface_packing)this->interface_packing,
this->interface_row_major,
this->name);
}
free(fields);
return type;
} else if (this->is_matrix()) {