Mesa (main): mesa: Add EXT_texture_mirror_clamp_to_edge to extension table

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 799710be8895747f53361378605d151cf0e0eab8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=799710be8895747f53361378605d151cf0e0eab8

Author: Gert Wollny <gert.wollny at collabora.com>
Date:   Mon Apr 19 14:22:17 2021 +0200

mesa: Add EXT_texture_mirror_clamp_to_edge to extension table

This is the OpenGL ES version of ARB_texture_mirror_clamp_to_edge.

v2: fix TexParameter validation (Erik)
v3: Use modernized extension test (Erik)

Signed-off-by: Gert Wollny <gert.wollny at collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10325>

---

 src/mesa/main/extensions_table.h | 1 +
 src/mesa/main/texparam.c         | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h
index f552efe3ed5..9e4987e2245 100644
--- a/src/mesa/main/extensions_table.h
+++ b/src/mesa/main/extensions_table.h
@@ -319,6 +319,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_mirror_clamp_to_edge        , ARB_texture_mirror_clamp_to_edge       ,  x ,  x ,  x , ES2, 2017)
 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)
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index d849facdd18..3a3ea8aae94 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -95,10 +95,11 @@ validate_texture_wrap_mode(struct gl_context * ctx, GLenum target, GLenum wrap)
       break;
 
    case GL_MIRROR_CLAMP_TO_EDGE_EXT:
-      supported = is_desktop_gl
-         && (e->ATI_texture_mirror_once || e->EXT_texture_mirror_clamp || e->ARB_texture_mirror_clamp_to_edge)
-         && (target != GL_TEXTURE_RECTANGLE_NV)
-         && (target != GL_TEXTURE_EXTERNAL_OES);
+      supported = (target != GL_TEXTURE_RECTANGLE_NV)
+         && (target != GL_TEXTURE_EXTERNAL_OES)
+         && (_mesa_has_ARB_texture_mirror_clamp_to_edge(ctx) ||
+            _mesa_has_ATI_texture_mirror_once(ctx) ||
+            _mesa_has_EXT_texture_mirror_clamp(ctx));
       break;
 
    case GL_MIRROR_CLAMP_TO_BORDER_EXT: