From 7ae6484cd4c14dc89f899a4ce75e9f0051166f14 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 12 Oct 2014 01:32:26 +0200 Subject: gl_x11: distinguish missing GLX and too old GLX versions This probably led to confusing output. CC: @mpv-player/stable --- video/out/gl_x11.c | 8 +++++--- 1 file 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; } -- cgit v1.2.3