Merge remote branch 'origin/master' into pipe-video

[mesa.git] / src / gallium / drivers / r600 / r600_texture.c

diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
index d4d9b07c0e8a4aba003416a351aa411550f9dfdd..23e239c006886a6534d64f8126b64edcfe542016 100644 (file)
--- a/src/gallium/drivers/r600/r600_texture.c
+++ b/src/gallium/drivers/r600/r600_texture.c
@@ -564,7 +564,8 @@ struct pipe_transfer* r600_texture_get_transfer(struct pipe_context *ctx,
                use_staging_texture = TRUE;
 
        if (!permit_hardware_blit(ctx->screen, texture) ||
-               (texture->flags & R600_RESOURCE_FLAG_TRANSFER))
+               (texture->flags & R600_RESOURCE_FLAG_TRANSFER) ||
+               (texture->usage == PIPE_USAGE_STREAM))
                use_staging_texture = FALSE;
 
        trans = CALLOC_STRUCT(r600_transfer);