diff --git a/.pick_status.json b/.pick_status.json index 23ee0914434..f65dc34a0ae 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -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 diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index d51e1891131..ee441813021 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -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); }