diff options
author | wm4 <wm4@nowhere> | 2014-10-12 01:32:26 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-10-12 01:33:10 +0200 |
commit | 9c0389e84117c317be4eab0fdf39e3df1d1008c6 (patch) | |
tree | c142f81958697b67c9612e472dabd2ea0fab7926 | |
parent | 3093d93e1f0baadf4c1ec866adacb244d10fabbe (diff) | |
download | mpv-9c0389e84117c317be4eab0fdf39e3df1d1008c6.tar.bz2 mpv-9c0389e84117c317be4eab0fdf39e3df1d1008c6.tar.xz |
gl_x11: distinguish missing GLX and too old GLX versions
This probably led to confusing output.
CC: @mpv-player/stable
-rw-r--r-- | video/out/gl_x11.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/video/out/gl_x11.c b/video/out/gl_x11.c index e5ded23fb4..7226813e43 100644 --- a/video/out/gl_x11.c +++ b/video/out/gl_x11.c @@ -193,9 +193,11 @@ static bool config_window_x11(struct MPGLContext *ctx, int flags) int glx_major, glx_minor; // FBConfigs were added in GLX version 1.3. - if (!glXQueryVersion(vo->x11->display, &glx_major, &glx_minor) || - (MPGL_VER(glx_major, glx_minor) < MPGL_VER(1, 3))) - { + if (!glXQueryVersion(vo->x11->display, &glx_major, &glx_minor)) { + MP_ERR(vo, "GLX not found.\n"); + return false; + } + if (MPGL_VER(glx_major, glx_minor) < MPGL_VER(1, 3)) { MP_ERR(vo, "GLX version older than 1.3.\n"); return false; } |