We're using the former only as the latter is present. Thus in some cases we might incorrectly error out if it's missing.
Namely - glamor_glx, glamor_egl without gbm, EGL_KHR_gl_texture_2D_image or EGL_EXT_image_dma_buf_import. Fixes 58d54ee82df(glamor: explicitly check for GL_OES_EGL_image) Cc: Eric Anholt <e...@anholt.net> Suggested-by: Eric Anholt <e...@anholt.net> Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> --- glamor/glamor.c | 5 ----- glamor/glamor_egl.c | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/glamor/glamor.c b/glamor/glamor.c index 8178785..d4a0236 100644 --- a/glamor/glamor.c +++ b/glamor/glamor.c @@ -545,11 +545,6 @@ glamor_init(ScreenPtr screen, unsigned int flags) } } - if (!epoxy_has_gl_extension("GL_OES_EGL_image")) { - ErrorF("GL_OES_EGL_image not available\n"); - goto fail; - } - glamor_priv->has_rw_pbo = FALSE; if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) glamor_priv->has_rw_pbo = TRUE; diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index 8ff1d03..dcff443 100644 --- a/glamor/glamor_egl.c +++ b/glamor/glamor_egl.c @@ -870,7 +870,8 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd) if (epoxy_has_egl_extension(glamor_egl->display, "EGL_KHR_gl_texture_2D_image") && epoxy_has_egl_extension(glamor_egl->display, - "EGL_EXT_image_dma_buf_import")) + "EGL_EXT_image_dma_buf_import") && + epoxy_has_gl_extension("GL_OES_EGL_image")) glamor_egl->dri3_capable = TRUE; #endif -- 2.5.0 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel