RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

x11egl: minor cleanup 

Not like it matters, and is probably still not entirely correct.
This commit is contained in:
wm4 2015-02-20 18:53:59 +01:00
parent 9861abf8ff
commit d5addec147
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
video/out/gl_x11egl.c
View File

@ -44,7 +44,7 @@ static EGLConfig select_fb_config_egl(struct MPGLContext *ctx, bool es)
EGL_GREEN_SIZE, 8, EGL_GREEN_SIZE, 8,
EGL_BLUE_SIZE, 8, EGL_BLUE_SIZE, 8,
EGL_DEPTH_SIZE, 0, EGL_DEPTH_SIZE, 0,
EGL_RENDERABLE_TYPE, es ? EGL_OPENGL_ES_BIT : EGL_OPENGL_BIT, EGL_RENDERABLE_TYPE, es ? EGL_OPENGL_ES2_BIT : EGL_OPENGL_BIT,
EGL_NONE EGL_NONE
}; };
@ -67,7 +67,7 @@ static bool create_context_egl(MPGLContext *ctx, EGLConfig config,
struct priv *p = ctx->priv; struct priv *p = ctx->priv;
EGLint context_attributes[] = { EGLint context_attributes[] = {
EGL_CONTEXT_MAJOR_VERSION_KHR, EGL_CONTEXT_CLIENT_VERSION, // aka EGL_CONTEXT_MAJOR_VERSION_KHR
es ? 2 : MPGL_VER_GET_MAJOR(ctx->requested_gl_version), es ? 2 : MPGL_VER_GET_MAJOR(ctx->requested_gl_version),
EGL_NONE EGL_NONE
}; };
@ -103,10 +103,12 @@ static bool config_window_x11_egl_(struct MPGLContext *ctx, int flags, bool es)
return true; return true;
} }
eglBindAPI(es ? EGL_OPENGL_ES_API : EGL_OPENGL_API); if (!eglBindAPI(es ? EGL_OPENGL_ES_API : EGL_OPENGL_API))
return false;
p->egl_display = eglGetDisplay(vo->x11->display); p->egl_display = eglGetDisplay(vo->x11->display);
eglInitialize(p->egl_display, NULL, NULL); if (!eglInitialize(p->egl_display, NULL, NULL))
return false;
EGLConfig config = select_fb_config_egl(ctx, es); EGLConfig config = select_fb_config_egl(ctx, es);
if (!config) if (!config)