commit 1ecd188fef08d8861e60b1e14aa6f7c9dcb7dc5c
author Iago Toral Quiroga <itoral@igalia.com> Thu Feb 27 11:34:48 2020 +0100
committer Marge Bot <eric+marge@anholt.net> Tue Oct 13 21:21:27 2020 +0000
tree ba403e424fb33e33d6c9a3d7600fff547ce411ae
parent 7f3e79ef9f1eb7bd9a7c428fb123acd920ec0650

v3dv: don't use TLB path for formats that are not supported for rendering

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 89fd78e..a27adff 100644
--- a/src/broadcom/vulkan/v3dv_meta_copy.c
+++ b/src/broadcom/vulkan/v3dv_meta_copy.c
@@ -689,6 +689,13 @@
    v3dv_cmd_buffer_finish_job(cmd_buffer);
 }
 
+static inline bool
+can_use_tlb(struct v3dv_image *image, const VkOffset3D *offset)
+{
+   return image->format->rt_type != V3D_OUTPUT_IMAGE_FORMAT_NO &&
+          offset->x == 0 && offset->y == 0;
+}
+
 void
 v3dv_CmdCopyImageToBuffer(VkCommandBuffer commandBuffer,
                           VkImage srcImage,
@@ -702,7 +709,7 @@
    V3DV_FROM_HANDLE(v3dv_buffer, buffer, destBuffer);
 
    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_image_to_buffer_tlb(cmd_buffer, buffer, image, &pRegions[i]);
       else
          assert(!"Fallback path for vkCopyImageToBuffer not implemented");
@@ -784,8 +791,6 @@
                struct v3dv_image *src,
                const VkImageCopy *region)
 {
-   assert(can_use_tlb_copy_for_image_offset(&region->dstOffset));
-
    /* From the Vulkan spec, VkImageCopy valid usage:
     *
     *    "If neither the calling command’s srcImage nor the calling command’s
@@ -852,8 +857,8 @@
    V3DV_FROM_HANDLE(v3dv_image, dst, dstImage);
 
    for (uint32_t i = 0; i < regionCount; i++) {
-      if (can_use_tlb_copy_for_image_offset(&pRegions[i].dstOffset) &&
-          can_use_tlb_copy_for_image_offset(&pRegions[i].srcOffset)) {
+      if (can_use_tlb(src, &pRegions[i].srcOffset) &&
+          can_use_tlb(dst, &pRegions[i].dstOffset)) {
          copy_image_tlb(cmd_buffer, dst, src, &pRegions[i]);
       } else {
          assert(!"Fallback path for vkCopyImageToImage not implemented");
@@ -991,8 +996,11 @@
       .color = *pColor,
    };
 
-   for (uint32_t i = 0; i < rangeCount; i++)
-      clear_image_tlb(cmd_buffer, image, &clear_value, &pRanges[i]);
+   const VkOffset3D origin = { 0, 0, 0 };
+   for (uint32_t i = 0; i < rangeCount; i++) {
+      if (can_use_tlb(image, &origin))
+         clear_image_tlb(cmd_buffer, image, &clear_value, &pRanges[i]);
+   }
 }
 
 void