From a2cecbbc44b6b167e4c2c9a6c25c668577185b30 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: --- src/amd/common/ac_nir_lower_ngg.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/amd/common/ac_nir_lower_ngg.c b/src/amd/common/ac_nir_lower_ngg.c index af8032290b8..b6569ac4c5c 100644 --- a/src/amd/common/ac_nir_lower_ngg.c +++ b/src/amd/common/ac_nir_lower_ngg.c @@ -2777,7 +2777,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; }