diff options
| -rw-r--r-- | hw/xquartz/xpr/xprScreen.c | 4 | ||||
| -rw-r--r-- | miext/rootless/README.txt | 4 | ||||
| -rw-r--r-- | miext/rootless/rootlessConfig.h | 3 | ||||
| -rw-r--r-- | miext/rootless/rootlessGC.c | 8 |
4 files changed, 8 insertions, 11 deletions
diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c index 35fa11848..fccaff035 100644 --- a/hw/xquartz/xpr/xprScreen.c +++ b/hw/xquartz/xpr/xprScreen.c @@ -352,7 +352,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 diff --git a/miext/rootless/README.txt b/miext/rootless/README.txt index ffd17902f..2c3fbb05a 100644 --- a/miext/rootless/README.txt +++ b/miext/rootless/README.txt @@ -76,10 +76,6 @@ rootlessConfig.h to specify compile time options for its platform. The following compile-time options are defined in rootlessConfig.h: - o ROOTLESS_ACCEL: If true, use the optional rootless acceleration - functions where possible to a accelerate X11 drawing primitives. - If false, all drawing will be done with fb. - o ROOTLESS_GLOBAL_COORDS: This option controls the way that frame coordinates are passed to the rootless implementation. If false, the coordinates are passed per screen relative to the origin of diff --git a/miext/rootless/rootlessConfig.h b/miext/rootless/rootlessConfig.h index ab0187e83..50bac3f51 100644 --- a/miext/rootless/rootlessConfig.h +++ b/miext/rootless/rootlessConfig.h @@ -36,12 +36,12 @@ #ifdef __APPLE__ -# define ROOTLESS_ACCEL TRUE # define ROOTLESS_GLOBAL_COORDS TRUE # define ROOTLESS_PROTECT_ALPHA TRUE # define ROOTLESS_REDISPLAY_DELAY 10 # define ROOTLESS_RESIZE_GRAVITY TRUE # undef ROOTLESS_TRACK_DAMAGE +/*# define ROOTLESSDEBUG*/ /* Bit mask for alpha channel with a particular number of bits per pixel. Note that we only care for 32bpp data. Mac OS X uses planar @@ -52,7 +52,6 @@ #if defined(__CYGWIN__) || defined(WIN32) -# define ROOTLESS_ACCEL YES # define ROOTLESS_GLOBAL_COORDS TRUE # define ROOTLESS_PROTECT_ALPHA NO # define ROOTLESS_REDISPLAY_DELAY 10 diff --git a/miext/rootless/rootlessGC.c b/miext/rootless/rootlessGC.c index c80b11f1d..1c787b6ad 100644 --- a/miext/rootless/rootlessGC.c +++ b/miext/rootless/rootlessGC.c @@ -118,7 +118,7 @@ static GCOps rootlessGCOps = { /* There are two issues we must contend with when drawing. These are - controlled with ROOTLESS_PROTECT_ALPHA and ROOTLESS_ACCEL. + controlled with ROOTLESS_PROTECT_ALPHA and RootlessAccelInit(). If ROOTLESS_PROTECT_ALPHA is set, we have to make sure that the alpha channel of the on screen windows is always opaque. fb makes this harder @@ -141,9 +141,9 @@ static GCOps rootlessGCOps = { from another window since its alpha channel must also be opaque. The other issue to consider is that the rootless implementation may - provide accelerated drawing functions if ROOTLESS_ACCEL is set. For some - drawing primitives we swap in rootless acceleration functions, which use - the accelerated drawing functions where possible. + provide accelerated drawing functions if RootlessAccelInit() is called.For + some drawing primitives we swap in rootless acceleration functions, which + use the accelerated drawing functions where possible. Where both alpha protection and acceleration is used, it is even a bigger win to relax the planemask to all ones because most accelerated drawing |