diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2015-05-12 17:43:57 +0900 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2015-05-15 10:20:19 +0900 |
| commit | 818c180c8932233b214a35ba0647af82f7bcec3d (patch) | |
| tree | d9608ed03c45dbcdbe35a526b69f6cb7fbb139e5 | |
| parent | 7c4b78ab10b82c6dba9f72034ff7583859cca63d (diff) | |
glamor: Deal with glamor_glyphs_init being removed from xserver
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/radeon_glamor.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 4ca53525..c371829d 100644 --- a/configure.ac +++ b/configure.ac @@ -113,6 +113,12 @@ if test "x$GLAMOR" != "xno"; then [GLAMOR_XSERVER="yes"], [GLAMOR_XSERVER="no"], [#include "xorg-server.h" #include "glamor.h"]) + + AC_CHECK_DECL(glamor_glyphs_init, + [AC_DEFINE(HAVE_GLAMOR_GLYPHS_INIT, 1, + [Have glamor_glyphs_init API])], [], + [#include "xorg-server.h" + #include "glamor.h"]) fi if test "x$GLAMOR_XSERVER" != xyes; then diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c index 4b6b0243..fdd5aeac 100644 --- a/src/radeon_glamor.c +++ b/src/radeon_glamor.c @@ -60,8 +60,10 @@ radeon_glamor_create_screen_resources(ScreenPtr screen) if (!info->use_glamor) return TRUE; +#ifdef HAVE_GLAMOR_GLYPHS_INIT if (!glamor_glyphs_init(screen)) return FALSE; +#endif if (!glamor_egl_create_textured_screen_ext(screen, info->front_bo->handle, |