diff options
| author | Marek Olšák <[email protected]> | 2013-04-11 14:54:40 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2013-05-15 20:19:45 +0200 |
| commit | 61c995bc47b838317a4a62fba2ff2031bcb0c23e (patch) | |
| tree | ce944ced016e5fbca14b36dcaf225efc3f758ad3 /src/gallium/drivers/r600/r600_blit.c | |
| parent | 61506257f68c18cc927a44f25344ee0584fdbd0e (diff) | |
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 <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/r600_blit.c')
| -rw-r--r-- | src/gallium/drivers/r600/r600_blit.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c index afe43896568..7d32eef89ee 100644 --- a/src/gallium/drivers/r600/r600_blit.c +++ b/src/gallium/drivers/r600/r600_blit.c @@ -300,11 +300,7 @@ static void r600_blit_decompress_color(struct pipe_context *ctx, 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; + blend_decompress = rctx->custom_blend_fmask_decompress; break; case MSAA_TEXTURE_SAMPLE_ZERO: default: |