[vlc-commits] gl: vaapi: do earlier gl/egl extensions checks

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Jul  4 14:42:25 2017 +0200| [c5f0aec32a0ac695eb2422d64097392e9e169b55] | committer: Thomas Guillem

gl: vaapi: do earlier gl/egl extensions checks

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c5f0aec32a0ac695eb2422d64097392e9e169b55
---

 modules/video_output/opengl/converter_vaapi.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/video_output/opengl/converter_vaapi.c b/modules/video_output/opengl/converter_vaapi.c
index 1775cd0cb1..567f0c5c75 100644
--- a/modules/video_output/opengl/converter_vaapi.c
+++ b/modules/video_output/opengl/converter_vaapi.c
@@ -307,13 +307,6 @@ tc_vaegl_init(opengl_tex_converter_t *tc, VADisplay *vadpy)
     priv->vadpy = vadpy;
     priv->fourcc = 0;
 
-    if (!HasExtension(tc->glexts, "GL_OES_EGL_image"))
-        goto error;
-
-    const char *eglexts = tc->gl->egl.queryString(tc->gl, EGL_EXTENSIONS);
-    if (eglexts == NULL || !HasExtension(eglexts, "EGL_EXT_image_dma_buf_import"))
-        goto error;
-
     if (vaegl_init_fourcc(tc, priv, VA_FOURCC_NV12))
         goto error;
 
@@ -357,6 +350,13 @@ opengl_tex_converter_vaapi_init(opengl_tex_converter_t *tc)
      || tc->gl->egl.destroyImageKHR == NULL)
         return VLC_EGENERIC;
 
+    if (!HasExtension(tc->glexts, "GL_OES_EGL_image"))
+        return VLC_EGENERIC;
+
+    const char *eglexts = tc->gl->egl.queryString(tc->gl, EGL_EXTENSIONS);
+    if (eglexts == NULL || !HasExtension(eglexts, "EGL_EXT_image_dma_buf_import"))
+        return VLC_EGENERIC;
+
     switch (tc->gl->surface->type)
     {
 #ifdef HAVE_VA_X11