radv: add radv_image_can_fast_clear() helper

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>

diff --git a/src/amd/vulkan/radv_meta_clear.c b/src/amd/vulkan/radv_meta_clear.c
index 26bc5e75ef3bec3b9757253e37759360a553e5cc..d9acd194ce5c92d992ac255160d5c957c690b29f 100644 (file)
--- a/src/amd/vulkan/radv_meta_clear.c
+++ b/src/amd/vulkan/radv_meta_clear.c
@@ -872,6 +872,43 @@ radv_is_fast_clear_stencil_allowed(VkClearDepthStencilValue value)
        return value.stencil == 0;
 }
 
+/**
+ * Determine if the given image can be fast cleared.
+ */
+static bool
+radv_image_can_fast_clear(struct radv_device *device,  struct radv_image *image)
+{
+       if (device->instance->debug_flags & RADV_DEBUG_NO_FAST_CLEARS)
+               return false;
+
+       if (vk_format_is_color(image->vk_format)) {
+               if (!radv_image_has_cmask(image) && !radv_image_has_dcc(image))
+                       return false;
+
+               /* RB+ doesn't work with CMASK fast clear on Stoney. */
+               if (!radv_image_has_dcc(image) &&
+                   device->physical_device->rad_info.family == CHIP_STONEY)
+                       return false;
+       } else {
+               if (!radv_image_has_htile(image))
+                       return false;
+
+               /* GFX8 only supports 32-bit depth surfaces but we can enable
+                * TC-compat HTILE for 16-bit surfaces if no Z planes are
+                * compressed. Though, fast HTILE clears don't seem to work.
+                */
+               if (device->physical_device->rad_info.chip_class == VI &&
+                   image->vk_format == VK_FORMAT_D16_UNORM)
+                       return false;
+       }
+
+       /* Do not fast clears 3D images. */
+       if (image->type == VK_IMAGE_TYPE_3D)
+               return false;
+
+       return true;
+}
+
 static bool
 emit_fast_htile_clear(struct radv_cmd_buffer *cmd_buffer,
                      const VkClearAttachment *clear_att,
@@ -889,19 +926,12 @@ emit_fast_htile_clear(struct radv_cmd_buffer *cmd_buffer,
        uint32_t clear_word, flush_bits;
        uint32_t htile_mask;
 
-       if (!radv_image_has_htile(iview->image))
-               return false;
-
-       if (cmd_buffer->device->instance->debug_flags & RADV_DEBUG_NO_FAST_CLEARS)
+       if (!radv_image_can_fast_clear(cmd_buffer->device, iview->image))
                return false;
 
        if (!radv_layout_is_htile_compressed(iview->image, image_layout, radv_image_queue_family_mask(iview->image, cmd_buffer->queue_family_index, cmd_buffer->queue_family_index)))
                return false;
 
-       /* don't fast clear 3D */
-       if (iview->image->type == VK_IMAGE_TYPE_3D)
-               return false;
-
        /* all layers are bound */
        if (iview->base_layer > 0)
                return false;
@@ -933,14 +963,6 @@ emit_fast_htile_clear(struct radv_cmd_buffer *cmd_buffer,
             !radv_is_fast_clear_stencil_allowed(clear_value)))
                return false;
 
-       /* GFX8 only supports 32-bit depth surfaces but we can enable TC-compat
-        * HTILE for 16-bit surfaces if no Z planes are compressed. Though,
-        * fast HTILE clears don't seem to work.
-        */
-       if (cmd_buffer->device->physical_device->rad_info.chip_class == VI &&
-           iview->image->vk_format == VK_FORMAT_D16_UNORM)
-               return false;
-
        clear_word = radv_get_htile_fast_clear_value(iview->image, clear_value);
        htile_mask = radv_get_htile_mask(iview->image, aspects);
 
@@ -1347,19 +1369,12 @@ emit_fast_color_clear(struct radv_cmd_buffer *cmd_buffer,
        uint32_t cmask_clear_value;
        bool ret;
 
-       if (!radv_image_has_cmask(iview->image) && !radv_image_has_dcc(iview->image))
-               return false;
-
-       if (cmd_buffer->device->instance->debug_flags & RADV_DEBUG_NO_FAST_CLEARS)
+       if (!radv_image_can_fast_clear(cmd_buffer->device, iview->image))
                return false;
 
        if (!radv_layout_can_fast_clear(iview->image, image_layout, radv_image_queue_family_mask(iview->image, cmd_buffer->queue_family_index, cmd_buffer->queue_family_index)))
                return false;
 
-       /* don't fast clear 3D */
-       if (iview->image->type == VK_IMAGE_TYPE_3D)
-               return false;
-
        /* all layers are bound */
        if (iview->base_layer > 0)
                return false;
@@ -1382,11 +1397,6 @@ emit_fast_color_clear(struct radv_cmd_buffer *cmd_buffer,
        if (!view_mask && clear_rect->layerCount != iview->image->info.array_size)
                return false;
 
-       /* RB+ doesn't work with CMASK fast clear on Stoney. */
-       if (!radv_image_has_dcc(iview->image) &&
-           cmd_buffer->device->physical_device->rad_info.family == CHIP_STONEY)
-               return false;
-
        /* DCC */
        ret = radv_format_pack_clear_color(iview->vk_format,
                                           clear_color, &clear_value);