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

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>
This commit is contained in:
Mike Blumenkrantz 2021-04-20 14:40:05 -04:00 • committed by Marge Bot
parent 28a9f54095
commit 82710b8fc4
1 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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,