Mesa (staging/20.3): zink: fix format-mapping

[GitLab Mirror]

Module: Mesa
Branch: staging/20.3
Commit: f99fc9e73e374494536101d42abdab5e45f0ab5d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f99fc9e73e374494536101d42abdab5e45f0ab5d

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Mon Dec  7 20:51:45 2020 +0100

zink: fix format-mapping

These formats are incorrectly mapped, and should be reversed.

Fixes: 8d46e35d16e ("zink: introduce opengl over vulkan")

Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7982>
(cherry picked from commit d788a1d6f4ef07f75eaa761ae715ec4d5c852885)

Conflicts:
	src/gallium/drivers/zink/zink_format.c

---

 .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 ed8018c0893..0b2e35cd655 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -832,7 +832,7 @@
         "description": "zink: fix format-mapping",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "8d46e35d16e3936968958bcab86d61967a673305"
     },
diff --git a/src/gallium/drivers/zink/zink_format.c b/src/gallium/drivers/zink/zink_format.c
index b78278d9de3..598cb98a4f3 100644
--- a/src/gallium/drivers/zink/zink_format.c
+++ b/src/gallium/drivers/zink/zink_format.c
@@ -76,7 +76,7 @@ static const VkFormat formats[PIPE_FORMAT_COUNT] = {
    [PIPE_FORMAT_B8G8R8X8_UNORM] = VK_FORMAT_B8G8R8A8_UNORM,
    MAP_FORMAT_SRGB(B8G8R8A8)
    [PIPE_FORMAT_B8G8R8X8_SRGB] = VK_FORMAT_B8G8R8A8_SRGB,
-   [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)
@@ -88,7 +88,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 */