[PATCH] glamor: Deal with glamor_glyphs_init being removed from xserver

[Alex Deucher]

On Tue, May 12, 2015 at 4:46 AM, Michel Dänzer <michel at daenzer.net> wrote:
> From: Michel Dänzer <michel.daenzer at amd.com>
>
> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>
> glamor_glyphs_init would be removed by
> http://lists.freedesktop.org/archives/xorg-devel/2015-May/046328.html .
>
>  configure.ac        | 6 ++++++
>  src/radeon_glamor.c | 2 ++
>  2 files changed, 8 insertions(+)
>
> diff --git a/configure.ac b/configure.ac
> index 4ca5352..c371829 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 4b6b024..fdd5aea 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,
> --
> 2.1.4
>
> _______________________________________________
> xorg-driver-ati mailing list
> xorg-driver-ati at lists.x.org
> http://lists.x.org/mailman/listinfo/xorg-driver-ati