From d8b32f898039e4eee0fb75c8dd4424c4f8c00027 Mon Sep 17 00:00:00 2001 From: Olivia Lee Date: Thu, 18 Sep 2025 07:50:20 -0700 Subject: [PATCH] panvk: pass correct variant shader/compile inputs to panvk_lower_nir Previously we were passing the original compile inputs, rather than the variant-specific inputs. No actual bugs are caused by this because we don't use the variant infrastructure for anything yet. Fixes: ff9907927fe ("panvk: Add basic infrastructure for shader variants") Signed-off-by: Olivia Lee Reviewed-by: Mary Guillemard Part-of: --- src/panfrost/vulkan/panvk_vX_shader.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/panfrost/vulkan/panvk_vX_shader.c b/src/panfrost/vulkan/panvk_vX_shader.c index 49ed646b943..52734f804ad 100644 --- a/src/panfrost/vulkan/panvk_vX_shader.c +++ b/src/panfrost/vulkan/panvk_vX_shader.c @@ -1361,9 +1361,10 @@ panvk_compile_shader(struct panvk_device *dev, */ nir_variants[v] = last ? nir : nir_shader_clone(NULL, nir); - panvk_lower_nir(dev, nir, info->set_layout_count, info->set_layouts, - info->robustness, noperspective_varyings, state, - &inputs, variant); + panvk_lower_nir(dev, nir_variants[v], info->set_layout_count, + info->set_layouts, info->robustness, + noperspective_varyings, state, &input_variants[v], + variant); /* Allow the remaining FAU space to be filled with constants. */ input_variants[v].fau_consts.max_amount =