From: Marek Olšák Date: Fri, 11 Nov 2016 20:15:54 +0000 (+0100) Subject: radeonsi: check for !is_linear in do_hardware_msaa_resolve X-Git-Tag: upstream/17.1.0~4499 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=72d1669ed2e943998324db48068936351cf9f9c1;p=platform%2Fupstream%2Fmesa.git radeonsi: check for !is_linear in do_hardware_msaa_resolve We don't want opt4Space here. Tested-by: Edmondo Tommasina Reviewed-by: Nicolai Hähnle --- diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c index 075d76a..f5f49c1 100644 --- a/src/gallium/drivers/radeonsi/si_blit.c +++ b/src/gallium/drivers/radeonsi/si_blit.c @@ -972,6 +972,7 @@ static bool do_hardware_msaa_resolve(struct pipe_context *ctx, 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; + struct r600_texture *rtmp; unsigned dst_width = u_minify(info->dst.resource->width0, info->dst.level); unsigned dst_height = u_minify(info->dst.resource->height0, info->dst.level); enum pipe_format format = info->src.format; @@ -1074,9 +1075,10 @@ resolve_to_temp: tmp = ctx->screen->resource_create(ctx->screen, &templ); if (!tmp) return false; + rtmp = (struct r600_texture*)tmp; - assert(src->surface.micro_tile_mode == - ((struct r600_texture*)tmp)->surface.micro_tile_mode); + assert(!rtmp->surface.is_linear); + assert(src->surface.micro_tile_mode == rtmp->surface.micro_tile_mode); /* resolve */ si_blitter_begin(ctx, SI_COLOR_RESOLVE |