Commit 2889ad2c authored by Torrey Lyons's avatar Torrey Lyons
Browse files

Fix crash in rootless XDarwin due to rootless being initialized before

    damage extension.
parent 96133314
/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/cr/crScreen.m,v 1.2 2004/04/23 19:15:51 eich Exp $ */
/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/cr/crScreen.m,v 1.3 2004/07/30 19:12:18 torrey Exp $ */
/*
* Cocoa rootless implementation initialization
*/
......@@ -47,6 +47,9 @@
#include "scrnintstr.h"
#include "picturestr.h"
#include "globals.h"
#ifdef DAMAGE
# include "damage.h"
#endif
#undef BOOL
// Name of GLX bundle using AGL framework
......@@ -258,6 +261,13 @@ CRSetupScreen(int index, ScreenPtr pScreen)
}
#endif /* RENDER */
#ifdef DAMAGE
// The Damage extension needs to wrap underneath the
// generic rootless layer, so do it now.
if (!DamageSetup(pScreen))
return FALSE;
#endif
// Initialize generic rootless code
return CRInit(pScreen);
}
......
/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xprScreen.c,v 1.2 2004/04/23 19:16:52 eich Exp $ */
/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xprScreen.c,v 1.3 2004/07/30 19:12:18 torrey Exp $ */
/*
* Xplugin rootless implementation screen functions
*/
......@@ -42,6 +42,10 @@
#include "Xplugin.h"
#include "applewmExt.h"
#ifdef DAMAGE
# include "damage.h"
#endif
// Name of GLX bundle for native OpenGL
static const char *xprOpenGLBundle = "glxCGL.bundle";
......@@ -321,6 +325,13 @@ xprSetupScreen(int index, ScreenPtr pScreen)
}
#endif /* RENDER */
#ifdef DAMAGE
// The Damage extension needs to wrap underneath the
// generic rootless layer, so do it now.
if (!DamageSetup(pScreen))
return FALSE;
#endif
// Initialize generic rootless code
if (!xprInit(pScreen))
return FALSE;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment