aboutsummaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/radeon/r600_buffer_common.c
diff options
context:
space:
mode:
authorMichel Dänzer <[email protected]>2014-09-02 17:52:30 +0900
committerMichel Dänzer <[email protected]>2014-09-03 12:49:59 +0900
commit2adf7ee92e19ca978d6dac29fead59f14d033f3e (patch)
tree516c8bb40af4bc2e1ad3af700831c9bd8ffbfbb2 /src/gallium/drivers/radeon/r600_buffer_common.c
parent454aab45ef382c0a3e262c8b417ecc846881c1e9 (diff)
r600g,radeonsi: Preserve existing buffer flags
The default case was accidentally clearing RADEON_FLAG_CPU_ACCESS from the previous fall-through cases. Reported-by: Mathias Fröhlich <[email protected]> Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeon/r600_buffer_common.c')
-rw-r--r--src/gallium/drivers/radeon/r600_buffer_common.c6
1 files 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;
}