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

glsl: refactor code to avoid static analyzer noise

Browse Source 
Clang analyzer thinks struct_base_offset can be used uninitialized
because it doesn't know that glsl_type_is_struct_or_ifc returns
the same value for the same type.

Refactor the code to make it clear what is going on. As a side effect
this should be faster because glsl_get_length and
glsl_type_is_struct_or_ifc will be called only once (they are not
inline functions).

This is an alternative approach to
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12399.

Signed-off-by: Marcin Ślusarz <marcin.slusarz@intel.com>
Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12403>
This commit is contained in:
Marcin Ślusarz
2021-08-17 11:17:18 +02:00
committed by Marge Bot
parent e6790d4a31
commit e3b4c77ed3
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -374,18 +374,22 @@ 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 int struct_base_offset; unsigned length = glsl_get_length(type);
if (length == 0)
return;
for (unsigned i = 0; i < glsl_get_length(type); i++) { unsigned struct_base_offset;
bool struct_or_ifc = glsl_type_is_struct_or_ifc(type);
if (struct_or_ifc)
struct_base_offset = *offset;
for (unsigned i = 0; i < length; i++) {
const struct glsl_type *field_type; const struct glsl_type *field_type;
if (glsl_type_is_struct_or_ifc(type)) { if (struct_or_ifc) {
field_type = glsl_get_struct_field(type, i); field_type = glsl_get_struct_field(type, i);
if (i == 0) {
struct_base_offset = *offset;
}
*offset = struct_base_offset + glsl_get_struct_field_offset(type, i); *offset = struct_base_offset + glsl_get_struct_field_offset(type, i);
} else { } else {
field_type = glsl_get_array_element(type); field_type = glsl_get_array_element(type);