fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-12 03:08:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

zink: block more flushes during unordered blits

Browse source 
Fixes: 89aa363593 ("zink: block oom flushes during unordered blits")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22931>
(cherry picked from commit c6fd588027)
This commit is contained in:
Mike Blumenkrantz 2023-05-03 13:16:25 -04:00 • committed by Eric Engestrom
parent baba0ca1f6
commit 752c2f6643
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -130,7 +130,7 @@
"description": "zink: block more flushes during unordered blits",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "89aa36359328ea48fa29be8dd439dd87043eaa03"
},

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

@ -4411,7 +4411,7 @@ zink_copy_image_buffer(struct zink_context *ctx, struct zink_resource *dst, stru
if (needs_present_readback)
zink_kopper_present_readback(ctx, img);
if (ctx->oom_flush && !ctx->batch.in_rp)
if (ctx->oom_flush && !ctx->batch.in_rp && !ctx->unordered_blitting)
flush_batch(ctx, false);
}
@ -4541,7 +4541,7 @@ zink_resource_copy_region(struct pipe_context *pctx,
zink_copy_buffer(ctx, dst, src, dstx, src_box->x, src_box->width);
} else
zink_copy_image_buffer(ctx, dst, src, dst_level, dstx, dsty, dstz, src_level, src_box, 0);
if (ctx->oom_flush && !ctx->batch.in_rp)
if (ctx->oom_flush && !ctx->batch.in_rp && !ctx->unordered_blitting)
flush_batch(ctx, false);
}