Mesa (main): util: Rename PIPE_FORMAT_G8_B8_R8_420_UNORM.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Nov 11 00:47:59 UTC 2021
Module: Mesa
Branch: main
Commit: 271b6cb981e731e7e64484c153ba51315aa59163
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=271b6cb981e731e7e64484c153ba51315aa59163
Author: Emma Anholt <emma at anholt.net>
Date: Wed Oct 20 15:34:03 2021 -0700
util: Rename PIPE_FORMAT_G8_B8_R8_420_UNORM.
The only user, turnip, was actually treating it as this layout, matching
vulkan's specification of how the planes map to RGB values. (Y=G means
that Cb=B and Cr=R).
Reviewed-by: Rob Clark <robdclark at chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13443>
---
src/freedreno/fdl/fd6_format_table.c | 2 +-
src/freedreno/fdl/fd6_view.c | 4 ++--
src/freedreno/vulkan/tu_clear_blit.c | 2 +-
src/freedreno/vulkan/tu_formats.c | 2 +-
src/gallium/include/pipe/p_format.h | 2 +-
src/util/format/u_format.csv | 2 +-
src/util/format/u_format_table.py | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/freedreno/fdl/fd6_format_table.c b/src/freedreno/fdl/fd6_format_table.c
index aa1c45c2b8e..48144ede4aa 100644
--- a/src/freedreno/fdl/fd6_format_table.c
+++ b/src/freedreno/fdl/fd6_format_table.c
@@ -363,7 +363,7 @@ static const struct fd6_format formats[PIPE_FORMAT_COUNT] = {
_T_(G8R8_B8R8_UNORM, G8R8B8R8_422_UNORM, WZYX), /* UYVY */
_T_(R8_G8B8_420_UNORM, R8_G8B8_2PLANE_420_UNORM, WZYX),
- _T_(R8_G8_B8_420_UNORM, R8_G8_B8_3PLANE_420_UNORM, WZYX),
+ _T_(G8_B8_R8_420_UNORM, R8_G8_B8_3PLANE_420_UNORM, WZYX),
};
/* clang-format on */
diff --git a/src/freedreno/fdl/fd6_view.c b/src/freedreno/fdl/fd6_view.c
index 8b611080996..41790f2b067 100644
--- a/src/freedreno/fdl/fd6_view.c
+++ b/src/freedreno/fdl/fd6_view.c
@@ -62,7 +62,7 @@ fdl6_texswiz(const struct fdl_view_args *args, bool has_z24uint_s8uint)
case PIPE_FORMAT_R8G8_R8B8_UNORM:
case PIPE_FORMAT_G8R8_B8R8_UNORM:
case PIPE_FORMAT_R8_G8B8_420_UNORM:
- case PIPE_FORMAT_R8_G8_B8_420_UNORM:
+ case PIPE_FORMAT_G8_B8_R8_420_UNORM:
format_swiz[0] = PIPE_SWIZZLE_Z;
format_swiz[1] = PIPE_SWIZZLE_X;
format_swiz[2] = PIPE_SWIZZLE_Y;
@@ -208,7 +208,7 @@ fdl6_view_init(struct fdl6_view *view, const struct fdl_layout **layouts,
view->descriptor[3] |= A6XX_TEX_CONST_3_TILE_ALL;
if (args->format == PIPE_FORMAT_R8_G8B8_420_UNORM ||
- args->format == PIPE_FORMAT_R8_G8_B8_420_UNORM) {
+ args->format == PIPE_FORMAT_G8_B8_R8_420_UNORM) {
/* chroma offset re-uses MIPLVLS bits */
assert(args->level_count == 1);
if (args->chroma_offsets[0] == FDL_CHROMA_LOCATION_MIDPOINT)
diff --git a/src/freedreno/vulkan/tu_clear_blit.c b/src/freedreno/vulkan/tu_clear_blit.c
index 2e1f10ab3c8..540027c8d64 100644
--- a/src/freedreno/vulkan/tu_clear_blit.c
+++ b/src/freedreno/vulkan/tu_clear_blit.c
@@ -1189,7 +1189,7 @@ copy_format(VkFormat vk_format, VkImageAspectFlags aspect_mask, bool copy_buffer
return PIPE_FORMAT_R8G8_UNORM;
else
return PIPE_FORMAT_Y8_UNORM;
- case PIPE_FORMAT_R8_G8_B8_420_UNORM:
+ case PIPE_FORMAT_G8_B8_R8_420_UNORM:
return PIPE_FORMAT_R8_UNORM;
case PIPE_FORMAT_Z24_UNORM_S8_UINT:
diff --git a/src/freedreno/vulkan/tu_formats.c b/src/freedreno/vulkan/tu_formats.c
index a84e0616b90..75fed40d551 100644
--- a/src/freedreno/vulkan/tu_formats.c
+++ b/src/freedreno/vulkan/tu_formats.c
@@ -71,7 +71,7 @@ tu_vk_format_to_pipe_format(VkFormat vk_format)
case VK_FORMAT_G8_B8R8_2PLANE_420_UNORM:
return PIPE_FORMAT_R8_G8B8_420_UNORM;
case VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM:
- return PIPE_FORMAT_R8_G8_B8_420_UNORM;
+ return PIPE_FORMAT_G8_B8_R8_420_UNORM;
default:
return vk_format_to_pipe_format(vk_format);
}
diff --git a/src/gallium/include/pipe/p_format.h b/src/gallium/include/pipe/p_format.h
index fde4dd24b32..a46212b1c05 100644
--- a/src/gallium/include/pipe/p_format.h
+++ b/src/gallium/include/pipe/p_format.h
@@ -504,7 +504,7 @@ enum pipe_format {
PIPE_FORMAT_XYUV,
PIPE_FORMAT_R8_G8B8_420_UNORM,
- PIPE_FORMAT_R8_G8_B8_420_UNORM,
+ PIPE_FORMAT_G8_B8_R8_420_UNORM,
PIPE_FORMAT_Y8_UNORM,
PIPE_FORMAT_B8G8R8X8_SNORM,
diff --git a/src/util/format/u_format.csv b/src/util/format/u_format.csv
index 7c505f52b0f..06696ab2dcf 100644
--- a/src/util/format/u_format.csv
+++ b/src/util/format/u_format.csv
@@ -400,7 +400,7 @@ PIPE_FORMAT_NV21 , planar2, 1, 1, 1, , , , , xy
# RGB version of NV12 and YV12 for hardware that supports sampling from
# multiplane textures but needs color-space conversion in the shader.
PIPE_FORMAT_R8_G8B8_420_UNORM , planar2, 1, 1, 1, un8, , , , xyzw, rgb
-PIPE_FORMAT_R8_G8_B8_420_UNORM , planar3, 1, 1, 1, un8, , , , xyzw, rgb
+PIPE_FORMAT_G8_B8_R8_420_UNORM , planar3, 1, 1, 1, un8, , , , xyzw, rgb
# While most of Mesa uses R8 for Y, U, and V planes, freedreno requires distinguishing
# between tiled Y8 data and tiled R8 data.
diff --git a/src/util/format/u_format_table.py b/src/util/format/u_format_table.py
index 32b45fe4739..17f52b99728 100644
--- a/src/util/format/u_format_table.py
+++ b/src/util/format/u_format_table.py
@@ -109,7 +109,7 @@ def has_access(format):
'y16_u16v16_422_unorm',
'y16_u16_v16_444_unorm',
'r8_g8b8_420_unorm',
- 'r8_g8_b8_420_unorm',
+ 'g8_b8_r8_420_unorm',
'y8_unorm',
]
if format.short_name() in noaccess_formats:
More information about the mesa-commit
mailing list