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

glsl: Account for unsized arrays in NIR linker

Browse Source 
Follow the same approach as the pre-NIR linker.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5891
Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Acked-by: Timothy Arceri <tarceri@itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21401>
This commit is contained in:
Caio Oliveira
2023-02-17 22:36:11 -08:00
committed by Marge Bot
parent 10f8240caf
commit e0c6ad1ce5
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/compiler/glsl/gl_nir_link_uniform_blocks.c
View File

@@ -326,7 +326,7 @@ iterate_type_count_variables(const struct glsl_type *type,
else else
field_type = glsl_get_array_element(type); field_type = glsl_get_array_element(type);
if (glsl_type_is_leaf(field_type)) if (glsl_type_is_leaf(field_type) || glsl_type_is_unsized_array(field_type))
(*num_variables)++; (*num_variables)++;
else else
iterate_type_count_variables(field_type, num_variables); iterate_type_count_variables(field_type, num_variables);
@@ -374,17 +374,13 @@ iterate_type_fill_variables(const struct glsl_type *type,
struct gl_shader_program *prog, struct gl_shader_program *prog,
struct gl_uniform_block *block) struct gl_uniform_block *block)
{ {
unsigned length = glsl_get_length(type);
if (length == 0)
return;
unsigned struct_base_offset; unsigned struct_base_offset;
bool struct_or_ifc = glsl_type_is_struct_or_ifc(type); bool struct_or_ifc = glsl_type_is_struct_or_ifc(type);
if (struct_or_ifc) if (struct_or_ifc)
struct_base_offset = *offset; struct_base_offset = *offset;
for (unsigned i = 0; i < length; i++) { for (unsigned i = 0; i < glsl_get_length(type); i++) {
const struct glsl_type *field_type; const struct glsl_type *field_type;
if (struct_or_ifc) { if (struct_or_ifc) {
@@ -395,7 +391,7 @@ iterate_type_fill_variables(const struct glsl_type *type,
field_type = glsl_get_array_element(type); field_type = glsl_get_array_element(type);
} }
if (glsl_type_is_leaf(field_type)) { if (glsl_type_is_leaf(field_type) || glsl_type_is_unsized_array(field_type)) {
fill_individual_variable(field_type, variables, variable_index, fill_individual_variable(field_type, variables, variable_index,
offset, prog, block); offset, prog, block);
} else { } else {