fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 11:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: Add EXT_texture_mirror_clamp_to_edge to extension table

Browse source 
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@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10325>
This commit is contained in:
Gert Wollny 2021-04-19 14:22:17 +02:00 • committed by Marge Bot
parent 757bc6d37a
commit 799710be88
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/mesa/main/extensions_table.h
View file

@ -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_integer , EXT_texture_integer , GLL, GLC, x , x , 2006)
EXT(EXT_texture_lod_bias , dummy_true , GLL, x , ES1, x , 1999) 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 , 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_norm16 , EXT_texture_norm16 , x , x , x , 31, 2014)
EXT(EXT_texture_object , dummy_true , GLL, x , x , x , 1995) 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_query_lod , ARB_texture_query_lod , x , x , x , 30, 2019)

9
src/mesa/main/texparam.c
View file

@ -95,10 +95,11 @@ validate_texture_wrap_mode(struct gl_context * ctx, GLenum target, GLenum wrap)
break; break;
case GL_MIRROR_CLAMP_TO_EDGE_EXT: case GL_MIRROR_CLAMP_TO_EDGE_EXT:
supported = is_desktop_gl supported = (target != GL_TEXTURE_RECTANGLE_NV)
&& (e->ATI_texture_mirror_once || e->EXT_texture_mirror_clamp || e->ARB_texture_mirror_clamp_to_edge) && (target != GL_TEXTURE_EXTERNAL_OES)
&& (target != GL_TEXTURE_RECTANGLE_NV) && (_mesa_has_ARB_texture_mirror_clamp_to_edge(ctx) ||
&& (target != GL_TEXTURE_EXTERNAL_OES); _mesa_has_ATI_texture_mirror_once(ctx) ||
_mesa_has_EXT_texture_mirror_clamp(ctx));
break; break;
case GL_MIRROR_CLAMP_TO_BORDER_EXT: case GL_MIRROR_CLAMP_TO_BORDER_EXT: