frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Michel Dänzer 2016-06-03 10:25:19 +09:00 committed by Adam Jackson
parent 5bcdd1cc75
commit d798b8318a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
glamor/glamor_egl.c
View File

@ -770,11 +770,6 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
glamor_egl->has_gem = glamor_egl_check_has_gem(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 if (!eglInitialize
(glamor_egl->display, &glamor_egl->major, &glamor_egl->minor)) { (glamor_egl->display, &glamor_egl->major, &glamor_egl->minor)) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR, "eglInitialize() failed\n"); xf86DrvMsg(scrn->scrnIndex, X_ERROR, "eglInitialize() failed\n");
@ -782,6 +777,12 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
goto error; goto error;
} }
#ifndef GLAMOR_GLES2
eglBindAPI(EGL_OPENGL_API);
#else
eglBindAPI(EGL_OPENGL_ES_API);
#endif
version = eglQueryString(glamor_egl->display, EGL_VERSION); version = eglQueryString(glamor_egl->display, EGL_VERSION);
xf86Msg(X_INFO, "%s: EGL version %s:\n", glamor_name, version); xf86Msg(X_INFO, "%s: EGL version %s:\n", glamor_name, version);