fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 11:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r600g,radeonsi: don't use hardware MSAA resolve if dst is fast-cleared

Browse source 
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 d226191820)
This commit is contained in:
Marek Olšák 2014-06-02 13:51:29 +02:00 • committed by Ian Romanick
parent ae16f443c2
commit 5ab9a9c0cc
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/drivers/r600/r600_blit.c
View file

@ -789,7 +789,8 @@ static bool do_hardware_msaa_resolve(struct pipe_context *ctx,
info->src.box.width == dst_width && info->src.box.width == dst_width &&
info->src.box.height == dst_height && info->src.box.height == dst_height &&
info->src.box.depth == 1 && 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); r600_blitter_begin(ctx, R600_COLOR_RESOLVE);
util_blitter_custom_resolve_color(rctx->blitter, util_blitter_custom_resolve_color(rctx->blitter,
info->dst.resource, info->dst.level, info->dst.resource, info->dst.level,

4
src/gallium/drivers/radeonsi/si_blit.c
View file

@ -689,8 +689,10 @@ static bool do_hardware_msaa_resolve(struct pipe_context *ctx,
info->src.box.height == dst_height && info->src.box.height == dst_height &&
info->src.box.depth == 1 && 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->surface.flags & RADEON_SURF_SCANOUT)) { !(dst->surface.flags & RADEON_SURF_SCANOUT) &&
(!dst->cmask.size || !dst->dirty_level_mask) /* dst cannot be fast-cleared */) {
si_blitter_begin(ctx, SI_COLOR_RESOLVE); si_blitter_begin(ctx, SI_COLOR_RESOLVE);
t-cleared
util_blitter_custom_resolve_color(sctx->blitter, util_blitter_custom_resolve_color(sctx->blitter,
info->dst.resource, info->dst.level, info->dst.resource, info->dst.level,
info->dst.box.z, info->dst.box.z,