Mesa (staging/21.1): zink: remove duplicate format-mapping on little-endian

[GitLab Mirror]

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

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Wed Jun 16 13:00:57 2021 +0200

zink: remove duplicate format-mapping on little-endian

Doing *both* of thse ends up rewriting the previous mapping. Since this
doesn't seem to have lead to issues, it seems like the new mapping works
just as well.

Fixes: a22a1c0324e ("zink: Fix VK_FORMAT_A8B8G8R8_SRGB_PACK32 mapping on big-endian")
Reviewed-by: Adam Jackson <ajax at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11417>
(cherry picked from commit 4efbeafa446962cc1a393fa2c0d01f83feaa42db)

---

 .pick_status.json                      | 2 +-
 src/gallium/drivers/zink/zink_format.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 166f50b26ce..54484564403 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -913,7 +913,7 @@
         "description": "zink: remove duplicate format-mapping on little-endian",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "a22a1c0324e0d20c03ee4dceb9ddc4fa4d07ec04"
     },
diff --git a/src/gallium/drivers/zink/zink_format.c b/src/gallium/drivers/zink/zink_format.c
index 18b6d4ef61e..1578bd47948 100644
--- a/src/gallium/drivers/zink/zink_format.c
+++ b/src/gallium/drivers/zink/zink_format.c
@@ -77,7 +77,6 @@ static const VkFormat formats[PIPE_FORMAT_COUNT] = {
    MAP_FORMAT_NORM(R8G8B8A8)
    MAP_FORMAT_SCALED(R8G8B8A8)
    MAP_FORMAT_INT(R8G8B8A8)
-   MAP_FORMAT_SRGB(R8G8B8A8)
    MAP_FORMAT_NORM(B8G8R8A8)
    MAP_FORMAT_SCALED(B8G8R8A8)
    MAP_FORMAT_INT(B8G8R8A8)