From 7fe8033e8bf50ecd075c4bdc78626ed3e8e28159 Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Thu, 18 Jul 2024 12:50:09 +0200 Subject: [PATCH] tu, fdl: Drop custom mapping for 1-plane YCbCr formats This workaround for VK_FORMAT_G8B8G8R8_422_UNORM and VK_FORMAT_B8G8R8G8_422_UNORM is no longer needed after the formats in vk_format_to_pipe_format now return the RGB formats since the following commits: 0c03d44093d ("util/format: Add G8B8_G8R8_422_UNORM and B8G8_R8G8_422_UNORM formats") 4accbb27a22 ("vulkan/format: Translate G8B8G8R8_422_UNORM and B8G8R8G8_422_UNORM properly") Turnip's behavior is already aligned with the new PIPE_FORMAT names, not what the old ones would suggest. Signed-off-by: Valentine Burley Part-of: --- src/freedreno/fdl/fd6_format_table.c | 4 ++-- src/freedreno/fdl/fd6_view.c | 4 ++-- src/freedreno/vulkan/tu_formats.cc | 4 ---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/freedreno/fdl/fd6_format_table.c b/src/freedreno/fdl/fd6_format_table.c index 03fedaf6fc9..43f1353a7ad 100644 --- a/src/freedreno/fdl/fd6_format_table.c +++ b/src/freedreno/fdl/fd6_format_table.c @@ -369,8 +369,8 @@ static const struct fd6_format formats[PIPE_FORMAT_COUNT] = { _T_(ASTC_12x10_SRGB, ASTC_12x10, WZYX), _T_(ASTC_12x12_SRGB, ASTC_12x12, WZYX), - _T_(R8G8_R8B8_UNORM, R8G8R8B8_422_UNORM, WZYX), /* YUYV */ - _T_(G8R8_B8R8_UNORM, G8R8B8R8_422_UNORM, WZYX), /* UYVY */ + _T_(G8B8_G8R8_UNORM, R8G8R8B8_422_UNORM, WZYX), /* YUYV */ + _T_(B8G8_R8G8_UNORM, G8R8B8R8_422_UNORM, WZYX), /* UYVY */ _T_(R8_G8B8_420_UNORM, R8_G8B8_2PLANE_420_UNORM, WZYX), /* Gallium NV12 */ _T_(G8_B8R8_420_UNORM, R8_G8B8_2PLANE_420_UNORM, WZYX), /* Vulkan NV12 */ diff --git a/src/freedreno/fdl/fd6_view.c b/src/freedreno/fdl/fd6_view.c index c6c811f7942..c51ece90949 100644 --- a/src/freedreno/fdl/fd6_view.c +++ b/src/freedreno/fdl/fd6_view.c @@ -59,8 +59,8 @@ fdl6_format_swiz(enum pipe_format format, bool has_z24uint_s8uint, * exceptions, called out below. */ switch (format) { - case PIPE_FORMAT_R8G8_R8B8_UNORM: - case PIPE_FORMAT_G8R8_B8R8_UNORM: + case PIPE_FORMAT_G8B8_G8R8_UNORM: + case PIPE_FORMAT_B8G8_R8G8_UNORM: case PIPE_FORMAT_G8_B8R8_420_UNORM: case PIPE_FORMAT_G8_B8_R8_420_UNORM: /* These formats are currently only used for Vulkan, and border colors diff --git a/src/freedreno/vulkan/tu_formats.cc b/src/freedreno/vulkan/tu_formats.cc index 914b43144c1..fdb163fd908 100644 --- a/src/freedreno/vulkan/tu_formats.cc +++ b/src/freedreno/vulkan/tu_formats.cc @@ -32,10 +32,6 @@ enum pipe_format tu_vk_format_to_pipe_format(VkFormat vk_format) { switch (vk_format) { - case VK_FORMAT_G8B8G8R8_422_UNORM: /* YUYV */ - return PIPE_FORMAT_R8G8_R8B8_UNORM; - case VK_FORMAT_B8G8R8G8_422_UNORM: /* UYVY */ - return PIPE_FORMAT_G8R8_B8R8_UNORM; case VK_FORMAT_G8_B8R8_2PLANE_420_UNORM: return PIPE_FORMAT_G8_B8R8_420_UNORM; case VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM: