From 665974c9346048c9190cd48e184e95c9a615f39e Mon Sep 17 00:00:00 2001 From: Olivia Lee Date: Tue, 7 Apr 2026 00:01:05 -0700 Subject: [PATCH] panfrost: don't try to emit varying shader stats on v12+ On v12+, IDVS no longer has separate position and varying variants, so we only need to emit stats for one binary. Attempting to emit stats for the nonexistent varying shader breaks shader-db. Fixes: 7819b103fa7 ("pan/bi: Add support for IDVS2 on Avalon") Signed-off-by: Olivia Lee Reviewed-by: Lars-Ivar Hesselberg Simonsen Reviewed-by: Eric R. Smith (cherry picked from commit 31ddfe26ebc18aa83c86ef44b2aeeefd6dfab51b) Part-of: --- .pick_status.json | 2 +- src/gallium/drivers/panfrost/pan_shader.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 74ace4f1643..f5200b5fcc7 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2464,7 +2464,7 @@ "description": "panfrost: don't try to emit varying shader stats on v12+", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "7819b103fa70b79e4f3de5b8a2bf6705ecacca9c", "notes": null diff --git a/src/gallium/drivers/panfrost/pan_shader.c b/src/gallium/drivers/panfrost/pan_shader.c index b349dcbe3b9..e571beec918 100644 --- a/src/gallium/drivers/panfrost/pan_shader.c +++ b/src/gallium/drivers/panfrost/pan_shader.c @@ -220,7 +220,8 @@ panfrost_shader_compile(struct panfrost_screen *screen, const nir_shader *ir, /* Report stats only if we really got the shader compiled */ if (out->binary.size > 0) { - if (s->info.stage == MESA_SHADER_VERTEX && out->info.vs.idvs) { + if (s->info.stage == MESA_SHADER_VERTEX && + out->info.vs.secondary_offset) { pan_stats_util_debug(dbg, "MESA_SHADER_POSITION", &out->info.stats); pan_stats_util_debug(dbg, "MESA_SHADER_VERTEX",