[PATCH 1/4] glamor: Call glamor_glyphs_init from glamor_create_screen_resources

[Alex Deucher]

On Wed, Sep 10, 2014 at 3:20 AM, Michel Dänzer <michel at daenzer.net> wrote:
> From: Michel Dänzer <michel.daenzer at amd.com>
>
> The comment above glamor_glyphs_init was already saying so.
>
> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

For the series:

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

> ---
>  glamor/glamor.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/glamor/glamor.c b/glamor/glamor.c
> index 521bc25..e582e50 100644
> --- a/glamor/glamor.c
> +++ b/glamor/glamor.c
> @@ -296,6 +296,11 @@ glamor_create_screen_resources(ScreenPtr screen)
>          ret = screen->CreateScreenResources(screen);
>      screen->CreateScreenResources = glamor_create_screen_resources;
>
> +    if (!glamor_glyphs_init(screen)) {
> +        ErrorF("Failed to initialize glyphs\n");
> +        ret = FALSE;
> +    }
> +
>      if (!glamor_realize_glyph_caches(screen)) {
>          ErrorF("Failed to initialize glyph cache\n");
>          ret = FALSE;
> @@ -518,7 +523,6 @@ glamor_init(ScreenPtr screen, unsigned int flags)
>      glamor_init_gradient_shader(screen);
>  #endif
>      glamor_pixmap_init(screen);
> -    glamor_glyphs_init(screen);
>      glamor_sync_init(screen);
>
>      glamor_priv->screen = screen;
> --
> 2.1.0
>
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel