r300g: fix MSAA resolve to an untiled texture

RB3D_DEBUG_CTL doesn't help, so I resolve to a tiled temporary texture and
then blitting it to the destination one, which we also do in other situations.
This commit is contained in:
Marek Olšák
2013-01-14 00:27:28 +01:00
parent e102b665e6
commit 5330c5a248
3 changed files with 10 additions and 3 deletions

View File

@@ -626,7 +626,9 @@ static boolean r300_is_simple_msaa_resolve(const struct pipe_blit_info *info)
info->src.box.x == 0 &&
info->src.box.y == 0 &&
info->src.box.width == dst_width &&
info->src.box.height == dst_height;
info->src.box.height == dst_height &&
(r300_resource(info->dst.resource)->tex.microtile != RADEON_LAYOUT_LINEAR ||
r300_resource(info->dst.resource)->tex.macrotile[info->dst.level] != RADEON_LAYOUT_LINEAR);
}
static void r300_simple_msaa_resolve(struct pipe_context *pipe,
@@ -704,6 +706,7 @@ static void r300_msaa_resolve(struct pipe_context *pipe,
templ.depth0 = 1;
templ.array_size = 1;
templ.usage = PIPE_USAGE_STATIC;
templ.flags = R300_RESOURCE_FORCE_MICROTILING;
tmp = screen->resource_create(screen, &templ);