From b823b43dca143810146f563d09e8996058b9d09e Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Tue, 5 Jun 2018 19:38:38 +0200 Subject: [PATCH] xwayland: GBM should fail w/out "GL_OES_EGL_image" Surely, we should fail to init GBM backend if "GL_OES_EGL_image" is missing. This seems to have been lost with commit 1545e2dba ("xwayland: Decouple GBM from glamor"). Suggested-by: Emil Velikov Signed-off-by: Olivier Fourdan Reviewed-by: Emil Velikov --- hw/xwayland/xwayland-glamor-gbm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/xwayland/xwayland-glamor-gbm.c b/hw/xwayland/xwayland-glamor-gbm.c index f6e5706ce..939a3c030 100644 --- a/hw/xwayland/xwayland-glamor-gbm.c +++ b/hw/xwayland/xwayland-glamor-gbm.c @@ -807,8 +807,10 @@ xwl_glamor_gbm_init_egl(struct xwl_screen *xwl_screen) goto error; } - if (!epoxy_has_gl_extension("GL_OES_EGL_image")) + if (!epoxy_has_gl_extension("GL_OES_EGL_image")) { ErrorF("GL_OES_EGL_image not available\n"); + goto error; + } if (epoxy_has_egl_extension(xwl_screen->egl_display, "EXT_image_dma_buf_import") &&