Module: Mesa Branch: master Commit: 2adf7ee92e19ca978d6dac29fead59f14d033f3e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2adf7ee92e19ca978d6dac29fead59f14d033f3e
Author: Michel Dänzer <[email protected]> Date: Tue Sep 2 17:52:30 2014 +0900 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]> --- 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 c4e87a0..d85b64b 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; } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
