From d8282badb0ef7dc3e2aa0ef115c00c9733ffc58a Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Mon, 5 Aug 2024 09:16:16 -0500 Subject: [PATCH] nak: Sample locations are byte-aligned Fixes: cc33cafcacb1 ("nak/nir: Use an indirect load for sample locations") Part-of: (cherry picked from commit 761874ea8577fb829c5ecfea11a7ec096d1ed201) --- .pick_status.json | 2 +- src/nouveau/compiler/nak_nir_lower_fs_inputs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index e97131ae56c..81b7e952fa0 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -734,7 +734,7 @@ "description": "nak: Sample locations are byte-aligned", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "cc33cafcacb1ad2eb9bb04283a57ee30385260fc", "notes": null diff --git a/src/nouveau/compiler/nak_nir_lower_fs_inputs.c b/src/nouveau/compiler/nak_nir_lower_fs_inputs.c index 1dd6bc37fc6..17b6637df1f 100644 --- a/src/nouveau/compiler/nak_nir_lower_fs_inputs.c +++ b/src/nouveau/compiler/nak_nir_lower_fs_inputs.c @@ -111,7 +111,7 @@ load_sample_pos_u4_at(nir_builder *b, nir_def *sample_id, nir_imm_int(b, fs_key->sample_locations_cb), nir_iadd_imm(b, sample_id, fs_key->sample_locations_offset), - .align_mul = 8, .align_offset = 0); + .align_mul = 1, .align_offset = 0); /* The rest of these calculations are in 32-bit */ loc = nir_u2u32(b, loc);