XQuartz: Don't enable rootless accelerated functionality... crashy...
(cherry picked from commit cdb4c291d8
)
This commit is contained in:
parent
2ffdb0eb64
commit
8716d081fd
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue