Module: Mesa Branch: master Commit: 373060652c889bb85d5a4673405d77ee75fb6fdc URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=373060652c889bb85d5a4673405d77ee75fb6fdc
Author: Marek Olšák <[email protected]> Date: Wed Jun 8 20:51:50 2016 +0200 radeonsi: clarify the MSAA resolve limitation with scanout this is the correct hw requirement Reviewed-by: Nicolai Hähnle <[email protected]> --- src/gallium/drivers/radeonsi/si_blit.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c index 68d9799..9de2c75 100644 --- a/src/gallium/drivers/radeonsi/si_blit.c +++ b/src/gallium/drivers/radeonsi/si_blit.c @@ -859,6 +859,7 @@ static bool do_hardware_msaa_resolve(struct pipe_context *ctx, const struct pipe_blit_info *info) { struct si_context *sctx = (struct si_context*)ctx; + struct r600_texture *src = (struct r600_texture*)info->src.resource; struct r600_texture *dst = (struct r600_texture*)info->dst.resource; unsigned dst_width = u_minify(info->dst.resource->width0, info->dst.level); unsigned dst_height = u_minify(info->dst.resource->height0, info->dst.level); @@ -902,7 +903,7 @@ 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) && + src->surface.micro_tile_mode == dst->surface.micro_tile_mode && (!dst->cmask.size || !dst->dirty_level_mask)) { /* dst cannot be fast-cleared */ /* Resolving into a surface with DCC is unsupported. Since * it's being overwritten anyway, clear it to uncompressed. @@ -946,6 +947,9 @@ static bool do_hardware_msaa_resolve(struct pipe_context *ctx, if (!tmp) return false; + assert(src->surface.micro_tile_mode == + ((struct r600_texture*)tmp)->surface.micro_tile_mode); + /* resolve */ si_blitter_begin(ctx, SI_COLOR_RESOLVE | (info->render_condition_enable ? 0 : SI_DISABLE_RENDER_COND)); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
