From: Marek Olšák <marek.ol...@amd.com>

Also set the unsynchronized flag if the whole resource was discarded
to avoid doing buffer-busy checks again.
---
 src/gallium/drivers/radeon/r600_buffer_common.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/gallium/drivers/radeon/r600_buffer_common.c 
b/src/gallium/drivers/radeon/r600_buffer_common.c
index ac5fbcc..66e9d57 100644
--- a/src/gallium/drivers/radeon/r600_buffer_common.c
+++ b/src/gallium/drivers/radeon/r600_buffer_common.c
@@ -205,6 +205,12 @@ static void *r600_buffer_transfer_map(struct pipe_context 
*ctx,
                usage |= PIPE_TRANSFER_UNSYNCHRONIZED;
        }
 
+       /* If discarding the entire range, discard the whole resource instead. 
*/
+       if (usage & PIPE_TRANSFER_DISCARD_RANGE &&
+           box->x == 0 && box->width == resource->width0) {
+               usage |= PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE;
+       }
+
        if (usage & PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE &&
            !(usage & PIPE_TRANSFER_UNSYNCHRONIZED)) {
                assert(usage & PIPE_TRANSFER_WRITE);
@@ -214,6 +220,8 @@ static void *r600_buffer_transfer_map(struct pipe_context 
*ctx,
                    rctx->ws->buffer_is_busy(rbuffer->buf, 
RADEON_USAGE_READWRITE)) {
                        rctx->invalidate_buffer(&rctx->b, &rbuffer->b.b);
                }
+               /* At this point, the buffer is always idle. */
+               usage |= PIPE_TRANSFER_UNSYNCHRONIZED;
        }
        else if ((usage & PIPE_TRANSFER_DISCARD_RANGE) &&
                 !(usage & PIPE_TRANSFER_UNSYNCHRONIZED) &&
-- 
1.8.3.2

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to