diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2016-06-03 10:25:19 +0900 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2016-06-08 11:51:04 -0400 |
| commit | d798b8318adf298bc23166e74f31e49805f0d881 (patch) | |
| tree | b04f608b545b936ebe0d2520028aff48b64da19e /glamor/glamor_egl.c | |
| parent | 5bcdd1cc753d8e60c249eeacba695653af1a39d8 (diff) | |
glamor: 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.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96344
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Diffstat (limited to 'glamor/glamor_egl.c')
| -rw-r--r-- | glamor/glamor_egl.c | 11 |
1 files 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); |