From 2adf7ee92e19ca978d6dac29fead59f14d033f3e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michel=20D=C3=A4nzer?= Date: Tue, 2 Sep 2014 17:52:30 +0900 Subject: [PATCH] r600g,radeonsi: Preserve existing buffer flags MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The default case was accidentally clearing RADEON_FLAG_CPU_ACCESS from the previous fall-through cases. Reported-by: Mathias Fröhlich Reviewed-by: Marek Olšák --- src/gallium/drivers/radeon/r600_buffer_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/radeon/r600_buffer_common.c b/src/gallium/drivers/radeon/r600_buffer_common.c index c4e87a0cd08..d85b64b457f 100644 --- a/src/gallium/drivers/radeon/r600_buffer_common.c +++ b/src/gallium/drivers/radeon/r600_buffer_common.c @@ -121,17 +121,17 @@ bool r600_init_resource(struct r600_common_screen *rscreen, */ if (rscreen->info.drm_minor < 40) { res->domains = RADEON_DOMAIN_GTT; - flags = RADEON_FLAG_GTT_WC; + flags |= RADEON_FLAG_GTT_WC; break; } - flags = RADEON_FLAG_CPU_ACCESS; + flags |= RADEON_FLAG_CPU_ACCESS; /* fall through */ case PIPE_USAGE_DEFAULT: case PIPE_USAGE_IMMUTABLE: default: /* Not listing GTT here improves performance in some apps. */ res->domains = RADEON_DOMAIN_VRAM; - flags = RADEON_FLAG_GTT_WC; + flags |= RADEON_FLAG_GTT_WC; break; } -- 2.30.2