From f2a0a5cf6c5a21e2a02280e110a4eb8e6609dace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Wed, 22 Jan 2014 11:04:42 +0900 Subject: Don't require the glamoregl module to be pre-loaded with xserver >= 1.15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The issues with loading it on demand have been fixed in xserver 1.15. Inspired by Jérôme Glisse on IRC. --- src/radeon_glamor.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c index bd731a86..1d666d19 100644 --- a/src/radeon_glamor.c +++ b/src/radeon_glamor.c @@ -105,12 +105,14 @@ radeon_glamor_pre_init(ScrnInfoPtr scrn) return FALSE; } +#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,15,0,0,0) if (!xf86LoaderCheckSymbol("glamor_egl_init")) { xf86DrvMsg(scrn->scrnIndex, s ? X_ERROR : X_WARNING, "glamor requires Load \"glamoregl\" in " "Section \"Module\", disabling.\n"); return FALSE; } +#endif /* Load glamor module */ if ((glamor_module = xf86LoadSubModule(scrn, GLAMOR_EGL_MODULE_NAME))) { -- cgit v1.2.3