[PATCH 4/8] glamor: SetWindowPixmap is not related to RENDER

[Eric Anholt]

Keith Packard <keithp at keithp.com> writes:

> Move the configuration of screen->SetWindowPixmap out from under the

I think you accidentally some words

> Signed-off-by: Keith Packard <keithp at keithp.com>
> ---
>  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);
> -- 
> 1.9.0


We should probably unifdef RENDER some day.  But this patch is:

Reviewed-by: Eric Anholt <eric at anholt.net>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20140402/dd3979ab/attachment.sig>