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

intel/compiler: fixup Gen12 workaround for array sizes

Browse Source 
We didn't handle the case of NULL images/textures for which we should
return 0.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: 397ff2976b ("intel: Implement Gen12 workaround for array textures of size 1")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3522
Reviewed-by: Ivan Briano <ivan.briano@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6729>
This commit is contained in:
Lionel Landwerlin
2020-09-15 15:33:14 +03:00
committed by Marge Bot
parent 54b9013e4c
commit cc3bf00cc2
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/intel/compiler/brw_nir_clamp_image_1d_2d_array_sizes.c
View File

@@ -107,12 +107,29 @@ brw_nir_clamp_image_1d_2d_array_sizes(nir_shader *shader)
b.cursor = nir_after_instr(instr);
nir_ssa_def *components[4];
/* OR all the sizes for all components but the last. */
nir_ssa_def *or_components = nir_imm_int(&b, 0);
for (int i = 0; i < image_size->num_components; i++) {
if (i == (image_size->num_components - 1)) {
components[i] = nir_imax(&b, nir_channel(&b, image_size, i),
nir_imm_int(&b, 1));
nir_ssa_def *null_or_size[2] = {
nir_imm_int(&b, 0),
nir_imax(&b, nir_channel(&b, image_size, i),
nir_imm_int(&b, 1)),
};
nir_ssa_def *vec2_null_or_size = nir_vec(&b, null_or_size, 2);
/* Using the ORed sizes select either the element 0 or 1
* from this vec2. For NULL textures which have a size of
* 0x0x0, we'll select the first element which is 0 and for
* the rest MAX(depth, 1).
*/
components[i] =
nir_vector_extract(&b, vec2_null_or_size,
nir_imin(&b, or_components,
nir_imm_int(&b, 1)));
} else {
components[i] = nir_channel(&b, image_size, i);
or_components = nir_ior(&b, components[i], or_components);
}
}
nir_ssa_def *image_size_replacement =