summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTapani Pälli <tapani.palli@intel.com>2020-02-27 10:33:33 +0200
committerEric Engestrom <eric@engestrom.ch>2020-03-06 22:59:31 +0100
commit8438a41d7b20116785f377e4c672fa6232c57cca (patch)
tree15fd3d07a5823baba8fb0b71dcf27beccaa82340
parent8e986a28fabafefd48b182a1e82990dd11536295 (diff)
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@intel.com> Reviewed-by: Eric Anholt <eric@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)
-rw-r--r--.pick_status.json2
-rw-r--r--src/mesa/state_tracker/st_extensions.c7
2 files changed, 1 insertions, 8 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 7df243e9fc9..932b3a3a446 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2065,7 +2065,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 34ce5fb1822..23a3ba5aa0b 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -965,13 +965,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. */