From 5986203fdb88729d9ad5553c7641a43d3b857bdc Mon Sep 17 00:00:00 2001 From: Qiang Yu Date: Wed, 5 Apr 2023 09:52:01 +0800 Subject: [PATCH] ac/nir/ngg: fix store shared alignment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For stream!=0, this align_mul=4 is not true. Not observe any problem yet, just for correctness. Fixes: 60ac5dda82e ("ac: Add NIR lowering for NGG GS.") Reviewed-by: Marek Olšák Reviewed-by: Timur Kristóf Signed-off-by: Qiang Yu Part-of: (cherry picked from commit a2cecbbc44b6b167e4c2c9a6c25c668577185b30) --- .pick_status.json | 2 +- src/amd/common/ac_nir_lower_ngg.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 5b08cbb62b6..ab480e960d3 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -5904,7 +5904,7 @@ "description": "ac/nir/ngg: fix store shared alignment", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "60ac5dda82e1a5c020aa51a02fa65131e9bfb2ca", "notes": null diff --git a/src/amd/common/ac_nir_lower_ngg.c b/src/amd/common/ac_nir_lower_ngg.c index d7f6bbd0db8..11100e0ca8b 100644 --- a/src/amd/common/ac_nir_lower_ngg.c +++ b/src/amd/common/ac_nir_lower_ngg.c @@ -2752,7 +2752,10 @@ lower_ngg_gs_emit_vertex_with_counter(nir_builder *b, nir_intrinsic_instr *intri prim_flag = nir_ior(b, prim_flag, odd_flag); } - nir_store_shared(b, nir_u2u8(b, prim_flag), gs_emit_vtx_addr, .base = s->lds_offs_primflags + stream, .align_mul = 4u); + nir_store_shared(b, nir_u2u8(b, prim_flag), gs_emit_vtx_addr, + .base = s->lds_offs_primflags + stream, + .align_mul = 4, .align_offset = stream); + nir_instr_remove(&intrin->instr); return true; }