Mesa (master): r600g, radeonsi: treat DYNAMIC and STREAM usage as STAGING

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 796e2fba8cc21f8e190bc143b6209ca417c54976
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=796e2fba8cc21f8e190bc143b6209ca417c54976

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sat Feb  1 14:01:20 2014 +0100

r600g,radeonsi: treat DYNAMIC and STREAM usage as STAGING

---

 src/gallium/drivers/radeon/r600_buffer_common.c |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/gallium/drivers/radeon/r600_buffer_common.c b/src/gallium/drivers/radeon/r600_buffer_common.c
index d29671e..1a9a5dd 100644
--- a/src/gallium/drivers/radeon/r600_buffer_common.c
+++ b/src/gallium/drivers/radeon/r600_buffer_common.c
@@ -105,19 +105,15 @@ bool r600_init_resource(struct r600_common_screen *rscreen,
 
 	switch(usage) {
 	case PIPE_USAGE_STAGING:
-		/* Staging resources participate in transfers, i.e. are used
+	case PIPE_USAGE_DYNAMIC:
+	case PIPE_USAGE_STREAM:
+		/* These resources participate in transfers, i.e. are used
 		 * for uploads and downloads from regular resources.
 		 * We generate them internally for some transfers.
 		 */
 		initial_domain = RADEON_DOMAIN_GTT;
 		domains = RADEON_DOMAIN_GTT;
 		break;
-	case PIPE_USAGE_DYNAMIC:
-	case PIPE_USAGE_STREAM:
-		/* Default to GTT, but allow the memory manager to move it to VRAM. */
-		initial_domain = RADEON_DOMAIN_GTT;
-		domains = RADEON_DOMAIN_GTT | RADEON_DOMAIN_VRAM;
-		break;
 	case PIPE_USAGE_DEFAULT:
 	case PIPE_USAGE_STATIC:
 	case PIPE_USAGE_IMMUTABLE: