commit 9e7403d7912345aa86319bf6e91fe90a09fd974b
author Iago Toral Quiroga <itoral@igalia.com> Tue Mar 24 08:59:53 2020 +0100
committer Marge Bot <eric+marge@anholt.net> Tue Oct 13 21:21:28 2020 +0000
tree d58027154500f3bd4a238f24cecf4d9465890831
parent d471c47c79b872306d62c0e22259f8e54e2337ed

v3dv: improve assert handling for fallback paths on meta copy/clear operations

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6766>

src/broadcom/vulkan/v3dv_meta_copy.c

diff --git a/src/broadcom/vulkan/v3dv_meta_copy.c b/src/broadcom/vulkan/v3dv_meta_copy.c
index 501cb8e..603c1ff 100644
--- a/src/broadcom/vulkan/v3dv_meta_copy.c
+++ b/src/broadcom/vulkan/v3dv_meta_copy.c
@@ -616,12 +616,6 @@
    cl_emit(rcl, END_OF_RENDERING, end);
 }
 
-static inline bool
-can_use_tlb_copy_for_image_offset(const VkOffset3D *offset)
-{
-   return offset->x == 0 && offset->y == 0;
-}
-
 /* Implements a copy using the TLB.
  *
  * This only works if we are copying from offset (0,0), since a TLB store for
@@ -634,8 +628,6 @@
                          struct v3dv_image *image,
                          const VkBufferImageCopy *region)
 {
-   assert(can_use_tlb_copy_for_image_offset(&region->imageOffset));
-
    uint32_t internal_type, internal_bpp;
    get_internal_type_bpp_for_image_aspects(image,
                                            region->imageSubresource.aspectMask,
@@ -990,6 +982,8 @@
    for (uint32_t i = 0; i < rangeCount; i++) {
       if (can_use_tlb(image, &origin))
          clear_image_tlb(cmd_buffer, image, &clear_value, &pRanges[i]);
+      else
+         assert(!"Fallback path for vkCmdClearColorImage not implemented");
    }
 }
 
@@ -1008,8 +1002,12 @@
       .depthStencil = *pDepthStencil,
    };
 
+   const VkOffset3D origin = { 0, 0, 0 };
    for (uint32_t i = 0; i < rangeCount; i++)
-      clear_image_tlb(cmd_buffer, image, &clear_value, &pRanges[i]);
+      if (can_use_tlb(image, &origin))
+         clear_image_tlb(cmd_buffer, image, &clear_value, &pRanges[i]);
+      else
+         assert(!"Fallback path for vkCmdClearDepthStencilImage not implemented");
 }
 
 static void
@@ -1503,8 +1501,6 @@
                          struct v3dv_buffer *buffer,
                          const VkBufferImageCopy *region)
 {
-   assert(can_use_tlb_copy_for_image_offset(&region->imageOffset));
-
    uint32_t internal_type, internal_bpp;
    get_internal_type_bpp_for_image_aspects(image,
                                            region->imageSubresource.aspectMask,
@@ -1548,7 +1544,7 @@
    V3DV_FROM_HANDLE(v3dv_image, image, dstImage);
 
    for (uint32_t i = 0; i < regionCount; i++) {
-      if (can_use_tlb_copy_for_image_offset(&pRegions[i].imageOffset))
+      if (can_use_tlb(image, &pRegions[i].imageOffset))
          copy_buffer_to_image_tlb(cmd_buffer, image, buffer, &pRegions[i]);
       else
          assert(!"Fallback path for vkCmdCopyBufferToImage not implemented");