From da5ca7529f704d7a900e69ac4b887d0bd32d099a Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Thu, 10 Aug 2023 16:51:22 -0500
Subject: [PATCH] gallivm: Drop the Vulkan YUV format hacks

Vulkan is now using the raw formats so we don't need this hack.

Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24619>
---
 .../auxiliary/gallivm/lp_bld_format_yuv.c     | 24 +++++--------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_format_yuv.c b/src/gallium/auxiliary/gallivm/lp_bld_format_yuv.c
index a00af7b830d..faa429ffbac 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_format_yuv.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_format_yuv.c
@@ -367,18 +367,12 @@ uyvy_to_rgba_aos(struct gallivm_state *gallivm,
                  LLVMValueRef i)
 {
    LLVMValueRef y, u, v;
+   LLVMValueRef r, g, b;
    LLVMValueRef rgba;
 
    uyvy_to_yuv_soa(gallivm, n, packed, i, &y, &u, &v);
-
-   if (gallivm->texture_descriptor) {
-      /* Vulkan expects us to pack raw data. */
-      rgba = rgb_to_rgba_aos(gallivm, n, v, y, u);
-   } else {
-      LLVMValueRef r, g, b;
-      yuv_to_rgb_soa(gallivm, n, y, u, v, &r, &g, &b);
-      rgba = rgb_to_rgba_aos(gallivm, n, r, g, b);
-   }
+   yuv_to_rgb_soa(gallivm, n, y, u, v, &r, &g, &b);
+   rgba = rgb_to_rgba_aos(gallivm, n, r, g, b);
 
    return rgba;
 }
@@ -414,18 +408,12 @@ yuyv_to_rgba_aos(struct gallivm_state *gallivm,
                  LLVMValueRef i)
 {
    LLVMValueRef y, u, v;
+   LLVMValueRef r, g, b;
    LLVMValueRef rgba;
 
    yuyv_to_yuv_soa(gallivm, n, packed, i, &y, &u, &v);
-
-   if (gallivm->texture_descriptor) {
-      /* Vulkan expects us to pack raw data. */
-      rgba = rgb_to_rgba_aos(gallivm, n, v, y, u);
-   } else {
-      LLVMValueRef r, g, b;
-      yuv_to_rgb_soa(gallivm, n, y, u, v, &r, &g, &b);
-      rgba = rgb_to_rgba_aos(gallivm, n, r, g, b);
-   }
+   yuv_to_rgb_soa(gallivm, n, y, u, v, &r, &g, &b);
+   rgba = rgb_to_rgba_aos(gallivm, n, r, g, b);
 
    return rgba;
 }