From d0f06e5c4744878bc0416f4b20ee83241d9658f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 15 Mar 2021 21:22:55 -0400 Subject: [PATCH] radeonsi: remove si_screen::dcc_msaa_allowed Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/gallium/drivers/radeonsi/si_pipe.c | 2 -- src/gallium/drivers/radeonsi/si_pipe.h | 1 - src/gallium/drivers/radeonsi/si_texture.c | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index a37bda89da3..ddfdf2d9482 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -1256,8 +1256,6 @@ static struct pipe_screen *radeonsi_screen_create_impl(struct radeon_winsys *ws, */ sscreen->llvm_has_working_vgpr_indexing = sscreen->info.chip_class != GFX9; - sscreen->dcc_msaa_allowed = !(sscreen->debug_flags & DBG(NO_DCC_MSAA)); - (void)simple_mtx_init(&sscreen->shader_parts_mutex, mtx_plain); sscreen->use_monolithic_shaders = (sscreen->debug_flags & DBG(MONOLITHIC_SHADERS)) != 0; diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h index 841335e962d..b5d48fec6e6 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.h +++ b/src/gallium/drivers/radeonsi/si_pipe.h @@ -569,7 +569,6 @@ struct si_screen { /* Whether shaders are monolithic (1-part) or separate (3-part). */ bool use_monolithic_shaders; bool record_llvm_ir; - bool dcc_msaa_allowed; struct slab_parent_pool pool_transfers; diff --git a/src/gallium/drivers/radeonsi/si_texture.c b/src/gallium/drivers/radeonsi/si_texture.c index e5005fa6987..03f53a0c509 100644 --- a/src/gallium/drivers/radeonsi/si_texture.c +++ b/src/gallium/drivers/radeonsi/si_texture.c @@ -202,7 +202,7 @@ static int si_init_surface(struct si_screen *sscreen, struct radeon_surf *surfac (ptex->flags & SI_RESOURCE_FLAG_DISABLE_DCC || (sscreen->info.chip_class < GFX10_3 && ptex->format == PIPE_FORMAT_R9G9B9E5_FLOAT) || - (ptex->nr_samples >= 2 && !sscreen->dcc_msaa_allowed))) + (ptex->nr_samples >= 2 && sscreen->debug_flags & DBG(NO_DCC_MSAA)))) flags |= RADEON_SURF_DISABLE_DCC; /* Stoney: 128bpp MSAA textures randomly fail piglit tests with DCC. */