Mesa (master): r600g: use the hw MSAA resolving if formats are compatible

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 4489d75a58716327380d6b2e8c3db7df0be3c717
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4489d75a58716327380d6b2e8c3db7df0be3c717

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sat Apr 30 21:44:41 2016 +0200

r600g: use the hw MSAA resolving if formats are compatible

This allows resolving RGBA into RGBX.
This should improve HL2 Lost Coast performance.

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

---

 src/gallium/drivers/r600/r600_blit.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c
index ed67cb8..9230b40 100644
--- a/src/gallium/drivers/r600/r600_blit.c
+++ b/src/gallium/drivers/r600/r600_blit.c
@@ -808,7 +808,8 @@ static bool do_hardware_msaa_resolve(struct pipe_context *ctx,
 	    info->dst.resource->nr_samples <= 1 &&
 	    util_max_layer(info->src.resource, 0) == 0 &&
 	    util_max_layer(info->dst.resource, info->dst.level) == 0 &&
-	    info->dst.format == info->src.format &&
+	    util_is_format_compatible(util_format_description(info->src.format),
+				      util_format_description(info->dst.format)) &&
 	    !util_format_is_pure_integer(format) &&
 	    !util_format_is_depth_or_stencil(format) &&
 	    !info->scissor_enable &&