From 6f0eb911f71bb44c8b9a5cff6046659404ea487a Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Mon, 10 Mar 2025 15:07:33 +0100 Subject: [PATCH] st/mesa: fix nir_load_per_vertex_input parameter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit num_components should be 1 as we're loading an offset value. Fixes: ec68f0492b7 ("st/mesa: switch GL_SELECT shader to IO intrinsics") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12774 Reviewed-by: Alyssa Rosenzweig Reviewed-by: Marek Olšák Part-of: (cherry picked from commit 770b5bc7577d775e1d92775d36af0ff617fb2365) --- .pick_status.json | 2 +- src/mesa/state_tracker/st_draw_hw_select.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 4a7a993134a..f6df6778592 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2284,7 +2284,7 @@ "description": "st/mesa: fix nir_load_per_vertex_input parameter", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "ec68f0492b7540b374837dab6f4968cdbbfee7ef", "notes": null diff --git a/src/mesa/state_tracker/st_draw_hw_select.c b/src/mesa/state_tracker/st_draw_hw_select.c index 9a4fc9ddcd1..150983ab162 100644 --- a/src/mesa/state_tracker/st_draw_hw_select.c +++ b/src/mesa/state_tracker/st_draw_hw_select.c @@ -391,7 +391,7 @@ update_result_buffer(nir_builder *b, nir_def *dmin, nir_def *dmax, { nir_def *offset; if (offset_from_attribute) { - offset = nir_load_per_vertex_input(b, 4, 32, nir_imm_int(b, 0), + offset = nir_load_per_vertex_input(b, 1, 32, nir_imm_int(b, 0), nir_imm_int(b, 0), .io_semantics.location = VARYING_SLOT_VAR0); } else {