diff --git a/src/gallium/drivers/virgl/virgl_encode.c b/src/gallium/drivers/virgl/virgl_encode.c index 8d27d392e5f..509a67a14a3 100644 --- a/src/gallium/drivers/virgl/virgl_encode.c +++ b/src/gallium/drivers/virgl/virgl_encode.c @@ -355,7 +355,7 @@ static const enum virgl_formats virgl_formats_conv_table[PIPE_FORMAT_COUNT] = { CONV_FORMAT(Y8_400_UNORM) CONV_FORMAT(Y8_U8_V8_444_UNORM) CONV_FORMAT(Y8_U8_V8_422_UNORM) - CONV_FORMAT(Y8_U8V8_422_UNORM) + [PIPE_FORMAT_NV16] = VIRGL_FORMAT_Y8_U8V8_422_UNORM, CONV_FORMAT(Y8_UNORM) CONV_FORMAT(YVYU) CONV_FORMAT(Z16_UNORM_S8_UINT) diff --git a/src/util/format/u_format.h b/src/util/format/u_format.h index a9c87beb143..818c073025f 100644 --- a/src/util/format/u_format.h +++ b/src/util/format/u_format.h @@ -1287,7 +1287,7 @@ util_format_get_plane_format(enum pipe_format format, unsigned plane) case PIPE_FORMAT_Y8_U8_V8_440_UNORM: return PIPE_FORMAT_R8_UNORM; case PIPE_FORMAT_NV12: - case PIPE_FORMAT_Y8_U8V8_422_UNORM: + case PIPE_FORMAT_NV16: return !plane ? PIPE_FORMAT_R8_UNORM : PIPE_FORMAT_RG88_UNORM; case PIPE_FORMAT_NV21: return !plane ? PIPE_FORMAT_R8_UNORM : PIPE_FORMAT_GR88_UNORM; @@ -1321,7 +1321,7 @@ util_format_get_plane_width(enum pipe_format format, unsigned plane, case PIPE_FORMAT_P016: case PIPE_FORMAT_P030: case PIPE_FORMAT_Y8_U8_V8_422_UNORM: - case PIPE_FORMAT_Y8_U8V8_422_UNORM: + case PIPE_FORMAT_NV16: case PIPE_FORMAT_Y16_U16_V16_420_UNORM: case PIPE_FORMAT_Y16_U16_V16_422_UNORM: case PIPE_FORMAT_Y16_U16V16_422_UNORM: diff --git a/src/util/format/u_format.yaml b/src/util/format/u_format.yaml index 0eb73085ce1..30913dd1e02 100644 --- a/src/util/format/u_format.yaml +++ b/src/util/format/u_format.yaml @@ -2003,7 +2003,7 @@ block: {width: 1, height: 1, depth: 1} channels: [] swizzles: [X, Y, Z, W] -- name: Y8_U8V8_422_UNORM +- name: NV16 layout: planar2 colorspace: YUV block: {width: 1, height: 1, depth: 1} diff --git a/src/util/format/u_format_table.py b/src/util/format/u_format_table.py index bc91302e996..fda24594002 100644 --- a/src/util/format/u_format_table.py +++ b/src/util/format/u_format_table.py @@ -109,7 +109,6 @@ def has_access(format): 'x4g12_x4b12x4r12_420_unorm', 'y8_400_unorm', 'y8_u8_v8_422_unorm', - 'y8_u8v8_422_unorm', 'y8_u8_v8_444_unorm', 'y8_u8_v8_440_unorm', 'y16_u16_v16_420_unorm', diff --git a/src/util/format/u_formats.h b/src/util/format/u_formats.h index 18c5cf3f014..21816463b69 100644 --- a/src/util/format/u_formats.h +++ b/src/util/format/u_formats.h @@ -305,12 +305,13 @@ enum pipe_format { PIPE_FORMAT_IYUV, /**< aka I420 */ PIPE_FORMAT_NV12, PIPE_FORMAT_NV21, + PIPE_FORMAT_NV16, PIPE_FORMAT_Y8_400_UNORM, /* PIPE_FORMAT_Y8_U8_V8_420_UNORM = IYUV */ /* PIPE_FORMAT_Y8_U8V8_420_UNORM = NV12 */ PIPE_FORMAT_Y8_U8_V8_422_UNORM, - PIPE_FORMAT_Y8_U8V8_422_UNORM, + /*PIPE_FORMAT_Y8_U8V8_422_UNORM = NV16 */ PIPE_FORMAT_Y8_U8_V8_444_UNORM, PIPE_FORMAT_Y8_U8_V8_440_UNORM, @@ -579,8 +580,8 @@ pipe_format_to_chroma_format(enum pipe_format format) case PIPE_FORMAT_YUYV: case PIPE_FORMAT_YVYU: case PIPE_FORMAT_YV16: + case PIPE_FORMAT_NV16: case PIPE_FORMAT_Y8_U8_V8_422_UNORM: - case PIPE_FORMAT_Y8_U8V8_422_UNORM: case PIPE_FORMAT_Y16_U16_V16_422_UNORM: case PIPE_FORMAT_Y16_U16V16_422_UNORM: return PIPE_VIDEO_CHROMA_FORMAT_422; diff --git a/src/vulkan/util/vk_format.c b/src/vulkan/util/vk_format.c index 8b08d8b8c5a..2c821e48ae6 100644 --- a/src/vulkan/util/vk_format.c +++ b/src/vulkan/util/vk_format.c @@ -283,7 +283,7 @@ vk_format_to_pipe_format(enum VkFormat vkformat) case VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM: return PIPE_FORMAT_Y8_U8_V8_422_UNORM; case VK_FORMAT_G8_B8R8_2PLANE_422_UNORM: - return PIPE_FORMAT_Y8_U8V8_422_UNORM; + return PIPE_FORMAT_NV16; case VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM: return PIPE_FORMAT_Y8_U8_V8_444_UNORM; case VK_FORMAT_G16_B16_R16_3PLANE_420_UNORM: