summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2016-06-05 17:43:43 +0200
committerMarek Olšák <marek.olsak@amd.com>2016-06-08 00:22:45 +0200
commitffd54d1936fcd07424265b780e1d049222a01e94 (patch)
treef90ea1f7afc006d811e5e3731b86a6db3bdf5af1
parent4be46c7d9dbeaff9dede941ee6518f68ad0c5f75 (diff)
downloadexternal_mesa3d-ffd54d1936fcd07424265b780e1d049222a01e94.zip
external_mesa3d-ffd54d1936fcd07424265b780e1d049222a01e94.tar.gz
external_mesa3d-ffd54d1936fcd07424265b780e1d049222a01e94.tar.bz2
radeonsi: allow direct hw MSAA resolve for scanout surfaces
No idea why this was disabled, but it works fine. Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com> Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
-rw-r--r--src/gallium/drivers/radeonsi/si_blit.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c
index dee3c2f..c28533e 100644
--- a/src/gallium/drivers/radeonsi/si_blit.c
+++ b/src/gallium/drivers/radeonsi/si_blit.c
@@ -902,7 +902,6 @@ static bool do_hardware_msaa_resolve(struct pipe_context *ctx,
info->src.box.height == dst_height &&
info->src.box.depth == 1 &&
dst->surface.level[info->dst.level].mode >= RADEON_SURF_MODE_1D &&
- !(dst->surface.flags & RADEON_SURF_SCANOUT) &&
(!dst->cmask.size || !dst->dirty_level_mask) && /* dst cannot be fast-cleared */
!dst->dcc_offset) {
si_blitter_begin(ctx, SI_COLOR_RESOLVE |