Module: Mesa Branch: master Commit: 4069d39465be2a54b52c5de77393603d9a6b3e5a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4069d39465be2a54b52c5de77393603d9a6b3e5a
Author: Marek Olšák <[email protected]> Date: Wed Sep 25 20:57:22 2013 +0200 r600g: remove compute_global_transfer_* calls from texture_transfer_map/unmap Textures can never have target==PIPE_BUFFER. --- src/gallium/drivers/r600/r600_texture.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c index d505d6b..dcceda3 100644 --- a/src/gallium/drivers/r600/r600_texture.c +++ b/src/gallium/drivers/r600/r600_texture.c @@ -25,7 +25,6 @@ * Corbin Simpson */ #include "r600_formats.h" -#include "evergreen_compute.h" #include "r600d.h" #include <errno.h> @@ -774,10 +773,6 @@ static void *r600_texture_transfer_map(struct pipe_context *ctx, unsigned offset = 0; char *map; - if ((texture->bind & PIPE_BIND_GLOBAL) && texture->target == PIPE_BUFFER) { - return r600_compute_global_transfer_map(ctx, texture, level, usage, box, ptransfer); - } - /* We cannot map a tiled texture directly because the data is * in a different order, therefore we do detiling using a blit. * @@ -917,10 +912,6 @@ static void r600_texture_transfer_unmap(struct pipe_context *ctx, struct pipe_resource *texture = transfer->resource; struct r600_texture *rtex = (struct r600_texture*)texture; - if ((transfer->resource->bind & PIPE_BIND_GLOBAL) && transfer->resource->target == PIPE_BUFFER) { - return r600_compute_global_transfer_unmap(ctx, transfer); - } - if (rtransfer->staging) { buf = ((struct r600_resource *)rtransfer->staging)->cs_buf; } else { _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
