From: Marek Olšák Date: Thu, 19 Jun 2014 21:34:27 +0000 (+0200) Subject: gallium: fix u_default_transfer_inline_write for textures X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fe6be9926f63e68d9007571956bed0687003e932;p=mesa.git gallium: fix u_default_transfer_inline_write for textures This doesn't fix any known issue. In fact, radeon drivers ignore all the discard flags for textures and implicitly do "discard range" for any write transfer. Cc: mesa-stable@lists.freedesktop.org Reviewed-by: Roland Scheidegger --- diff --git a/src/gallium/auxiliary/util/u_transfer.c b/src/gallium/auxiliary/util/u_transfer.c index 7804f2a82ea..71da35d6d39 100644 --- a/src/gallium/auxiliary/util/u_transfer.c +++ b/src/gallium/auxiliary/util/u_transfer.c @@ -25,8 +25,8 @@ void u_default_transfer_inline_write( struct pipe_context *pipe, usage |= PIPE_TRANSFER_WRITE; /* transfer_inline_write implicitly discards the rewritten buffer range */ - /* XXX this looks very broken for non-buffer resources having more than one dim. */ - if (box->x == 0 && box->width == resource->width0) { + if (resource->target == PIPE_BUFFER && + box->x == 0 && box->width == resource->width0) { usage |= PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE; } else { usage |= PIPE_TRANSFER_DISCARD_RANGE;