diff options
| author | Tapani Pälli <tapani.palli@intel.com> | 2020-02-26 10:30:42 +0200 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2020-03-06 22:59:18 +0100 |
| commit | 5a3fbe98cc50faede3480ddf54ea6d0e2f517de9 (patch) | |
| tree | 01cb128a7ef86b5b5d2833fa1e9a9e38ec71b786 | |
| parent | c15d94c6358d78a2e8a8ae18a0f33a6402bfea73 (diff) | |
mesa/st: toggle EXT_texture_norm16 based on format support
Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2556
Fixes: 7f467d4f738 ("mesa: GL_EXT_texture_norm16 extension plumbing")
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3941>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3941>
(cherry picked from commit de4eb9a3bb9fb073a5bf5cc157918bfa0f62b394)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_extensions.c | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json index 3b70c71d58e..3bf3e8225ee 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3496,7 +3496,7 @@ "description": "mesa/st: toggle EXT_texture_norm16 based on format support", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "7f467d4f73828ba782a2db38c74d33b85646dc85" }, diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index 252e04c0716..34ce5fb1822 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -822,6 +822,11 @@ void st_init_extensions(struct pipe_screen *screen, { PIPE_FORMAT_R8_UNORM, PIPE_FORMAT_R8G8_UNORM } }, + { { o(EXT_texture_norm16) }, + { PIPE_FORMAT_R16_UNORM, + PIPE_FORMAT_R16G16_UNORM, + PIPE_FORMAT_R16G16B16A16_UNORM } }, + { { o(EXT_render_snorm) }, { PIPE_FORMAT_R8_SNORM, PIPE_FORMAT_R8G8_SNORM, @@ -960,6 +965,13 @@ 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. */ |