From c5ffe9e0f2a0559a5d726b7a2c0c4ead8d37200e Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Mon, 7 Dec 2020 12:27:23 +0100 Subject: zink: fix channel ordering in format-mapping This looks like a typo. Packed vulkan formats should always map to the inverse order of the corresponding gallium notation. Besides, it makes no sense that unsigned and signed formats have different ordering. Fixes: cdfb1d925f3 ("zink: add last few format maps for ARB_vertex_type_2_10_10_10_rev") Reviewed-By: Mike Blumenkrantz Part-of: (cherry picked from commit 8bb4a76addd0f0a48585ba9a4a30d6bbc5acec80) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_format.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 6100bc8a800..fe5ec8e0e59 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -256,7 +256,7 @@ "description": "zink: fix channel ordering in format-mapping", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "cdfb1d925f388861751ce04a0000141013e1c704" }, diff --git a/src/gallium/drivers/zink/zink_format.c b/src/gallium/drivers/zink/zink_format.c index f161512e9da..b78278d9de3 100644 --- a/src/gallium/drivers/zink/zink_format.c +++ b/src/gallium/drivers/zink/zink_format.c @@ -95,11 +95,11 @@ static const VkFormat formats[PIPE_FORMAT_COUNT] = { [PIPE_FORMAT_R10G10B10A2_UNORM] = VK_FORMAT_A2B10G10R10_UNORM_PACK32, [PIPE_FORMAT_R10G10B10A2_SNORM] = VK_FORMAT_A2B10G10R10_SNORM_PACK32, [PIPE_FORMAT_B10G10R10A2_UNORM] = VK_FORMAT_A2R10G10B10_UNORM_PACK32, - [PIPE_FORMAT_B10G10R10A2_SNORM] = VK_FORMAT_A2B10G10R10_SNORM_PACK32, + [PIPE_FORMAT_B10G10R10A2_SNORM] = VK_FORMAT_A2R10G10B10_SNORM_PACK32, [PIPE_FORMAT_R10G10B10A2_USCALED] = VK_FORMAT_A2B10G10R10_USCALED_PACK32, [PIPE_FORMAT_R10G10B10A2_SSCALED] = VK_FORMAT_A2B10G10R10_SSCALED_PACK32, [PIPE_FORMAT_B10G10R10A2_USCALED] = VK_FORMAT_A2R10G10B10_USCALED_PACK32, - [PIPE_FORMAT_B10G10R10A2_SSCALED] = VK_FORMAT_A2B10G10R10_SSCALED_PACK32, + [PIPE_FORMAT_B10G10R10A2_SSCALED] = VK_FORMAT_A2R10G10B10_SSCALED_PACK32, [PIPE_FORMAT_R10G10B10A2_UINT] = VK_FORMAT_A2B10G10R10_UINT_PACK32, [PIPE_FORMAT_B10G10R10A2_UINT] = VK_FORMAT_A2R10G10B10_UINT_PACK32, -- cgit v1.2.3