From: Christian König <deathsimple@vodafone.de>
Date: Thu, 24 Feb 2011 21:28:38 +0000 (+0100)
Subject: r600g: Merge fix
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=77217af40d67612d1f1089ca188393d27a8a038f;p=mesa.git

r600g: Merge fix
---

diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
index 03af367401d..4c9d5609c06 100644
--- 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,