From 0d91ddf1d4be712377e80d330480ff560d449c6f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 5 Mar 2012 14:13:19 +0100 Subject: [PATCH] r600g: don't enable tiling for STAGING and STREAM usage cases MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed by: Christian König --- src/gallium/drivers/r600/r600_texture.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c index 6222410f6c3..e55e0d215a4 100644 --- a/src/gallium/drivers/r600/r600_texture.c +++ b/src/gallium/drivers/r600/r600_texture.c @@ -623,12 +623,13 @@ struct pipe_resource *r600_texture_create(struct pipe_screen *screen, unsigned array_mode = 0; int r; - if (!(templ->flags & R600_RESOURCE_FLAG_TRANSFER) && - !(templ->bind & PIPE_BIND_SCANOUT)) { - if (rscreen->use_surface_alloc) { - if (permit_hardware_blit(screen, templ)) { - array_mode = V_038000_ARRAY_2D_TILED_THIN1; - } + if (!(templ->flags & R600_RESOURCE_FLAG_TRANSFER)) { + if (rscreen->use_surface_alloc && + !(templ->bind & PIPE_BIND_SCANOUT) && + templ->usage != PIPE_USAGE_STAGING && + templ->usage != PIPE_USAGE_STREAM && + permit_hardware_blit(screen, templ)) { + array_mode = V_038000_ARRAY_2D_TILED_THIN1; } else if (util_format_is_compressed(templ->format)) { array_mode = V_038000_ARRAY_1D_TILED_THIN1; } -- 2.30.2