From 193ad4748b006c54c619aa47f3a50fccd27bb2c2 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Mon, 12 Nov 2018 17:57:09 +0100 Subject: [PATCH] radv: add radv_is_fast_clear_{depth,stencil}_allowed() helpers Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen --- src/amd/vulkan/radv_meta_clear.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/amd/vulkan/radv_meta_clear.c b/src/amd/vulkan/radv_meta_clear.c index d81626de7ce..b9ae66695c2 100644 --- a/src/amd/vulkan/radv_meta_clear.c +++ b/src/amd/vulkan/radv_meta_clear.c @@ -761,6 +761,18 @@ radv_get_htile_fast_clear_value(const struct radv_image *image, return clear_value; } +static bool +radv_is_fast_clear_depth_allowed(VkClearDepthStencilValue value) +{ + return value.depth == 1.0f || value.depth == 0.0f; +} + +static bool +radv_is_fast_clear_stencil_allowed(VkClearDepthStencilValue value) +{ + return value.stencil == 0; +} + static bool emit_fast_htile_clear(struct radv_cmd_buffer *cmd_buffer, const VkClearAttachment *clear_att, @@ -809,7 +821,8 @@ emit_fast_htile_clear(struct radv_cmd_buffer *cmd_buffer, if (clear_rect->layerCount != iview->image->info.array_size) return false; - if ((clear_value.depth != 0.0 && clear_value.depth != 1.0) || !(aspects & VK_IMAGE_ASPECT_DEPTH_BIT)) + if (!radv_is_fast_clear_depth_allowed(clear_value) || + !(aspects & VK_IMAGE_ASPECT_DEPTH_BIT)) return false; /* GFX8 only supports 32-bit depth surfaces but we can enable TC-compat @@ -821,7 +834,8 @@ emit_fast_htile_clear(struct radv_cmd_buffer *cmd_buffer, return false; if (vk_format_aspects(iview->image->vk_format) & VK_IMAGE_ASPECT_STENCIL_BIT) { - if (clear_value.stencil != 0 || !(aspects & VK_IMAGE_ASPECT_STENCIL_BIT)) + if (!radv_is_fast_clear_stencil_allowed(clear_value) || + !(aspects & VK_IMAGE_ASPECT_STENCIL_BIT)) return false; } -- 2.30.2