summaryrefslogtreecommitdiff
path: root/src/radeon_glamor.c
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2014-01-22 11:04:42 +0900
committerMichel Dänzer <michel@daenzer.net>2014-01-22 11:04:42 +0900
commitf2a0a5cf6c5a21e2a02280e110a4eb8e6609dace (patch)
tree4ce888bbe4680d337d95dd52ba1d2483f0c26d89 /src/radeon_glamor.c
parent3213df16d61302148be0088c8f93c6a5a88558f1 (diff)
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.
Diffstat (limited to 'src/radeon_glamor.c')
-rw-r--r--src/radeon_glamor.c2
1 files changed, 2 insertions, 0 deletions
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))) {