From 930fb692d425ac2cb2b9446f071244941b01effd Mon Sep 17 00:00:00 2001 From: Gorazd Sumkovski Date: Fri, 4 Jul 2025 14:26:02 +0100 Subject: [PATCH] panfrost: Fix incorrect condition in assert Since commit 8bb46de0, the correct way to check for a compute shader is with `gl_shader_stage_is_compute()`. Fixes: d2838f3c ("pan/bi: handle barriers with SUBGROUP scope") Reviewed-by: Iago Toral Quiroga Reviewed-by: John Anthony Part-of: (cherry picked from commit 7bc1c456cb43c7f5234e57371c9dc99d50c4ccd6) --- .pick_status.json | 2 +- src/panfrost/compiler/bifrost_compile.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index f6c83c60a5e..7f8278b2620 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4604,7 +4604,7 @@ "description": "panfrost: Fix incorrect condition in assert", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "d2838f3ceb9d4bb9796dec5324264f44d9586426", "notes": null diff --git a/src/panfrost/compiler/bifrost_compile.c b/src/panfrost/compiler/bifrost_compile.c index 38337927aa6..2c325573038 100644 --- a/src/panfrost/compiler/bifrost_compile.c +++ b/src/panfrost/compiler/bifrost_compile.c @@ -2022,7 +2022,7 @@ bi_emit_intrinsic(bi_builder *b, nir_intrinsic_instr *instr) break; case SCOPE_WORKGROUP: - assert(b->shader->stage == MESA_SHADER_COMPUTE); + assert(gl_shader_stage_is_compute(b->shader->stage)); bi_barrier(b); /* * Blob doesn't seem to do anything for memory barriers, so no need to