AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir/lower_robust_access: handle MSAA images

Browse Source 
We need to check the sample too. fixes on Honeykrisp with MSAA storage images:

dEQP-VK.robustness.robustness2.bind.notemplate.r32i.dontunroll.nonvolatile.storage_image.fmt_qual.img.samples_4.2d_array.comp

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29741>
This commit is contained in:
Alyssa Rosenzweig
2024-06-12 10:56:01 -04:00
committed by Marge Bot
parent bd59478d2f
commit 574c5c70de
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/nir/nir_lower_robust_access.c
+15 -1
View File
@@ -149,8 +149,22 @@ lower_image(nir_builder *b,
size = nir_vec3(b, nir_channel(b, size, 0), nir_channel(b, size, 1), z);
}
nir_def *in_bounds = nir_ball(b, nir_ult(b, coord, size));
if (dim == GLSL_SAMPLER_DIM_MS) {
nir_def *sample = instr->src[2].ssa;
nir_def *samples = nir_image_samples(b, 32, instr->src[0].ssa,
.image_array = is_array, .image_dim = dim);
if (deref) {
nir_instr_as_intrinsic(samples->parent_instr)->intrinsic =
nir_intrinsic_image_deref_samples;
}
in_bounds = nir_iand(b, in_bounds, nir_ult(b, sample, samples));
}
/* Only execute if coordinates are in-bounds. Otherwise, return zero. */
wrap_in_if(b, instr, nir_ball(b, nir_ult(b, coord, size)));
wrap_in_if(b, instr, in_bounds);
return true;
}