summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian König <[email protected]>2011-02-24 22:28:38 +0100
committerChristian König <[email protected]>2011-02-24 22:28:38 +0100
commit77217af40d67612d1f1089ca188393d27a8a038f (patch)
tree7f843f1acb368ddfce517d01ad9b65d226b2bee8 /src
parentb922a0ce12916a91cfc3e56714913fcf63279ff2 (diff)
r600g: Merge fix
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/r600/r600_texture.c11
1 files changed, 10 insertions, 1 deletions
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,