RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-23 23:32:26 +00:00
Code Issues Releases Wiki Activity

wayland: Remove nonsense comment and add warning

Browse Source 
The reason a segmentation happend here was because we couldn't get the
requested minor version. The major version is enough for differentiating
between OpenGL 3 and OpenGL 2. If it fails there is still a fallback to any
version available.

Also add a warning if we use the fallback.
This commit is contained in:
Alexander Preisinger 2014-01-04 15:33:52 +01:00
parent 340ab6cd72
commit f5565f33c7
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
video/out/gl_wayland.c
View File

@ -106,10 +106,6 @@ static bool egl_create_context(struct vo_wayland_state *wl,
EGLint context_attribs[] = { EGLint context_attribs[] = {
EGL_CONTEXT_MAJOR_VERSION_KHR, EGL_CONTEXT_MAJOR_VERSION_KHR,
MPGL_VER_GET_MAJOR(ctx->requested_gl_version), MPGL_VER_GET_MAJOR(ctx->requested_gl_version),
/* EGL_CONTEXT_MINOR_VERSION_KHR, */
/* MPGL_VER_GET_MINOR(ctx->requested_gl_version), */
/* EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE_BIT_KHR, 0, */
/* Segfaults on anything else than the major version */
EGL_NONE EGL_NONE
}; };
@ -125,6 +121,8 @@ static bool egl_create_context(struct vo_wayland_state *wl,
context_attribs); context_attribs);
if (!egl_ctx->egl.ctx) { if (!egl_ctx->egl.ctx) {
/* fallback to any GL version */ /* fallback to any GL version */
MP_WARN(wl, "can't create context for requested OpenGL version: "
"fall back to any version available");
context_attribs[0] = EGL_NONE; context_attribs[0] = EGL_NONE;
egl_ctx->egl.ctx = eglCreateContext(egl_ctx->egl.dpy, egl_ctx->egl.ctx = eglCreateContext(egl_ctx->egl.dpy,
egl_ctx->egl.conf, egl_ctx->egl.conf,