diff --git a/.pick_status.json b/.pick_status.json index 93613a7f450..e1e8000d129 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -9744,7 +9744,7 @@ "description": "tgsi: Fixes ntt_should_vectorize_io parameters", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "5f757bb95c20cdebed578b851e9f204b8aa6c014", "notes": null diff --git a/src/gallium/auxiliary/nir/nir_to_tgsi.c b/src/gallium/auxiliary/nir/nir_to_tgsi.c index 75fd0504e5d..0a01be5852e 100644 --- a/src/gallium/auxiliary/nir/nir_to_tgsi.c +++ b/src/gallium/auxiliary/nir/nir_to_tgsi.c @@ -3267,14 +3267,17 @@ ntt_should_vectorize_instr(const nir_instr *instr, const void *data) return 4; } -/* TODO: These parameters are wrong. */ static bool -ntt_should_vectorize_io(unsigned align, unsigned bit_size, - unsigned num_components, unsigned high_offset, +ntt_should_vectorize_io(unsigned align_mul, + unsigned align_offset, + unsigned bit_size, + unsigned num_components, int64_t hole_size, nir_intrinsic_instr *low, nir_intrinsic_instr *high, void *data) { + const uint32_t align = nir_combined_align(align_mul, align_offset); + if (bit_size != 32 || hole_size > 0 || !nir_num_components_valid(num_components)) return false;