fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 11:28:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

nir/propagate_invariant: handle images
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
No fossil-db changes.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Georg Lehmann <dadschoorse@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40740>
This commit is contained in:
Rhys Perry 2026-04-02 11:43:12 +01:00 • committed by Marge Bot
parent 4d65a7d16e
commit 54515bf8d1
1 changed files with 50 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/compiler/nir/nir_propagate_invariant.c
View file

@ -123,6 +123,30 @@ var_is_invariant(const nir_deref_instr *deref, struct set *invariants, uint8_t *
}
}
static bool
is_image(nir_intrinsic_op intrin, bool read)
{
switch (intrin) {
#define CASE(op) \
case nir_intrinsic_image_deref_##op: \
case nir_intrinsic_image_##op: \
case nir_intrinsic_bindless_image_##op: \
case nir_intrinsic_image_heap_##op:
CASE(load)
CASE(sparse_load)
CASE(samples_identical)
return read;
CASE(store)
return !read;
CASE(atomic)
CASE(atomic_swap)
return true;
#undef CASE
default:
return false;
}
}
static void
propagate_invariant_instr(nir_instr *instr, struct set *invariants, uint8_t *var_invariant)
{
@ -168,6 +192,23 @@ propagate_invariant_instr(nir_instr *instr, struct set *invariants, uint8_t *var
break;
}
if (is_image(intrin->intrinsic, false)) {
uint8_t img_flags = 0, buf_flags = 0;
if (nir_intrinsic_image_dim(intrin) == GLSL_SAMPLER_DIM_BUF) {
buf_flags |= var_invariant[ffs(nir_var_mem_ssbo) - 1] |
var_invariant[ffs(nir_var_mem_global) - 1];
} else {
img_flags |= var_invariant[ffs(nir_var_image) - 1];
}
if ((img_flags & var_any_invariant) ||
(buf_flags & (var_all_invariant | var_all_alias_invariant))) {
add_src(&intrin->src[3], invariants);
if (nir_intrinsic_infos[intrin->intrinsic].num_srcs > 4)
add_src(&intrin->src[4], invariants);
}
}
if (nir_intrinsic_infos[intrin->intrinsic].has_dest &&
def_is_invariant(&intrin->def, invariants)) {
if (nir_intrinsic_has_fp_math_ctrl(intrin)) {
@ -176,6 +217,15 @@ propagate_invariant_instr(nir_instr *instr, struct set *invariants, uint8_t *var
}
nir_foreach_src(instr, add_src_cb, invariants);
if (is_image(intrin->intrinsic, true)) {
uint8_t img_flags = var_any_invariant | var_all_invariant | var_all_alias_invariant;
uint8_t buf_flags = var_any_invariant | var_all_alias_invariant;
if (nir_intrinsic_image_dim(intrin) == GLSL_SAMPLER_DIM_BUF)
var_invariant[ffs(nir_var_mem_ssbo) - 1] |= buf_flags;
else
var_invariant[ffs(nir_var_image) - 1] |= img_flags;
}
}
break;
}