From e87290dfab850a35ac27a0d5699a9f4eb8bf5def Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Thu, 5 Feb 2009 13:08:15 -0800 Subject: [PATCH] Revert "XQuartz: Re-enable rlAccel" This reverts commit 8121f30bd29591fc74fbc680fbbf20210271fa58. --- hw/xquartz/mach-startup/Makefile.am | 1 - hw/xquartz/xpr/xprScreen.c | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/xquartz/mach-startup/Makefile.am b/hw/xquartz/mach-startup/Makefile.am index 1b5017fca..3f6bcd82a 100644 --- a/hw/xquartz/mach-startup/Makefile.am +++ b/hw/xquartz/mach-startup/Makefile.am @@ -18,7 +18,6 @@ X11_bin_LDADD = \ $(top_builddir)/hw/xquartz/xpr/libXquartzXpr.la \ $(top_builddir)/dix/dixfonts.lo \ $(top_builddir)/miext/rootless/librootless.la \ - $(top_builddir)/miext/rootless/accel/librlAccel.la \ $(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \ $(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c index 52fb9c986..da262f654 100644 --- a/hw/xquartz/xpr/xprScreen.c +++ b/hw/xquartz/xpr/xprScreen.c @@ -364,7 +364,9 @@ xprSetupScreen(int index, ScreenPtr pScreen) { // Initialize accelerated rootless drawing // Note that this must be done before DamageSetup(). - RootlessAccelInit(pScreen); + + // These are crashing ugly... better to be stable and not crash for now. + //RootlessAccelInit(pScreen); #ifdef DAMAGE // The Damage extension needs to wrap underneath the