summaryrefslogtreecommitdiff
authorJeremy Huddleston <jeremyhu@freedesktop.org>2008-12-24 04:33:27 (GMT)
committer Jeremy Huddleston <jeremyhu@freedesktop.org>2008-12-29 06:16:32 (GMT)
commit85347902d97f2d4937f63ae1fac62ee46a61c82f (patch) (side-by-side diff)
tree83686c93294c86d2f92c884ef52d7ec91c2fc76e
parent1ca832002f3422dd582c311a3f31e0cc552e763e (diff)
downloadxserver-85347902d97f2d4937f63ae1fac62ee46a61c82f.zip
xserver-85347902d97f2d4937f63ae1fac62ee46a61c82f.tar.gz
XQuartz: Re-enable rlAccel
It was incorrectly blamed for some crashes a few months ago, and it should be safe to use until we get an EXA driver to replace it. (cherry picked from commit 8121f30bd29591fc74fbc680fbbf20210271fa58)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--hw/xquartz/mach-startup/Makefile.am1
-rw-r--r--hw/xquartz/xpr/xprScreen.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/hw/xquartz/mach-startup/Makefile.am b/hw/xquartz/mach-startup/Makefile.am
index 40060d0..bbad10a 100644
--- a/hw/xquartz/mach-startup/Makefile.am
+++ b/hw/xquartz/mach-startup/Makefile.am
@@ -18,6 +18,7 @@ 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 da262f6..52fb9c9 100644
--- a/hw/xquartz/xpr/xprScreen.c
+++ b/hw/xquartz/xpr/xprScreen.c
@@ -364,9 +364,7 @@ xprSetupScreen(int index, ScreenPtr pScreen)
{
// Initialize accelerated rootless drawing
// Note that this must be done before DamageSetup().
-
- // These are crashing ugly... better to be stable and not crash for now.
- //RootlessAccelInit(pScreen);
+ RootlessAccelInit(pScreen);
#ifdef DAMAGE
// The Damage extension needs to wrap underneath the