Mesa (staging/20.0): mesa/st: fix formats required for EXT_texture_norm16

[GitLab Mirror]

Module: Mesa
Branch: staging/20.0
Commit: 54574288a10b751f7c95a3ab571ed90166ae4282
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=54574288a10b751f7c95a3ab571ed90166ae4282

Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Thu Feb 27 10:33:33 2020 +0200

mesa/st: fix formats required for EXT_texture_norm16

Earlier commit did not take in to account that lists required for
rendering and texturing are parsed separately. This commit simply
removes formats added to the other list.

Fixes: de4eb9a3bb9 ("mesa/st: toggle EXT_texture_norm16 based on format support")
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3961>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3961>
(cherry picked from commit fbd61b3fb66bcc3eb0f65da2c869046c24c35dc8)

---

 .pick_status.json                      | 2 +-
 src/mesa/state_tracker/st_extensions.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 0084b7366eb..d7fca904967 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -94,7 +94,7 @@
         "description": "mesa/st: fix formats required for EXT_texture_norm16",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "de4eb9a3bb9fb073a5bf5cc157918bfa0f62b394"
     },
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index ae87f97e430..6e67df55ab8 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -969,13 +969,6 @@ void st_init_extensions(struct pipe_screen *screen,
         { PIPE_FORMAT_ATC_RGB,
           PIPE_FORMAT_ATC_RGBA_EXPLICIT,
           PIPE_FORMAT_ATC_RGBA_INTERPOLATED } },
-
-      { { o(EXT_texture_norm16) },
-        { PIPE_FORMAT_R16G16B16_UNORM,
-          PIPE_FORMAT_R16_SNORM,
-          PIPE_FORMAT_R16G16_SNORM,
-          PIPE_FORMAT_R16G16B16_SNORM,
-          PIPE_FORMAT_R16G16B16A16_SNORM } },
    };
 
    /* Required: vertex fetch support. */