diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2016-08-22 13:45:05 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2016-09-05 18:01:15 +0200 |
| commit | 21de3be8e62b2b093569a99550e6356ed2f106b4 (patch) | |
| tree | 90eca99db8834a44053c28ff34b68822823fbb03 /src/gallium/drivers/radeonsi | |
| parent | 63da0c991d228b61ca36591314098620c511dbce (diff) | |
| download | external_mesa3d-21de3be8e62b2b093569a99550e6356ed2f106b4.zip external_mesa3d-21de3be8e62b2b093569a99550e6356ed2f106b4.tar.gz external_mesa3d-21de3be8e62b2b093569a99550e6356ed2f106b4.tar.bz2 | |
radeonsi: fix texture format reinterpretation with DCC
DCC is limited in how texture formats can be reinterpreted using texture
views. If we get a view format that is incompatible with the initial
texture format with respect to DCC, disable DCC.
There is a new piglit which tests all format combinations.
What works and what doesn't was deduced by looking at the piglit failures.
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Diffstat (limited to 'src/gallium/drivers/radeonsi')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_blit.c | 8 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_descriptors.c | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.c | 4 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c index 1147b5b..c143601 100644 --- a/src/gallium/drivers/radeonsi/si_blit.c +++ b/src/gallium/drivers/radeonsi/si_blit.c @@ -1124,6 +1124,12 @@ static void si_blit(struct pipe_context *ctx, /* The driver doesn't decompress resources automatically while * u_blitter is rendering. */ + vi_dcc_disable_if_incompatible_format(&sctx->b, info->src.resource, + info->src.level, + info->src.format); + vi_dcc_disable_if_incompatible_format(&sctx->b, info->dst.resource, + info->dst.level, + info->dst.format); si_decompress_subresource(ctx, info->src.resource, info->mask, info->src.level, info->src.box.z, @@ -1153,6 +1159,8 @@ static boolean si_generate_mipmap(struct pipe_context *ctx, /* The driver doesn't decompress resources automatically while * u_blitter is rendering. */ + vi_dcc_disable_if_incompatible_format(&sctx->b, tex, base_level, + format); si_decompress_subresource(ctx, tex, PIPE_MASK_RGBAZS, base_level, first_layer, last_layer); diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index b80f4f2..b9fae79 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -653,7 +653,8 @@ static void si_set_shader_image(struct si_context *ctx, assert(tex->fmask.size == 0); if (uses_dcc && - view->access & PIPE_IMAGE_ACCESS_WRITE) { + (view->access & PIPE_IMAGE_ACCESS_WRITE || + !vi_dcc_formats_compatible(res->b.b.format, view->format))) { /* If DCC can't be disabled, at least decompress it. * The decompression is relatively cheap if the surface * has been decompressed already. diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 41ff320..f54b0bc 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -3051,6 +3051,10 @@ si_create_sampler_view_custom(struct pipe_context *ctx, } } + vi_dcc_disable_if_incompatible_format(&sctx->b, texture, + state->u.tex.first_level, + state->format); + si_make_texture_descriptor(sctx->screen, tmp, true, state->target, pipe_format, state_swizzle, first_level, last_level, |