[PATCH 05/21] glamor: SetWindowPixmap is not related to RENDER

[Alexander E. Patrakov]

02.04.2014 06:29, Keith Packard wrote:
> Move the configuration of screen->SetWindowPixmap out from under the
>
> Signed-off-by: Keith Packard <keithp at keithp.com>

Looks like git has mangled the commit message by thinking that #ifdef at 
the beginning of the line (after the "the") is a comment.

> ---
>   glamor/glamor.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/glamor/glamor.c b/glamor/glamor.c
> index 3094432..971dbf8 100644
> --- a/glamor/glamor.c
> +++ b/glamor/glamor.c
> @@ -475,13 +475,13 @@ glamor_init(ScreenPtr screen, unsigned int flags)
>       glamor_priv->saved_procs.create_picture = ps->CreatePicture;
>       ps->CreatePicture = glamor_create_picture;
>
> -    glamor_priv->saved_procs.set_window_pixmap = screen->SetWindowPixmap;
> -    screen->SetWindowPixmap = glamor_set_window_pixmap;
> -
>       glamor_priv->saved_procs.destroy_picture = ps->DestroyPicture;
>       ps->DestroyPicture = glamor_destroy_picture;
>       glamor_init_composite_shaders(screen);
>   #endif
> +    glamor_priv->saved_procs.set_window_pixmap = screen->SetWindowPixmap;
> +    screen->SetWindowPixmap = glamor_set_window_pixmap;
> +
>       glamor_init_vbo(screen);
>       glamor_init_pixmap_fbo(screen);
>       glamor_init_solid_shader(screen);
>

-- 
Alexander E. Patrakov