From 1899dbdc270e0bd494d174dd6bfbb9c5d18e174f Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Wed, 10 Feb 2010 12:18:41 +0000 Subject: [PATCH] backend-glx: Fix glXQueryVersion test This fixes some backwards logic for asserting that we have a GLX major version == 1 and a minor version >= 2. (NB: Although we technically depend on GLX 1.3 features, we still have to support drivers that report GLX 1.2 because there are a lot of mesa drivers out there incorrectly report GLX 1.2 even though they export extensions that depend on GLX 1.3) --- clutter/glx/clutter-backend-glx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clutter/glx/clutter-backend-glx.c b/clutter/glx/clutter-backend-glx.c index fb5c8c0..844cd2e 100644 --- a/clutter/glx/clutter-backend-glx.c +++ b/clutter/glx/clutter-backend-glx.c @@ -154,7 +154,7 @@ clutter_backend_glx_post_parse (ClutterBackend *backend, * time Mesa has exported a hybrid GLX, exporting extensions specified * to require GLX 1.3, but still reporting 1.2 via glXQueryVersion. */ if (!glXQueryVersion (backend_x11->xdpy, &glx_major, &glx_minor) - || !(glx_major > 1 || glx_minor > 2)) + || !(glx_major == 1 && glx_minor >= 2)) { g_set_error (error, CLUTTER_INIT_ERROR, CLUTTER_INIT_ERROR_BACKEND, -- 2.7.4