fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-28 13:00:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

nir/lower_robust_access: also handle image derefs

Browse source 
for unlowered image intrinsics

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/28681>
This commit is contained in:
Alyssa Rosenzweig 2024-04-10 11:54:07 -04:00 • committed by Marge Bot
parent fb187c9c89
commit 3ccf7208a2
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/compiler/nir/nir_lower_robust_access.c
View file

@ -113,11 +113,13 @@ lower_buffer_shared(nir_builder *b, nir_intrinsic_instr *instr)
static bool
lower_image(nir_builder *b,
nir_intrinsic_instr *instr,
const nir_lower_robust_access_options *opts)
const nir_lower_robust_access_options *opts, bool deref)
{
enum glsl_sampler_dim dim = nir_intrinsic_image_dim(instr);
bool atomic = (instr->intrinsic == nir_intrinsic_image_atomic ||
instr->intrinsic == nir_intrinsic_image_atomic_swap);
instr->intrinsic == nir_intrinsic_image_atomic_swap ||
instr->intrinsic == nir_intrinsic_image_deref_atomic ||
instr->intrinsic == nir_intrinsic_image_deref_atomic_swap);
if (!opts->lower_image &&
!(opts->lower_buffer_image && dim == GLSL_SAMPLER_DIM_BUF) &&
!(opts->lower_image_atomic && atomic))
@ -132,10 +134,13 @@ lower_image(nir_builder *b,
if (dim == GLSL_SAMPLER_DIM_CUBE && !is_array)
size_components -= 1;
nir_def *size =
nir_image_size(b, size_components, 32,
instr->src[0].ssa, nir_imm_int(b, 0),
.image_array = is_array, .image_dim = dim);
nir_def *size = nir_image_size(b, size_components, 32,
instr->src[0].ssa, nir_imm_int(b, 0),
.image_array = is_array, .image_dim = dim);
if (deref) {
nir_instr_as_intrinsic(size->parent_instr)->intrinsic =
nir_intrinsic_image_deref_size;
}
if (dim == GLSL_SAMPLER_DIM_CUBE) {
nir_def *z = is_array ? nir_imul_imm(b, nir_channel(b, size, 2), 6)
@ -164,7 +169,13 @@ lower(nir_builder *b, nir_instr *instr, void *_opts)
case nir_intrinsic_image_store:
case nir_intrinsic_image_atomic:
case nir_intrinsic_image_atomic_swap:
return lower_image(b, intr, opts);
return lower_image(b, intr, opts, false);
case nir_intrinsic_image_deref_load:
case nir_intrinsic_image_deref_store:
case nir_intrinsic_image_deref_atomic:
case nir_intrinsic_image_deref_atomic_swap:
return lower_image(b, intr, opts, true);
case nir_intrinsic_load_ubo:
if (opts->lower_ubo) {