Module: Mesa Branch: main Commit: d0df3834b4a1847be5cbc25f0eb9d1dc6b1ebb13 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d0df3834b4a1847be5cbc25f0eb9d1dc6b1ebb13
Author: Eric Engestrom <e...@igalia.com> Date: Sun Dec 3 19:41:49 2023 +0000 vk/util: update symbols that have become aliases for newer ones All of these have been renamed in the spec (usually by being promoted); renamed them in our code too. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26487> --- src/vulkan/util/vk_format.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/vulkan/util/vk_format.c b/src/vulkan/util/vk_format.c index 8e2a08c1baf..db05d32ce5c 100644 --- a/src/vulkan/util/vk_format.c +++ b/src/vulkan/util/vk_format.c @@ -548,10 +548,10 @@ vk_format_aspects(VkFormat format) case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_422_UNORM_3PACK16: case VK_FORMAT_G16_B16R16_2PLANE_420_UNORM: case VK_FORMAT_G16_B16R16_2PLANE_422_UNORM: - case VK_FORMAT_G8_B8R8_2PLANE_444_UNORM_EXT: - case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16_EXT: - case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16_EXT: - case VK_FORMAT_G16_B16R16_2PLANE_444_UNORM_EXT: + case VK_FORMAT_G8_B8R8_2PLANE_444_UNORM: + case VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16: + case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16: + case VK_FORMAT_G16_B16R16_2PLANE_444_UNORM: return (VK_IMAGE_ASPECT_PLANE_0_BIT | VK_IMAGE_ASPECT_PLANE_1_BIT); @@ -773,19 +773,19 @@ static const struct vk_format_ycbcr_info ycbcr_infos[] = { }; static const struct vk_format_ycbcr_info ycbcr_2plane_444_infos[] = { - ycbcr_fmt(VK_FORMAT_G8_B8R8_2PLANE_444_UNORM_EXT, 2, + ycbcr_fmt(VK_FORMAT_G8_B8R8_2PLANE_444_UNORM, 2, y_plane(VK_FORMAT_R8_UNORM, YCBCR_SWIZ(G, ZERO, ZERO, ZERO), 1, 1), c_plane(VK_FORMAT_R8G8_UNORM, YCBCR_SWIZ(B, R, ZERO, ZERO), 1, 1)), - ycbcr_fmt(VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16_EXT, 2, + ycbcr_fmt(VK_FORMAT_G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16, 2, y_plane(VK_FORMAT_R10X6_UNORM_PACK16, YCBCR_SWIZ(G, ZERO, ZERO, ZERO), 1, 1), c_plane(VK_FORMAT_R10X6G10X6_UNORM_2PACK16, YCBCR_SWIZ(B, R, ZERO, ZERO), 1, 1)), - ycbcr_fmt(VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16_EXT, 2, + ycbcr_fmt(VK_FORMAT_G12X4_B12X4R12X4_2PLANE_444_UNORM_3PACK16, 2, y_plane(VK_FORMAT_R12X4_UNORM_PACK16, YCBCR_SWIZ(G, ZERO, ZERO, ZERO), 1, 1), c_plane(VK_FORMAT_R12X4G12X4_UNORM_2PACK16, YCBCR_SWIZ(B, R, ZERO, ZERO), 1, 1)), - ycbcr_fmt(VK_FORMAT_G16_B16R16_2PLANE_444_UNORM_EXT, 2, + ycbcr_fmt(VK_FORMAT_G16_B16R16_2PLANE_444_UNORM, 2, y_plane(VK_FORMAT_R16_UNORM, YCBCR_SWIZ(G, ZERO, ZERO, ZERO), 1, 1), c_plane(VK_FORMAT_R16G16_UNORM, YCBCR_SWIZ(B, R, ZERO, ZERO), 1, 1)), };
