r600g: Merge fix

diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
index 03af367401d9b8c411072f42bc3b94bfa67d4e36..4c9d5609c06014c1364d3dae11a27291100fe909 100644 (file)
--- a/src/gallium/drivers/r600/r600_texture.c
+++ b/src/gallium/drivers/r600/r600_texture.c
@@ -309,7 +309,16 @@ static boolean permit_hardware_blit(struct pipe_screen *screen,
                                PIPE_BIND_SAMPLER_VIEW, 0))
                return FALSE;
 
-       return TRUE;
+        switch (res->usage) {
+        case PIPE_USAGE_STREAM:
+        case PIPE_USAGE_STAGING:
+        case PIPE_USAGE_STATIC:
+        case PIPE_USAGE_IMMUTABLE:
+                return FALSE;
+
+        default:
+                return TRUE;
+        }
 }
 
 static boolean r600_texture_get_handle(struct pipe_screen* screen,