1 files changed, 25 insertions, 17 deletions

diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c
index 8597b8dfcf7..a19248da3a2 100644
--- a/src/gallium/drivers/r600/r600_blit.c
+++ b/src/gallium/drivers/r600/r600_blit.c
@@ -249,18 +249,35 @@ static void r600_blit_decompress_color(struct pipe_context *ctx,
 		struct r600_texture *rtex,
 		unsigned first_level, unsigned last_level,
 		unsigned first_layer, unsigned last_layer)
 {
 	struct r600_context *rctx = (struct r600_context *)ctx;
 	unsigned layer, level, checked_last_layer, max_layer;
-
-	assert(rctx->chip_class != CAYMAN);
+	void *blend_decompress;
 
 	if (!rtex->dirty_level_mask)
 		return;
 
+	switch (rctx->screen->msaa_texture_support) {
+	case MSAA_TEXTURE_DECOMPRESSED:
+		blend_decompress = rctx->custom_blend_decompress;
+		break;
+	case MSAA_TEXTURE_COMPRESSED:
+		/* XXX the 2x and 4x cases are broken. */
+		if (rtex->resource.b.b.nr_samples == 8)
+			blend_decompress = rctx->custom_blend_fmask_decompress;
+		else
+			blend_decompress = rctx->custom_blend_decompress;
+		break;
+	case MSAA_TEXTURE_SAMPLE_ZERO:
+	default:
+		/* Nothing to do. */
+		rtex->dirty_level_mask = 0;
+		return;
+	}
+
 	for (level = first_level; level <= last_level; level++) {
 		if (!(rtex->dirty_level_mask & (1 << level)))
 			continue;
 
 		/* The smaller the mipmap level, the less layers there are
 		 * as far as 3D textures are concerned. */
@@ -275,14 +292,13 @@ static void r600_blit_decompress_color(struct pipe_context *ctx,
 			surf_tmpl.u.tex.first_layer = layer;
 			surf_tmpl.u.tex.last_layer = layer;
 			surf_tmpl.usage = PIPE_BIND_RENDER_TARGET;
 			cbsurf = ctx->create_surface(ctx, &rtex->resource.b.b, &surf_tmpl);
 
 			r600_blitter_begin(ctx, R600_DECOMPRESS);
-			util_blitter_custom_color(rctx->blitter, cbsurf,
-						  rctx->custom_blend_decompress);
+			util_blitter_custom_color(rctx->blitter, cbsurf, blend_decompress);
 			r600_blitter_end(ctx);
 
 			pipe_surface_reference(&cbsurf, NULL);
 		}
 
 		/* The texture will always be dirty if some layers or samples aren't flushed.
@@ -296,19 +312,12 @@ static void r600_blit_decompress_color(struct pipe_context *ctx,
 void r600_decompress_color_textures(struct r600_context *rctx,
 				    struct r600_samplerview_state *textures)
 {
 	unsigned i;
 	unsigned mask = textures->compressed_colortex_mask;
 
-	/* Cayman cannot decompress an MSAA colorbuffer,
-	 * but it can read it compressed, so skip this. */
-	assert(rctx->chip_class != CAYMAN);
-	if (rctx->chip_class == CAYMAN) {
-		return;
-	}
-
 	while (mask) {
 		struct pipe_sampler_view *view;
 		struct r600_texture *tex;
 
 		i = u_bit_scan(&mask);
 
@@ -330,24 +339,23 @@ void r600_decompress_color_textures(struct r600_context *rctx,
  * rendering. */
 static bool r600_decompress_subresource(struct pipe_context *ctx,
 					struct pipe_resource *tex,
 					unsigned level,
 					unsigned first_layer, unsigned last_layer)
 {
-	struct r600_context *rctx = (struct r600_context *)ctx;
 	struct r600_texture *rtex = (struct r600_texture*)tex;
 
 	if (rtex->is_depth && !rtex->is_flushing_texture) {
 		if (!r600_init_flushed_depth_texture(ctx, tex, NULL))
 			return false; /* error */
 
 		r600_blit_decompress_depth(ctx, rtex, NULL,
 					   level, level,
 					   first_layer, last_layer,
 					   0, u_max_sample(tex));
-	} else if (rctx->chip_class != CAYMAN && rtex->fmask_size && rtex->cmask_size) {
+	} else if (rtex->fmask_size && rtex->cmask_size) {
 		r600_blit_decompress_color(ctx, rtex, level, level,
 					   first_layer, last_layer);
 	}
 	return true;
 }
 
@@ -456,12 +464,13 @@ static void r600_resource_copy_region(struct pipe_context *ctx,
 	struct r600_texture *rsrc = (struct r600_texture*)src;
 	struct r600_texture *rdst = (struct r600_texture*)dst;
 	struct pipe_surface *dst_view, dst_templ;
 	struct pipe_sampler_view src_templ, *src_view;
 	unsigned dst_width, dst_height, src_width0, src_height0, src_widthFL, src_heightFL;
 	struct pipe_box sbox;
+	bool copy_all_samples;
 
 	/* Handle buffers first. */
 	if (dst->target == PIPE_BUFFER && src->target == PIPE_BUFFER) {
 		r600_copy_buffer(ctx, dst, dstx, src, src_box);
 		return;
 	}
@@ -555,22 +564,21 @@ static void r600_resource_copy_region(struct pipe_context *ctx,
 								src_width0, src_height0);
 	} else {
 		src_view = r600_create_sampler_view_custom(ctx, src, &src_templ,
 							   src_widthFL, src_heightFL);
 	}
 
+	copy_all_samples = rctx->screen->msaa_texture_support != MSAA_TEXTURE_SAMPLE_ZERO;
+
 	/* Copy. */
-	/* XXX Multisample texturing is unimplemented on Cayman. In the meantime,
-	 * copy only the first sample (which is the only one that is uncompressed
-	 * and therefore doesn't return garbage). */
 	r600_blitter_begin(ctx, R600_COPY_TEXTURE);
 	util_blitter_blit_generic(rctx->blitter, dst_view, dstx, dsty,
 				  abs(src_box->width), abs(src_box->height),
 				  src_view, src_box, src_width0, src_height0,
 				  PIPE_MASK_RGBAZS, PIPE_TEX_FILTER_NEAREST, NULL,
-				  rctx->chip_class != CAYMAN);
+				  copy_all_samples);
 	r600_blitter_end(ctx);
 
 	pipe_surface_reference(&dst_view, NULL);
 	pipe_sampler_view_reference(&src_view, NULL);
 }