glamor: Deal with glamor_glyphs_init being removed from xserver

Port of radeon commit 818c180c8932233b214a35ba0647af82f7bcec3d.
This commit is contained in:
Michel Dänzer
2015-05-15 10:24:24 +09:00
committed by Michel Dänzer
parent 22917044e4
commit 37b389ee9e
2 changed files with 8 additions and 0 deletions

View File

@@ -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

View File

@@ -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,