From: Jarred Davies <jarred.davies@imgtec.com>
Date: Mon, 6 Mar 2023 00:15:05 +0000 (+0000)
Subject: pvr: Mark all normalized formats as supporting with_packed_usc_channel
X-Git-Tag: upstream/23.3.3~10913
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d1b5b2901f9b2a965144eeb50ce6c58b83d3c6ef;p=platform%2Fupstream%2Fmesa.git

pvr: Mark all normalized formats as supporting with_packed_usc_channel

Avoids assert seen in dEQP-VK.api.smoke.triangle

Signed-off-by: Jarred Davies <jarred.davies@imgtec.com>
Reviewed-by: Frank Binns <frank.binns@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22174>
---

diff --git a/src/imagination/vulkan/pvr_cmd_buffer.c b/src/imagination/vulkan/pvr_cmd_buffer.c
index 8e0e7e9..e7316a7 100644
--- a/src/imagination/vulkan/pvr_cmd_buffer.c
+++ b/src/imagination/vulkan/pvr_cmd_buffer.c
@@ -963,16 +963,8 @@ static void pvr_setup_pbe_state(
    /* Setup surface parameters. */
 
    if (PVR_HAS_FEATURE(dev_info, usc_f16sop_u8)) {
-      switch (iview->vk.format) {
-      case VK_FORMAT_B8G8R8A8_UNORM:
-         with_packed_usc_channel = true;
-         break;
-      case VK_FORMAT_D32_SFLOAT:
-         with_packed_usc_channel = false;
-         break;
-      default:
-         unreachable("Unsupported Vulkan image format");
-      }
+      with_packed_usc_channel = vk_format_is_unorm(iview->vk.format) ||
+                                vk_format_is_snorm(iview->vk.format);
    } else {
       with_packed_usc_channel = false;
    }