From d788a1d6f4ef07f75eaa761ae715ec4d5c852885 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Mon, 7 Dec 2020 20:51:45 +0100 Subject: [PATCH] zink: fix format-mapping These formats are incorrectly mapped, and should be reversed. Fixes: 8d46e35d16e ("zink: introduce opengl over vulkan") Reviewed-By: Mike Blumenkrantz Part-of: --- src/gallium/drivers/zink/zink_format.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/zink/zink_format.c b/src/gallium/drivers/zink/zink_format.c index 1bf104b..165ee12 100644 --- a/src/gallium/drivers/zink/zink_format.c +++ b/src/gallium/drivers/zink/zink_format.c @@ -74,7 +74,7 @@ static const VkFormat formats[PIPE_FORMAT_COUNT] = { MAP_FORMAT_SRGB(R8G8B8A8) [PIPE_FORMAT_B8G8R8A8_UNORM] = VK_FORMAT_B8G8R8A8_UNORM, MAP_FORMAT_SRGB(B8G8R8A8) - [PIPE_FORMAT_A8B8G8R8_SRGB] = VK_FORMAT_A8B8G8R8_SRGB_PACK32, + [PIPE_FORMAT_R8G8B8A8_SRGB] = VK_FORMAT_A8B8G8R8_SRGB_PACK32, // 16-bits MAP_FORMAT_NORM(R16G16B16A16) MAP_FORMAT_SCALED(R16G16B16A16) @@ -86,7 +86,7 @@ static const VkFormat formats[PIPE_FORMAT_COUNT] = { // other color formats [PIPE_FORMAT_B5G6R5_UNORM] = VK_FORMAT_R5G6B5_UNORM_PACK16, - [PIPE_FORMAT_B5G5R5A1_UNORM] = VK_FORMAT_B5G5R5A1_UNORM_PACK16, + [PIPE_FORMAT_A1R5G5B5_UNORM] = VK_FORMAT_B5G5R5A1_UNORM_PACK16, [PIPE_FORMAT_R11G11B10_FLOAT] = VK_FORMAT_B10G11R11_UFLOAT_PACK32, [PIPE_FORMAT_R9G9B9E5_FLOAT] = VK_FORMAT_E5B9G9R9_UFLOAT_PACK32, /* ARB_vertex_type_2_10_10_10 */ -- 2.7.4