diff options
| author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-12-23 20:33:27 -0800 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-12-23 20:33:27 -0800 |
| commit | 8121f30bd29591fc74fbc680fbbf20210271fa58 (patch) | |
| tree | d5af45172be772c7156ad20772ed61c4fcfba109 | |
| parent | 06964c322e4da81f3146022049a2de13f6b2892d (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.
| -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 f9ded6752..b29890fcc 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 |