From d798b8318adf298bc23166e74f31e49805f0d881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Fri, 3 Jun 2016 10:25:19 +0900 Subject: [PATCH] glamor: Call eglBindAPI after eglInitialize MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Current Mesa Git master checks that the EGL display actually supports the API passed to eglBindAPI, which can only succeed after eglInitialize. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96344 Reviewed-by: Adam Jackson Signed-off-by: Michel Dänzer --- glamor/glamor_egl.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index 4bcd3ce60..16a20a7f8 100644 --- a/glamor/glamor_egl.c +++ b/glamor/glamor_egl.c @@ -770,11 +770,6 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd) glamor_egl->has_gem = glamor_egl_check_has_gem(fd); -#ifndef GLAMOR_GLES2 - eglBindAPI(EGL_OPENGL_API); -#else - eglBindAPI(EGL_OPENGL_ES_API); -#endif if (!eglInitialize (glamor_egl->display, &glamor_egl->major, &glamor_egl->minor)) { xf86DrvMsg(scrn->scrnIndex, X_ERROR, "eglInitialize() failed\n"); @@ -782,6 +777,12 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd) goto error; } +#ifndef GLAMOR_GLES2 + eglBindAPI(EGL_OPENGL_API); +#else + eglBindAPI(EGL_OPENGL_ES_API); +#endif + version = eglQueryString(glamor_egl->display, EGL_VERSION); xf86Msg(X_INFO, "%s: EGL version %s:\n", glamor_name, version);