summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2016-06-03 10:25:20 +0900
committerAdam Jackson <ajax@redhat.com>2016-07-06 13:21:27 -0400
commitf05a5859102409fe203bcffa96c0231c8b406659 (patch)
tree88cf6a5905d7b57c4c515998425dd543d6449ca7
parente4bf0e5ad5503c9a1d08080bca0b826ac64bd389 (diff)
xwayland: Call eglBindAPI after eglInitialize
Current Mesa Git master checks that the EGL display actually supports the API passed to eglBindAPI, which can only succeed after eglInitialize. Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> (cherry picked from commit 166d4c817897f5aa197f639bf06b5b3e04994496)
-rw-r--r--hw/xwayland/xwayland-glamor.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
index 04aa8f223..a7ae78603 100644
--- a/hw/xwayland/xwayland-glamor.c
+++ b/hw/xwayland/xwayland-glamor.c
@@ -298,12 +298,13 @@ xwl_drm_init_egl(struct xwl_screen *xwl_screen)
return;
}
- eglBindAPI(EGL_OPENGL_API);
if (!eglInitialize(xwl_screen->egl_display, &major, &minor)) {
ErrorF("eglInitialize() failed\n");
return;
}
+ eglBindAPI(EGL_OPENGL_API);
+
version = eglQueryString(xwl_screen->egl_display, EGL_VERSION);
ErrorF("glamor: EGL version %s:\n", version);