diff options
author | Michel Dänzer <michel.daenzer@amd.com> | 2015-05-15 10:24:24 +0900 |
---|---|---|
committer | Michel Dänzer <michel@daenzer.net> | 2015-05-15 10:24:24 +0900 |
commit | 37b389ee9e13f065fb080d1269f9a6aed616c210 (patch) | |
tree | a8e6e3e7013a36d069f6eda2a7de761e10839ba6 | |
parent | 22917044e419023d487f816e0d4f094695b55fa6 (diff) |
glamor: Deal with glamor_glyphs_init being removed from xserver
Port of radeon commit 818c180c8932233b214a35ba0647af82f7bcec3d.
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | src/amdgpu_glamor.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 946c70e..c2411d9 100644 --- a/configure.ac +++ b/configure.ac @@ -127,6 +127,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/amdgpu_glamor.c b/src/amdgpu_glamor.c index 22fea4a..36241ce 100644 --- a/src/amdgpu_glamor.c +++ b/src/amdgpu_glamor.c @@ -60,8 +60,10 @@ Bool amdgpu_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 bo_handle = gbm_bo_get_handle(info->front_buffer->bo.gbm); if (!glamor_egl_create_textured_screen_ext(screen, |