Mesa (main): turnip: Reorganize copy_format()'s switch statement.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 69df1e8650bdb26e3ab241ee78ccba13d67fe905
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=69df1e8650bdb26e3ab241ee78ccba13d67fe905

Author: Emma Anholt <emma at anholt.net>
Date:   Thu May 20 12:16:05 2021 -0700

turnip: Reorganize copy_format()'s switch statement.

Now that we need FALLTHROUGH macros we weren't saving much by falling
through, and things were weirdly ordered anyway with depth intermixed with
color formats and the default case tucked in the middle of the switch
statement.  Replace with pretty obvious ordering of normal color, planar
color, depth, then default.

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

---

 src/freedreno/vulkan/tu_clear_blit.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/freedreno/vulkan/tu_clear_blit.c b/src/freedreno/vulkan/tu_clear_blit.c
index 39d5b15c871..3914b607b1a 100644
--- a/src/freedreno/vulkan/tu_clear_blit.c
+++ b/src/freedreno/vulkan/tu_clear_blit.c
@@ -955,25 +955,31 @@ copy_format(VkFormat format, VkImageAspectFlags aspect_mask, bool copy_buffer)
    }
 
    switch (format) {
+   case VK_FORMAT_E5B9G9R9_UFLOAT_PACK32:
+      return VK_FORMAT_R32_UINT;
+
    case VK_FORMAT_G8_B8R8_2PLANE_420_UNORM:
       if (aspect_mask == VK_IMAGE_ASPECT_PLANE_1_BIT)
          return VK_FORMAT_R8G8_UNORM;
-      FALLTHROUGH;
+      else
+         return VK_FORMAT_R8_UNORM;
    case VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM:
       return VK_FORMAT_R8_UNORM;
+
    case VK_FORMAT_D24_UNORM_S8_UINT:
       if (aspect_mask == VK_IMAGE_ASPECT_STENCIL_BIT && copy_buffer)
          return VK_FORMAT_R8_UNORM;
-      FALLTHROUGH;
-   default:
-      return format;
-   case VK_FORMAT_E5B9G9R9_UFLOAT_PACK32:
-      return VK_FORMAT_R32_UINT;
+      else
+         return format;
+
    case VK_FORMAT_D32_SFLOAT_S8_UINT:
       if (aspect_mask == VK_IMAGE_ASPECT_STENCIL_BIT)
          return VK_FORMAT_S8_UINT;
       assert(aspect_mask == VK_IMAGE_ASPECT_DEPTH_BIT);
       return VK_FORMAT_D32_SFLOAT;
+
+   default:
+      return format;
    }
 }