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

zink: remove compute cruft from resource mapping

Browse source 
this used to sync the compute batch, now it does nothing

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10707>
This commit is contained in:
Mike Blumenkrantz 2021-04-19 16:34:56 -04:00 • committed by Marge Bot
parent b0c51cdc9e
commit 9e5d927d22
1 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -83,14 +83,6 @@ get_resource_usage(struct zink_resource *res)
return batch_uses;
}
static void
resource_sync_reads(struct zink_context *ctx, struct zink_resource *res)
{
uint32_t reads = p_atomic_read(&res->obj->reads.usage);
assert(reads);
zink_wait_on_batch(ctx, reads);
}
static void
resource_sync_writes_from_batch_usage(struct zink_context *ctx, struct zink_resource *res)
{
@ -1043,14 +1035,11 @@ zink_transfer_map(struct pipe_context *pctx,
base = map_resource(screen, res);
if (!base)
return NULL;
/* special case compute reads since they aren't handled by zink_fence_wait() */
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)) {
if (usage & PIPE_MAP_READ)
resource_sync_writes_from_batch_usage(ctx, res);
else
if (usage & PIPE_MAP_WRITE)
zink_fence_wait(pctx);
else
resource_sync_writes_from_batch_usage(ctx, res);
}
VkImageSubresource isr = {
res->aspect,