diff options
| author | Marek Olšák <[email protected]> | 2013-04-11 15:29:41 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2013-05-15 20:20:32 +0200 |
| commit | 5a3fac4d2667b5d46058564151142fec158f5f82 (patch) | |
| tree | f8e511f280ad4edb547ad8e755ff261298e6e37a /src/gallium/drivers/r600/evergreen_state.c | |
| parent | 61c995bc47b838317a4a62fba2ff2031bcb0c23e (diff) | |
r600g: cleanup MSAA texture support checking
Reviewed-by: Alex Deucher <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/evergreen_state.c')
| -rw-r--r-- | src/gallium/drivers/r600/evergreen_state.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c index 4eb976849c5..f49c5952104 100644 --- a/src/gallium/drivers/r600/evergreen_state.c +++ b/src/gallium/drivers/r600/evergreen_state.c @@ -1219,7 +1219,7 @@ evergreen_create_sampler_view_custom(struct pipe_context *ctx, view->tex_resource_words[2] = (surflevel[0].offset + r600_resource_va(ctx->screen, texture)) >> 8; /* TEX_RESOURCE_WORD3.MIP_ADDRESS */ - if (texture->nr_samples > 1 && rscreen->msaa_texture_support == MSAA_TEXTURE_COMPRESSED) { + if (texture->nr_samples > 1 && rscreen->has_compressed_msaa_texturing) { if (tmp->is_depth) { /* disable FMASK (0 = disabled) */ view->tex_resource_words[3] = 0; @@ -3537,21 +3537,13 @@ void *evergreen_create_resolve_blend(struct r600_context *rctx) void *evergreen_create_decompress_blend(struct r600_context *rctx) { struct pipe_blend_state blend; + unsigned mode = rctx->screen->has_compressed_msaa_texturing ? + V_028808_CB_FMASK_DECOMPRESS : V_028808_CB_DECOMPRESS; memset(&blend, 0, sizeof(blend)); blend.independent_blend_enable = true; blend.rt[0].colormask = 0xf; - return evergreen_create_blend_state_mode(&rctx->context, &blend, V_028808_CB_DECOMPRESS); -} - -void *evergreen_create_fmask_decompress_blend(struct r600_context *rctx) -{ - struct pipe_blend_state blend; - - memset(&blend, 0, sizeof(blend)); - blend.independent_blend_enable = true; - blend.rt[0].colormask = 0xf; - return evergreen_create_blend_state_mode(&rctx->context, &blend, V_028808_CB_FMASK_DECOMPRESS); + return evergreen_create_blend_state_mode(&rctx->context, &blend, mode); } void *evergreen_create_db_flush_dsa(struct r600_context *rctx) |