fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 13:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

panfrost: Fix incorrect condition in assert

Browse source 
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 <itoral@igalia.com>
Reviewed-by: John Anthony <john.anthony@arm.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35957>
(cherry picked from commit 7bc1c456cb)
This commit is contained in:
Gorazd Sumkovski 2025-07-04 14:26:02 +01:00 • committed by Eric Engestrom
parent 74a0710a39
commit 930fb692d4
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -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

2
src/panfrost/compiler/bifrost_compile.c
View file

@ -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