From 37b389ee9e13f065fb080d1269f9a6aed616c210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Fri, 15 May 2015 10:24:24 +0900 Subject: [PATCH] glamor: Deal with glamor_glyphs_init being removed from xserver Port of radeon commit 818c180c8932233b214a35ba0647af82f7bcec3d. --- configure.ac | 6 ++++++ src/amdgpu_glamor.c | 2 ++ 2 files changed, 8 insertions(+) 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,