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

Revert "zink: force scanout sync when mapping scanout resource"

Browse source 
This reverts commit 874535752b.

Reviewed-by: Adam Jackson <ajax@redhat.com>

Fixes: 874535752b ("zink: force scanout sync when mapping scanout resource")

Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10358>
(cherry picked from commit 82710b8fc4)
This commit is contained in:
Mike Blumenkrantz 2021-04-20 14:40:05 -04:00 • committed by Eric Engestrom
parent 368b5e4561
commit 0e3547af95
2 changed files with 1 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -103,7 +103,7 @@
"description": "Revert \"zink: force scanout sync when mapping scanout resource\"",
"nominated": false,
"nomination_type": 2,
"resolution": 4,
"resolution": 1,
"master_sha": null,
"because_sha": "874535752b497bd8ab49cf97add6de2ed9b16f81"
},

18
src/gallium/drivers/zink/zink_resource.c
View file

@ -1003,17 +1003,8 @@ zink_transfer_map(struct pipe_context *pctx,
if (usage & PIPE_MAP_READ) {
zink_transfer_copy_bufimage(ctx, staging_res, res, trans);
/* TODO: remove for wsi */
struct zink_resource *scanout = NULL;
if (res->scanout_obj) {
scanout = ctx->flush_res;
ctx->flush_res = res;
}
/* need to wait for rendering to finish */
zink_fence_wait(pctx);
/* TODO: remove for wsi */
if (res->scanout_obj)
ctx->flush_res = scanout;
}
ptr = base = map_resource(screen, staging_res);
@ -1028,19 +1019,10 @@ zink_transfer_map(struct pipe_context *pctx,
if (zink_resource_has_usage(res, ZINK_RESOURCE_ACCESS_READ))
resource_sync_reads(ctx, res);
if (zink_resource_has_usage(res, ZINK_RESOURCE_ACCESS_RW)) {
/* TODO: remove for wsi */
struct zink_resource *scanout = NULL;
if (res->scanout_obj) {
scanout = ctx->flush_res;
ctx->flush_res = res;
}
if (usage & PIPE_MAP_READ)
resource_sync_writes_from_batch_usage(ctx, res);
else
zink_fence_wait(pctx);
/* TODO: remove for wsi */
if (res->scanout_obj)
ctx->flush_res = scanout;
}
VkImageSubresource isr = {
res->aspect,