mesa/main: clean up extension-check for GL_TEXTURE_EXTERNAL
authorErik Faye-Lund <erik.faye-lund@collabora.com>
Mon, 25 Feb 2019 12:20:35 +0000 (13:20 +0100)
committerErik Faye-Lund <erik.faye-lund@collabora.com>
Wed, 1 Apr 2020 10:57:57 +0000 (12:57 +0200)
Signed-off-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/329>

src/mesa/main/enable.c

index 790df6b38d5ac931b3f6a955d709205058ea300d..bfd06d47ff367ea6c54d7d468d440375b223bd89 100644 (file)
@@ -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 */