fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-26 19:20:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: optimize transfer_map for resources with pending reads/writes

Browse source 
we don't need to stall here if we know that we're not about to have any io
conflicts in the buffer

Reviewed-by: Erik Faye-Lun <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6924>
This commit is contained in:
Mike Blumenkrantz 2020-06-26 15:16:17 -04:00
parent c6687eef2d
commit e3ed624072
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -425,6 +425,15 @@ zink_transfer_copy_bufimage(struct zink_context *ctx,
return true;
}
static uint32_t
get_resource_usage(struct zink_resource *res)
{
uint32_t batch_uses = 0;
for (unsigned i = 0; i < 4; i++)
batch_uses |= p_atomic_read(&res->batch_uses[i]) << i;
return batch_uses;
}
static void *
zink_transfer_map(struct pipe_context *pctx,
struct pipe_resource *pres,
@ -436,6 +445,7 @@ zink_transfer_map(struct pipe_context *pctx,
struct zink_context *ctx = zink_context(pctx);
struct zink_screen *screen = zink_screen(pctx->screen);
struct zink_resource *res = zink_resource(pres);
uint32_t batch_uses = get_resource_usage(res);
struct zink_transfer *trans = slab_alloc(&ctx->transfer_pool);
if (!trans)
@ -451,12 +461,15 @@ zink_transfer_map(struct pipe_context *pctx,
void *ptr;
if (pres->target == PIPE_BUFFER) {
if (usage & PIPE_MAP_READ) {
/* need to wait for rendering to finish
* TODO: optimize/fix this to be much less obtrusive
* mesa/mesa#2966
*/
zink_fence_wait(pctx);
if (!(usage & PIPE_MAP_UNSYNCHRONIZED)) {
if ((usage & PIPE_MAP_READ && batch_uses >= ZINK_RESOURCE_ACCESS_WRITE) ||
(usage & PIPE_MAP_WRITE && batch_uses)) {
/* need to wait for rendering to finish
* TODO: optimize/fix this to be much less obtrusive
* mesa/mesa#2966
*/
zink_fence_wait(pctx);
}
}