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:16:32 -0800 |
| commit | 85347902d97f2d4937f63ae1fac62ee46a61c82f (patch) | |
| tree | 83686c93294c86d2f92c884ef52d7ec91c2fc76e | |
| parent | 1ca832002f3422dd582c311a3f31e0cc552e763e (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 @@ -20,2 +20,3 @@ X11_bin_LDADD = \ $(top_builddir)/miext/rootless/librootless.la \ + $(top_builddir)/miext/rootless/accel/librlAccel.la \ $(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \ 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 @@ -366,5 +366,3 @@ xprSetupScreen(int index, ScreenPtr pScreen) // 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); |