AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tu, fdl: Drop custom mapping for 1-plane YCbCr formats

Browse Source 
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:

0c03d44093 ("util/format: Add G8B8_G8R8_422_UNORM and B8G8_R8G8_422_UNORM formats")

4accbb27a2 ("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 <valentine.burley@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30269>
This commit is contained in:
Valentine Burley
2024-07-18 12:50:09 +02:00
committed by Marge Bot
parent cd961a7e3f
commit 7fe8033e8b
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/freedreno/fdl/fd6_format_table.c
+2 -2
View File
@@ -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 */
src/freedreno/fdl/fd6_view.c
+2 -2
View File
@@ -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
src/freedreno/vulkan/tu_formats.cc
-4
View File
@@ -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: