From 61c995bc47b838317a4a62fba2ff2031bcb0c23e Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Thu, 11 Apr 2013 14:54:40 +0200 Subject: r600g: rewrite FMASK allocation, fix FMASK texturing with 2 and 4 samples This fixes and enables texturing with compressed MSAA colorbuffers on Evergreen and Cayman. For the first time, multisample textures work on Cayman. This requires the libdrm flag RADEON_SURF_FMASK. v2: require libdrm_radeon 2.4.45 Reviewed-by: Alex Deucher --- src/gallium/drivers/r600/r600_pipe.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/gallium/drivers/r600/r600_pipe.c') diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index 47cdb9e4926..efb45010a19 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -1271,8 +1271,7 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws) break; case CAYMAN: rscreen->has_msaa = rscreen->info.drm_minor >= 19; - /* We should be able to read compressed MSAA textures, but it doesn't work. */ - rscreen->msaa_texture_support = MSAA_TEXTURE_SAMPLE_ZERO; + rscreen->msaa_texture_support = MSAA_TEXTURE_COMPRESSED; break; default: rscreen->has_msaa = FALSE; -- cgit v1.2.3