From 3dea1bd33da50fae360255c16ad2016c238d90b9 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 10 Mar 2026 12:04:44 -0400 Subject: [PATCH] nir: fix nir_is_io_compact for mesh shaders MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cc: mesa-stable Reviewed-by: Marek Olšák (cherry picked from commit e604a8f61725488b797981aa8630f1e5c8faa145) Part-of: --- .pick_status.json | 2 +- src/compiler/nir/nir_unlower_io_to_vars.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 6df2ac72438..0cedb5a24ad 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1564,7 +1564,7 @@ "description": "nir: fix nir_is_io_compact for mesh shaders", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/compiler/nir/nir_unlower_io_to_vars.c b/src/compiler/nir/nir_unlower_io_to_vars.c index ee2658e3a60..5eaf26d4b22 100644 --- a/src/compiler/nir/nir_unlower_io_to_vars.c +++ b/src/compiler/nir/nir_unlower_io_to_vars.c @@ -77,8 +77,8 @@ is_compact(nir_shader *nir, bool is_output, unsigned location) location == VARYING_SLOT_CLIP_DIST1 || location == VARYING_SLOT_CULL_DIST0 || location == VARYING_SLOT_CULL_DIST1 || - location == VARYING_SLOT_TESS_LEVEL_OUTER || - location == VARYING_SLOT_TESS_LEVEL_INNER); + (nir->info.stage != MESA_SHADER_MESH && location == VARYING_SLOT_TESS_LEVEL_OUTER) || + (nir->info.stage != MESA_SHADER_MESH && location == VARYING_SLOT_TESS_LEVEL_INNER)); } /* Get information about the intrinsic. */