zink: fix atomic ssbo fadd offsets

Fixes: 99a4a9c6ff ("zink: fix atomic ssbo indexing with non-32bit values")

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18684>
(cherry picked from commit e13e139bcb)
This commit is contained in:
Mike Blumenkrantz 2022-09-19 15:54:37 -04:00 committed by Dylan Baker
parent 553e016cff
commit aff9edc12f
2 changed files with 3 additions and 1 deletions

View file

@ -4162,7 +4162,7 @@
"description": "zink: fix atomic ssbo fadd offsets",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "99a4a9c6ff09f4a326341432ca75f18ddcdc0bf8"
},

View file

@ -1051,6 +1051,7 @@ rewrite_bo_access_instr(nir_builder *b, nir_instr *instr, void *data)
nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
b->cursor = nir_before_instr(instr);
switch (intr->intrinsic) {
case nir_intrinsic_ssbo_atomic_fadd:
case nir_intrinsic_ssbo_atomic_add:
case nir_intrinsic_ssbo_atomic_umin:
case nir_intrinsic_ssbo_atomic_imin:
@ -2334,6 +2335,7 @@ analyze_io(struct zink_shader *zs, nir_shader *shader)
ret = true;
break;
}
case nir_intrinsic_ssbo_atomic_fadd:
case nir_intrinsic_ssbo_atomic_add:
case nir_intrinsic_ssbo_atomic_imin:
case nir_intrinsic_ssbo_atomic_umin: