Module: Mesa Branch: master Commit: 31765340fd61f6b721e583b19d89e3af77d5587c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=31765340fd61f6b721e583b19d89e3af77d5587c
Author: Marek Olšák <[email protected]> Date: Wed Jul 1 08:41:11 2020 -0400 gallium: rename transfer flags -> map flags in comments Acked-by: Eric Anholt <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5749> --- src/gallium/auxiliary/util/u_threaded_context.h | 2 +- src/gallium/drivers/etnaviv/etnaviv_transfer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/auxiliary/util/u_threaded_context.h b/src/gallium/auxiliary/util/u_threaded_context.h index e0e76ec527a..29e436fd992 100644 --- a/src/gallium/auxiliary/util/u_threaded_context.h +++ b/src/gallium/auxiliary/util/u_threaded_context.h @@ -191,7 +191,7 @@ struct threaded_context; struct tc_unflushed_batch_token; -/* These are transfer flags sent to drivers. */ +/* These are map flags sent to drivers. */ /* Never infer whether it's safe to use unsychronized mappings: */ #define TC_TRANSFER_MAP_NO_INFER_UNSYNCHRONIZED (1u << 29) /* Don't invalidate buffers: */ diff --git a/src/gallium/drivers/etnaviv/etnaviv_transfer.c b/src/gallium/drivers/etnaviv/etnaviv_transfer.c index e448f4aed07..33b8e48de1f 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_transfer.c +++ b/src/gallium/drivers/etnaviv/etnaviv_transfer.c @@ -270,7 +270,7 @@ etna_transfer_map(struct pipe_context *pctx, struct pipe_resource *prsc, * resources, but only if the RS can blit them. */ if (usage & PIPE_MAP_DIRECTLY) { slab_free(&ctx->transfer_pool, trans); - BUG("unsupported transfer flags %#x with tile status/tiled layout", usage); + BUG("unsupported map flags %#x with tile status/tiled layout", usage); return NULL; } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
