From 5f138176bf15682324d2e8cfa9fac3e49604bf8f Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 19 Jul 2012 10:32:33 +0100 Subject: [PATCH] sna: Tweak order of screen re-initialisation Signed-off-by: Chris Wilson --- src/sna/sna_accel.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index 1b8c8acf..d3dad62c 100644 --- a/src/sna/sna_accel.c +++ b/src/sna/sna_accel.c @@ -12990,6 +12990,11 @@ bool sna_accel_init(ScreenPtr screen, struct sna *sna) assert(screen->SetWindowPixmap == NULL); screen->SetWindowPixmap = sna_set_window_pixmap; + if (USE_SHM_VMAP && sna->kgem.has_vmap) + ShmRegisterFuncs(screen, &shm_funcs); + else + ShmRegisterFbFuncs(screen); + if (!sna_picture_init(screen)) return false; @@ -13033,11 +13038,6 @@ bool sna_accel_init(ScreenPtr screen, struct sna *sna) bool sna_accel_create(ScreenPtr screen, struct sna *sna) { - if (USE_SHM_VMAP && sna->kgem.has_vmap) - ShmRegisterFuncs(screen, &shm_funcs); - else - ShmRegisterFbFuncs(screen); - if (!sna_glyphs_create(sna)) return false;