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

zink: never try to oom flush during unsync texture upload

Browse source 
this is very broken

cc: mesa-stable

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33484>
(cherry picked from commit 52dfe1e955)
This commit is contained in:
Mike Blumenkrantz 2025-02-10 14:38:03 -05:00 • committed by Eric Engestrom
parent 7bd126c0e6
commit a917c1f0bf
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

@ -144,7 +144,7 @@
"description": "zink: never try to oom flush during unsync texture upload",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

2
src/gallium/drivers/zink/zink_context.c
View file

@ -4839,7 +4839,7 @@ zink_copy_image_buffer(struct zink_context *ctx, struct zink_resource *dst, stru
zink_kopper_present_readback(ctx, img);
}
if (ctx->oom_flush && !ctx->in_rp && !ctx->unordered_blitting)
if (ctx->oom_flush && !ctx->in_rp && !ctx->unordered_blitting && !unsync)
flush_batch(ctx, false);
}