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

---
 src/gallium/drivers/radeon/r600_buffer_common.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/gallium/drivers/radeon/r600_buffer_common.c 
b/src/gallium/drivers/radeon/r600_buffer_common.c
index b8a96fe..b7921fa 100644
--- a/src/gallium/drivers/radeon/r600_buffer_common.c
+++ b/src/gallium/drivers/radeon/r600_buffer_common.c
@@ -250,8 +250,12 @@ static void *r600_buffer_transfer_map(struct pipe_context 
*ctx,
                                data += box->x % R600_MAP_BUFFER_ALIGNMENT;
                                return r600_buffer_get_transfer(ctx, resource, 
level, usage, box,
                                                                ptransfer, 
data, staging, offset);
+                       } else {
+                               return NULL; /* error, shouldn't occur though */
                        }
                }
+               /* At this point, the buffer is always idle (we checked it 
above). */
+               usage |= PIPE_TRANSFER_UNSYNCHRONIZED;
        }
 
        data = r600_buffer_map_sync_with_rings(rctx, rbuffer, usage);
-- 
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