From e04389cc2ad403388f591d31234cae798408e897 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 1 Apr 2018 14:13:22 -0400 Subject: [PATCH] radeonsi: remove r600_pipe_common::decompress_dcc Acked-by: Timothy Arceri --- src/gallium/drivers/radeon/r600_pipe_common.h | 3 --- src/gallium/drivers/radeon/r600_texture.c | 4 ++-- src/gallium/drivers/radeonsi/si_blit.c | 4 +--- src/gallium/drivers/radeonsi/si_descriptors.c | 4 ++-- src/gallium/drivers/radeonsi/si_pipe.h | 1 + src/gallium/drivers/radeonsi/si_state.c | 2 +- 6 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h index 288562b..f0a7630 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.h +++ b/src/gallium/drivers/radeon/r600_pipe_common.h @@ -492,9 +492,6 @@ struct r600_common_context { unsigned first_level, unsigned last_level, unsigned first_layer, unsigned last_layer, unsigned first_sample, unsigned last_sample); - - void (*decompress_dcc)(struct pipe_context *ctx, - struct r600_texture *rtex); }; /* r600_buffer_common.c */ diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c index b16777f..8695556 100644 --- a/src/gallium/drivers/radeon/r600_texture.c +++ b/src/gallium/drivers/radeon/r600_texture.c @@ -480,7 +480,7 @@ bool si_texture_disable_dcc(struct r600_common_context *rctx, mtx_lock(&sscreen->aux_context_lock); /* Decompress DCC. */ - rctx->decompress_dcc(&rctx->b, rtex); + si_decompress_dcc(&rctx->b, rtex); rctx->b.flush(&rctx->b, NULL, 0); if (&rctx->b == sscreen->aux_context) @@ -1974,7 +1974,7 @@ void vi_disable_dcc_if_incompatible_format(struct r600_common_context *rctx, if (vi_dcc_formats_are_incompatible(tex, level, view_format)) if (!si_texture_disable_dcc(rctx, (struct r600_texture*)tex)) - rctx->decompress_dcc(&rctx->b, rtex); + si_decompress_dcc(&rctx->b, rtex); } struct pipe_surface *si_create_surface_custom(struct pipe_context *pipe, diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c index 22916b6..2722171 100644 --- a/src/gallium/drivers/radeonsi/si_blit.c +++ b/src/gallium/drivers/radeonsi/si_blit.c @@ -1325,8 +1325,7 @@ static void si_flush_resource(struct pipe_context *ctx, } } -static void si_decompress_dcc(struct pipe_context *ctx, - struct r600_texture *rtex) +void si_decompress_dcc(struct pipe_context *ctx, struct r600_texture *rtex) { if (!rtex->dcc_offset) return; @@ -1343,5 +1342,4 @@ void si_init_blit_functions(struct si_context *sctx) sctx->b.b.flush_resource = si_flush_resource; sctx->b.b.generate_mipmap = si_generate_mipmap; sctx->b.blit_decompress_depth = si_blit_decompress_depth; - sctx->b.decompress_dcc = si_decompress_dcc; } diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index 2468c9d..8d153d6 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -444,7 +444,7 @@ static void si_set_sampler_view_desc(struct si_context *sctx, if (unlikely(!is_buffer && sview->dcc_incompatible)) { if (vi_dcc_enabled(rtex, view->u.tex.first_level)) if (!si_texture_disable_dcc(&sctx->b, rtex)) - sctx->b.decompress_dcc(&sctx->b.b, rtex); + si_decompress_dcc(&sctx->b.b, rtex); sview->dcc_incompatible = false; } @@ -732,7 +732,7 @@ static void si_set_shader_image_desc(struct si_context *ctx, * has been decompressed already. */ if (!si_texture_disable_dcc(&ctx->b, tex)) - ctx->b.decompress_dcc(&ctx->b.b, tex); + si_decompress_dcc(&ctx->b.b, tex); } if (ctx->b.chip_class >= GFX9) { diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h index 1ac1612..c732379 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.h +++ b/src/gallium/drivers/radeonsi/si_pipe.h @@ -660,6 +660,7 @@ void si_resource_copy_region(struct pipe_context *ctx, struct pipe_resource *src, unsigned src_level, const struct pipe_box *src_box); +void si_decompress_dcc(struct pipe_context *ctx, struct r600_texture *rtex); /* si_clear.c */ void vi_dcc_clear_level(struct si_context *sctx, diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index bb2ce3f..7fff656 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -2761,7 +2761,7 @@ static void si_set_framebuffer_state(struct pipe_context *ctx, if (vi_dcc_enabled(rtex, surf->base.u.tex.level)) if (!si_texture_disable_dcc(&sctx->b, rtex)) - sctx->b.decompress_dcc(ctx, rtex); + si_decompress_dcc(ctx, rtex); surf->dcc_incompatible = false; } -- 2.7.4