diff options
| author | Emil Velikov <[email protected]> | 2018-11-16 11:15:37 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2018-11-20 11:13:20 +0000 |
| commit | 5bc509363b6dbc42af72668fe500b6aec988dbf0 (patch) | |
| tree | d9bf7beec454f84cbc96e3892d640aebba776f7e /src/glx/glxcmds.c | |
| parent | 84445a86d192c0d7f07bc25a84080458de764149 (diff) | |
glx: make xf86vidmode mandatory for direct rendering
Currently we detect the module and if missing, the glXGetMsc* API is
effectively a stub, always returning false.
This is what effectively has been happening with our meson build :-(
Thus users have no chance of using it - they cannot even distinguish
if the failure is due to a misconfigured build.
There's no reason for keeping xf86vidmode optional - it has been
available in all distributions for years.
Cc: [email protected]
Signed-off-by: Emil Velikov <[email protected]>
Acked-by: Dylan Baker <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
Fixes: a47c525f3281a2753180e "meson: build glx"
Diffstat (limited to 'src/glx/glxcmds.c')
| -rw-r--r-- | src/glx/glxcmds.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c index 3ed960fbf3c..b940c8ebdbe 100644 --- a/src/glx/glxcmds.c +++ b/src/glx/glxcmds.c @@ -46,11 +46,9 @@ #include "util/debug.h" #else #include <sys/time.h> -#ifdef XF86VIDMODE #include <X11/extensions/xf86vmode.h> #endif #endif -#endif #include <X11/Xlib-xcb.h> #include <xcb/xcb.h> @@ -2088,7 +2086,6 @@ _X_HIDDEN GLboolean __glxGetMscRate(struct glx_screen *psc, int32_t * numerator, int32_t * denominator) { -#ifdef XF86VIDMODE XF86VidModeModeLine mode_line; int dot_clock; int i; @@ -2135,8 +2132,6 @@ __glxGetMscRate(struct glx_screen *psc, return True; } - else -#endif return False; } @@ -2162,7 +2157,7 @@ _X_HIDDEN GLboolean __glXGetMscRateOML(Display * dpy, GLXDrawable drawable, int32_t * numerator, int32_t * denominator) { -#if defined( GLX_DIRECT_RENDERING ) && defined( XF86VIDMODE ) +#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) __GLXDRIdrawable *draw = GetGLXDRIDrawable(dpy, drawable); if (draw == NULL) |