summaryrefslogtreecommitdiffstats
path: root/video/out/gl_x11.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-10-12 01:32:26 +0200
committerAlessandro Ghedini <alessandro@ghedini.me>2014-10-12 12:43:08 +0200
commit7ae6484cd4c14dc89f899a4ce75e9f0051166f14 (patch)
treed3491c71eb6bcb3db2a581ac49f00f8b37a01fa2 /video/out/gl_x11.c
parent08d144138b23044465d043dda5177dfe3e97e9e0 (diff)
downloadmpv-7ae6484cd4c14dc89f899a4ce75e9f0051166f14.tar.bz2
mpv-7ae6484cd4c14dc89f899a4ce75e9f0051166f14.tar.xz
gl_x11: distinguish missing GLX and too old GLX versions
This probably led to confusing output. CC: @mpv-player/stable
Diffstat (limited to 'video/out/gl_x11.c')
-rw-r--r--video/out/gl_x11.c8
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;
}