The Damage extension has to wrap after (be called before) the Composite
extension so that the redirecting of drawables by the wrapper doesn't confuse Damage.
This commit is contained in:
parent
d112e55992
commit
b7ba272da0
|
@ -1,4 +1,4 @@
|
||||||
/* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.9 2004/07/31 09:14:06 kem Exp $ */
|
/* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.10 2004/07/31 09:41:27 kem Exp $ */
|
||||||
/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.67 2003/01/12 02:44:27 dawes Exp $ */
|
/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.67 2003/01/12 02:44:27 dawes Exp $ */
|
||||||
/***********************************************************
|
/***********************************************************
|
||||||
|
|
||||||
|
@ -489,12 +489,13 @@ InitExtensions(argc, argv)
|
||||||
#ifdef XEVIE
|
#ifdef XEVIE
|
||||||
if (!noXevieExtension) XevieExtensionInit();
|
if (!noXevieExtension) XevieExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
#ifdef DAMAGE
|
|
||||||
DamageExtensionInit();
|
|
||||||
#endif
|
|
||||||
#ifdef COMPOSITE
|
#ifdef COMPOSITE
|
||||||
if (!noCompositeExtension) CompositeExtensionInit();
|
if (!noCompositeExtension) CompositeExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef DAMAGE
|
||||||
|
/* Must be after Composite to layer with composite wrapper properly */
|
||||||
|
DamageExtensionInit();
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -621,12 +622,13 @@ static ExtensionModule staticExtensions[] = {
|
||||||
#ifdef RANDR
|
#ifdef RANDR
|
||||||
{ RRExtensionInit, "RANDR", NULL, NULL, NULL },
|
{ RRExtensionInit, "RANDR", NULL, NULL, NULL },
|
||||||
#endif
|
#endif
|
||||||
#ifdef DAMAGE
|
|
||||||
{ DamageExtensionInit, "DAMAGE", NULL, NULL },
|
|
||||||
#endif
|
|
||||||
#ifdef COMPOSITE
|
#ifdef COMPOSITE
|
||||||
{ CompositeExtensionInit, "COMPOSITE", &noCompositeExtension, NULL },
|
{ CompositeExtensionInit, "COMPOSITE", &noCompositeExtension, NULL },
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef DAMAGE
|
||||||
|
/* Must be after Composite to layer with composite wrapper properly */
|
||||||
|
{ DamageExtensionInit, "DAMAGE", NULL, NULL },
|
||||||
|
#endif
|
||||||
#ifdef XEVIE
|
#ifdef XEVIE
|
||||||
{ XevieExtensionInit, "XEVIE", &noXevieExtension, NULL },
|
{ XevieExtensionInit, "XEVIE", &noXevieExtension, NULL },
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue