Merge remote-tracking branch 'michaelforney/master'

This commit is contained in:
Alexander Preisinger 2013-07-20 17:21:51 +02:00
commit ccc4512e1d
1 changed files with 11 additions and 2 deletions

View File

@ -154,8 +154,17 @@ static bool egl_create_context(struct vo_wayland_state *wl,
egl_ctx->egl.conf, egl_ctx->egl.conf,
EGL_NO_CONTEXT, EGL_NO_CONTEXT,
context_attribs); context_attribs);
if (!egl_ctx->egl.ctx) if (!egl_ctx->egl.ctx) {
return false; /* fallback to any GL version */
context_attribs[0] = EGL_NONE;
egl_ctx->egl.ctx = eglCreateContext(egl_ctx->egl.dpy,
egl_ctx->egl.conf,
EGL_NO_CONTEXT,
context_attribs);
if (!egl_ctx->egl.ctx)
return false;
}
eglMakeCurrent(egl_ctx->egl.dpy, NULL, NULL, egl_ctx->egl.ctx); eglMakeCurrent(egl_ctx->egl.dpy, NULL, NULL, egl_ctx->egl.ctx);