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

hk: Fix crash in hk_handle_passthrough_gs

Browse source 
We should be returning if no GS is needed and no GS shader is bound.
This fix various segfaults introduced by the original fix.

Signed-off-by: Mary Guillemard <mary@mary.zone>
Fixes: e10f29399f ("hk: fix passthrough GS key invalidation")
Reviewed-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Janne Grunau <j@jannau.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40079>
This commit is contained in:
Mary Guillemard 2026-02-24 21:21:15 +01:00 • committed by Marge Bot
parent 487586fefa
commit 6d040df750
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/asahi/vulkan/hk_cmd_draw.c
View file

@ -3226,9 +3226,11 @@ hk_handle_passthrough_gs(struct hk_cmd_buffer *cmd, struct agx_draw draw)
bool needs_gs = xfb_outputs;
/* If we don't need a GS but we do have a passthrough, unbind it */
if (!needs_gs && gs != NULL) {
assert(!needs_gs && gs->is_passthrough);
hk_cmd_bind_graphics_shader(cmd, MESA_SHADER_GEOMETRY, NULL);
if (!needs_gs) {
if (gs != NULL) {
assert(gs->is_passthrough);
hk_cmd_bind_graphics_shader(cmd, MESA_SHADER_GEOMETRY, NULL);
}
return;
}