From 59e769e1b1eede466482a950b242ce81c52b276b Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 23 Jan 2014 12:57:48 +0000 Subject: glamor: 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 Inspired by (ok, copied from): xf86-video-ati commit f2a0a5cf6c5a21e2a02280e110a4eb8e6609dace Author: Michel Dänzer Date: Wed Jan 22 11:04:42 2014 +0900 Don't require the glamoregl module to be pre-loaded with xserver >= 1.15 The issues with loading it on demand have been fixed in xserver 1.15. Inspired by Jérôme Glisse on IRC. Signed-off-by: Chris Wilson --- src/uxa/intel_glamor.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/uxa/intel_glamor.c b/src/uxa/intel_glamor.c index fa603001..7f59e29a 100644 --- a/src/uxa/intel_glamor.c +++ b/src/uxa/intel_glamor.c @@ -95,12 +95,14 @@ intel_glamor_pre_init(ScrnInfoPtr scrn) if (!intel_glamor_enabled(intel)) return TRUE; +#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,15,0,0,0) if (!xf86LoaderCheckSymbol("glamor_egl_init")) { xf86DrvMsg(scrn->scrnIndex, X_ERROR, "glamor requires Load \"glamoregl\" in " "Section \"Module\", disabling.\n"); return TRUE; } +#endif /* Load glamor module */ if ((glamor_module = xf86LoadSubModule(scrn, GLAMOR_EGL_MODULE_NAME))) { -- cgit v1.2.3