diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2014-01-23 12:57:48 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-01-23 17:37:04 +0000 |
| commit | 59e769e1b1eede466482a950b242ce81c52b276b (patch) | |
| tree | 841a4da2c80b686752730a3c805b9de7b895b3a3 | |
| parent | 32010ed86bb8f28d3b02e1e54a592d79b92b2b98 (diff) | |
glamor: Don't require the glamoregl module to be pre-loaded with xserver >= 1.15
Inspired by (ok, copied from):
xf86-video-ati commit f2a0a5cf6c5a21e2a02280e110a4eb8e6609dace
Author: Michel Dänzer <michel.daenzer@amd.com>
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 <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/uxa/intel_glamor.c | 2 |
1 files changed, 2 insertions, 0 deletions
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))) { |