xf86-video-intel: Branch 'xwayland' - src/intel_driver.c

[Kristian Høgsberg]

 src/intel_driver.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 1c65dd750d91d4fac9d9244af06a685853fe24f6
Author: Christopher James Halse Rogers <christopher.halse.rogers at canonical.com>
Date:   Wed May 23 22:08:37 2012 +1000

    xwayland: Adapt to new initialisation sequence

diff --git a/src/intel_driver.c b/src/intel_driver.c
index e414406..7bf8b76 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -631,15 +631,18 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags)
 
 #ifdef XORG_WAYLAND
 	if (xorgWayland) {
-		xf86LoadSubModule(scrn, "xwayland");
-		intel->xwl_screen =
-			xwl_screen_pre_init(scrn, 0, &xwl_driver);
+		intel->xwl_screen = xwl_screen_create();
 		if (!intel->xwl_screen) {
 			xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 				   "Failed to initialize xwayland.\n");
 			return FALSE;
 		}
-
+		if (!xwl_screen_pre_init(scrn, intel->xwl_screen, 
+					 0, &xwl_driver)) {
+			xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+				   "Failed to pre-init xwayland screen\n");
+			xwl_screen_destroy(intel->xwl_screen);
+		}
 		intel->drmSubFD =
 			xwl_screen_get_drm_fd(intel->xwl_screen);
 	}