From 1707faf36d49a63efc462dfef133a555fe093832 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 1 Apr 2014 20:54:18 -0700 Subject: [PATCH] glamor: SetWindowPixmap is not related to RENDER Move the configuration of screen->SetWindowPixmap out from under it. Signed-off-by: Keith Packard Signed-off-by: Eric Anholt Reviewed-by: Eric Anholt --- 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); -- 2.7.4