From 70c89a2269c546763eea52e17bb75c32eca8a164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tapani=20P=C3=A4lli?= Date: Wed, 26 Feb 2020 10:27:04 +0200 Subject: mesa: introduce boolean toggle for EXT_texture_norm16 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: 7f467d4f738 ("mesa: GL_EXT_texture_norm16 extension plumbing") Signed-off-by: Tapani Pälli Reviewed-by: Lionel Landwerlin Part-of: (cherry picked from commit dc531869a918dc75ffc09b38851b750ba62673f8) --- .pick_status.json | 2 +- src/mesa/main/extensions_table.h | 2 +- src/mesa/main/mtypes.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index c272c68ed4a..02c4a59b195 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3514,7 +3514,7 @@ "description": "mesa: introduce boolean toggle for EXT_texture_norm16", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "7f467d4f73828ba782a2db38c74d33b85646dc85" }, diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h index 9b056c513a2..23a37810ddc 100644 --- a/src/mesa/main/extensions_table.h +++ b/src/mesa/main/extensions_table.h @@ -310,7 +310,7 @@ EXT(EXT_texture_format_BGRA8888 , dummy_true EXT(EXT_texture_integer , EXT_texture_integer , GLL, GLC, x , x , 2006) EXT(EXT_texture_lod_bias , dummy_true , GLL, x , ES1, x , 1999) EXT(EXT_texture_mirror_clamp , EXT_texture_mirror_clamp , GLL, GLC, x , x , 2004) -EXT(EXT_texture_norm16 , dummy_true , x , x , x , 31, 2014) +EXT(EXT_texture_norm16 , EXT_texture_norm16 , x , x , x , 31, 2014) EXT(EXT_texture_object , dummy_true , GLL, x , x , x , 1995) EXT(EXT_texture_query_lod , ARB_texture_query_lod , x , x , x , 30, 2019) EXT(EXT_texture_rectangle , NV_texture_rectangle , GLL, x , x , x , 2004) diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 05c684cf6b4..324a67738bf 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -4312,6 +4312,7 @@ struct gl_extensions GLboolean EXT_texture_filter_anisotropic; GLboolean EXT_texture_integer; GLboolean EXT_texture_mirror_clamp; + GLboolean EXT_texture_norm16; GLboolean EXT_texture_shadow_lod; GLboolean EXT_texture_shared_exponent; GLboolean EXT_texture_snorm; -- cgit v1.2.1