From e4e2d45cc64fb9841b6ab10818186e5ca8a49d09 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 11 Aug 2021 13:35:13 +0200 Subject: [PATCH] radv: remove useless DISABLE_{ZMASK,SMEM}_EXPCLEAR_OPTIMIZATION state This has no effect without enabling EXPCLEAR. Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen Part-of: --- src/amd/vulkan/radv_meta_clear.c | 2 -- src/amd/vulkan/radv_pipeline.c | 4 ---- src/amd/vulkan/radv_private.h | 2 -- 3 files changed, 8 deletions(-) diff --git a/src/amd/vulkan/radv_meta_clear.c b/src/amd/vulkan/radv_meta_clear.c index 459d43747cf..1b320ad61d8 100644 --- a/src/amd/vulkan/radv_meta_clear.c +++ b/src/amd/vulkan/radv_meta_clear.c @@ -636,11 +636,9 @@ create_depthstencil_pipeline(struct radv_device *device, VkImageAspectFlags aspe if (aspects & VK_IMAGE_ASPECT_DEPTH_BIT) { extra.db_depth_clear = index == DEPTH_CLEAR_SLOW ? false : true; - extra.db_depth_disable_expclear = index == DEPTH_CLEAR_FAST ? true : false; } if (aspects & VK_IMAGE_ASPECT_STENCIL_BIT) { extra.db_stencil_clear = index == DEPTH_CLEAR_SLOW ? false : true; - extra.db_stencil_disable_expclear = index == DEPTH_CLEAR_FAST ? true : false; } result = create_pipeline(device, radv_render_pass_from_handle(render_pass), samples, vs_nir, fs_nir, diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index bf78a8cceb9..43ee8cb9bb6 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -4194,10 +4194,6 @@ radv_pipeline_generate_depth_stencil_state(struct radeon_cmdbuf *ctx_cs, db_render_control |= S_028000_RESUMMARIZE_ENABLE(extra->resummarize_enable); db_render_control |= S_028000_DEPTH_COMPRESS_DISABLE(extra->depth_compress_disable); db_render_control |= S_028000_STENCIL_COMPRESS_DISABLE(extra->stencil_compress_disable); - db_render_override2 |= - S_028010_DISABLE_ZMASK_EXPCLEAR_OPTIMIZATION(extra->db_depth_disable_expclear); - db_render_override2 |= - S_028010_DISABLE_SMEM_EXPCLEAR_OPTIMIZATION(extra->db_stencil_disable_expclear); } db_render_override |= S_02800C_FORCE_HIS_ENABLE0(V_02800C_FORCE_DISABLE) | diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index a385341a4b3..1815cac0a99 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -1828,8 +1828,6 @@ struct radv_graphics_pipeline_create_info { bool use_rectlist; bool db_depth_clear; bool db_stencil_clear; - bool db_depth_disable_expclear; - bool db_stencil_disable_expclear; bool depth_compress_disable; bool stencil_compress_disable; bool resummarize_enable;