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

nir: fix crash in varying packing on interface mismatch

Browse Source 
For example when the outputs are scalars but the inputs are struct
members.

Fixes: 26aa460940 ("nir: rewrite varying component packing")

Reviewed-By: Timur Kristóf <timur.kristof@gmail.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4351>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4351>
This commit is contained in:
Timothy Arceri
2020-03-28 02:17:54 +11:00
committed by Marge Bot
parent 31011c7a39
commit 0f4a81430e
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/compiler/nir/nir_linking_helpers.c
View File

@@ -569,6 +569,7 @@ gather_varying_component_info(nir_shader *producer, nir_shader *consumer,
vc_info->is_32bit = glsl_type_is_32bit(type); vc_info->is_32bit = glsl_type_is_32bit(type);
vc_info->is_patch = in_var->data.patch; vc_info->is_patch = in_var->data.patch;
vc_info->is_intra_stage_only = false; vc_info->is_intra_stage_only = false;
vc_info->initialised = true;
} }
} }
} }
@@ -604,8 +605,14 @@ gather_varying_component_info(nir_shader *producer, nir_shader *consumer,
unsigned var_info_idx = unsigned var_info_idx =
store_varying_info_idx[location][out_var->data.location_frac]; store_varying_info_idx[location][out_var->data.location_frac];
if (!var_info_idx) if (!var_info_idx) {
continue; /* Something went wrong, the shader interfaces didn't match, so
* abandon packing. This can happen for example when the
* inputs are scalars but the outputs are struct members.
*/
*varying_comp_info_size = 0;
break;
}
struct varying_component *vc_info = struct varying_component *vc_info =
&(*varying_comp_info)[var_info_idx-1]; &(*varying_comp_info)[var_info_idx-1];
@@ -624,10 +631,23 @@ gather_varying_component_info(nir_shader *producer, nir_shader *consumer,
vc_info->is_32bit = glsl_type_is_32bit(type); vc_info->is_32bit = glsl_type_is_32bit(type);
vc_info->is_patch = out_var->data.patch; vc_info->is_patch = out_var->data.patch;
vc_info->is_intra_stage_only = true; vc_info->is_intra_stage_only = true;
vc_info->initialised = true;
} }
} }
} }
} }
for (unsigned i = 0; i < *varying_comp_info_size; i++ ) {
struct varying_component *vc_info = &(*varying_comp_info)[i];
if (!vc_info->initialised) {
/* Something went wrong, the shader interfaces didn't match, so
* abandon packing. This can happen for example when the outputs are
* scalars but the inputs are struct members.
*/
*varying_comp_info_size = 0;
break;
}
}
} }
static void static void