diff options
| author | Keith Packard <keithp@keithp.com> | 2014-04-01 20:54:18 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-04-03 13:07:51 -0700 |
| commit | 1707faf36d49a63efc462dfef133a555fe093832 (patch) | |
| tree | 695532afa8f6c94aeb498e1f3091d4200745c11b /glamor/glamor.c | |
| parent | 8d88b90953471ead3b480b6ae9d7280b8bd6b216 (diff) | |
glamor: SetWindowPixmap is not related to RENDER
Move the configuration of screen->SetWindowPixmap out from under it.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'glamor/glamor.c')
| -rw-r--r-- | glamor/glamor.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/glamor/glamor.c b/glamor/glamor.c index 30944326b..971dbf891 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); |