Mesa (master): mesa/main: clean up extension-check for GL_TEXTURE_EXTERNAL

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 9ddd9d454c16959d92e6c785aac77ead83fab0b3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9ddd9d454c16959d92e6c785aac77ead83fab0b3

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Mon Feb 25 13:20:35 2019 +0100

mesa/main: clean up extension-check for GL_TEXTURE_EXTERNAL

Signed-off-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/329>

---

 src/mesa/main/enable.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 790df6b38d5..bfd06d47ff3 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -1229,9 +1229,8 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
 
       /* GL_OES_EGL_image_external */
       case GL_TEXTURE_EXTERNAL_OES:
-         if (!_mesa_is_gles(ctx))
+         if (!_mesa_has_OES_EGL_image_external(ctx))
             goto invalid_enum_error;
-         CHECK_EXTENSION(OES_EGL_image_external);
          if (!enable_texture(ctx, state, TEXTURE_EXTERNAL_BIT)) {
             return;
          }
@@ -1900,9 +1899,8 @@ _mesa_IsEnabled( GLenum cap )
 
       /* GL_OES_EGL_image_external */
       case GL_TEXTURE_EXTERNAL_OES:
-         if (!_mesa_is_gles(ctx))
+         if (!_mesa_has_OES_EGL_image_external(ctx))
             goto invalid_enum_error;
-         CHECK_EXTENSION(OES_EGL_image_external);
          return is_texture_enabled(ctx, TEXTURE_EXTERNAL_BIT);
 
       /* ARB_texture_multisample */