summaryrefslogtreecommitdiff
path: root/hw/darwin
diff options
context:
space:
mode:
authorTorrey Lyons <torrey@mrcla.com>2004-08-12 20:24:36 +0000
committerTorrey Lyons <torrey@mrcla.com>2004-08-12 20:24:36 +0000
commit2889ad2cb8827f20b6d69da4fe99db33bf9c5ff2 (patch)
tree2272cd56d138442c59fc78b9b67854081a8ff3bc /hw/darwin
parent961333143e2df3e3f33e8624fc61e79cf3e86cd1 (diff)
Fix crash in rootless XDarwin due to rootless being initialized before
damage extension.
Diffstat (limited to 'hw/darwin')
-rw-r--r--hw/darwin/quartz/cr/crScreen.m12
-rw-r--r--hw/darwin/quartz/xpr/xprScreen.c13
2 files changed, 23 insertions, 2 deletions
diff --git a/hw/darwin/quartz/cr/crScreen.m b/hw/darwin/quartz/cr/crScreen.m
index 175007f3f..cba92f185 100644
--- a/hw/darwin/quartz/cr/crScreen.m
+++ b/hw/darwin/quartz/cr/crScreen.m
@@ -1,4 +1,4 @@
-/* $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);
}
diff --git a/hw/darwin/quartz/xpr/xprScreen.c b/hw/darwin/quartz/xpr/xprScreen.c
index ff3f3a93c..27ddef05d 100644
--- a/hw/darwin/quartz/xpr/xprScreen.c
+++ b/hw/darwin/quartz/xpr/xprScreen.c
@@ -1,4 +1,4 @@
-/* $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;