diff options
author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-12-23 20:33:27 -0800 |
---|---|---|
committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-12-28 22:17:03 -0800 |
commit | 895186e026881196ac9383aa165e123055d9cf09 (patch) | |
tree | ca5be28f2fdd702e7ccdebef3e9ecf4adcc522b2 | |
parent | dc4498ec5cb7f25f710bdec8793746da2d2324ed (diff) |
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)
-rw-r--r-- | hw/xquartz/mach-startup/Makefile.am | 1 | ||||
-rw-r--r-- | hw/xquartz/xpr/xprScreen.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/hw/xquartz/mach-startup/Makefile.am b/hw/xquartz/mach-startup/Makefile.am index 40060d01b..bbad10ad1 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 da262f654..52fb9c986 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 |