fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-20 03:20:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi: prevent u_blitter recursion in si_update_ps_colorbuf0_slot

Browse source 
When u_blitter calls util_blitter_restore_fragment_states we may
end up in si_update_ps_colorbuf0_slot.
This commit makes sure we don't call u_blitter from there.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6921
Cc: mesa-stable
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17981>
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2022-08-10 12:31:35 +02:00
parent 6b91ca7ce0
commit fddb4eda2f
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/radeonsi/si_descriptors.c
View file

@ -947,7 +947,7 @@ void si_update_ps_colorbuf0_slot(struct si_context *sctx)
struct pipe_surface *surf = NULL;
/* si_texture_disable_dcc can get us here again. */
if (sctx->in_update_ps_colorbuf0_slot) {
if (sctx->in_update_ps_colorbuf0_slot || sctx->blitter_running) {
assert(!sctx->ps_uses_fbfetch || sctx->framebuffer.state.cbufs[0]);
return;
}