diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2014-06-02 13:51:29 +0200 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2014-06-06 18:08:23 -0700 |
| commit | 5ab9a9c0ccff8218e9625f43a25535cf7d1d8ae0 (patch) | |
| tree | 691d743fbdbb5f6e91b2232c2d7177d689b5548e /src/gallium/drivers/r600 | |
| parent | ae16f443c21e4a4eede003a3a789dc8a58c43ea4 (diff) | |
r600g,radeonsi: don't use hardware MSAA resolve if dst is fast-cleared
It doesn't work and our docs say so too.
Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
(cherry picked from commit d2261918202697febed0de18f66416e273001088)
Diffstat (limited to 'src/gallium/drivers/r600')
| -rw-r--r-- | src/gallium/drivers/r600/r600_blit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c index 1a2a9112631..bbc64ac79a2 100644 --- a/src/gallium/drivers/r600/r600_blit.c +++ b/src/gallium/drivers/r600/r600_blit.c @@ -789,7 +789,8 @@ static bool do_hardware_msaa_resolve(struct pipe_context *ctx, info->src.box.width == dst_width && info->src.box.height == dst_height && info->src.box.depth == 1 && - dst->surface.level[info->dst.level].mode >= RADEON_SURF_MODE_1D) { + dst->surface.level[info->dst.level].mode >= RADEON_SURF_MODE_1D && + (!dst->cmask.size || !dst->dirty_level_mask) /* dst cannot be fast-cleared */) { r600_blitter_begin(ctx, R600_COLOR_RESOLVE); util_blitter_custom_resolve_color(rctx->blitter, info->dst.resource, info->dst.level, |