frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply a kludge to initialize the composite wrapper before DamageSetup. If 

not, DamageSetup will wrap some operations first, and the cw
    initializes during ExtensionInit, so cw comes higher in the wrapping
    chain. cw going first will result in damage getting confused when the
    drawables get changed around.
This commit is contained in:
Eric Anholt 2004-08-12 08:45:33 +00:00
parent 6e0228722c
commit 961333143e
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
composite/compinit.c
View File

@ -26,7 +26,6 @@
#include <config.h>
#endif
#include "compint.h"
#include "cw.h"
int CompScreenPrivateIndex;
int CompWindowPrivateIndex;
@ -362,8 +361,6 @@ compScreenInit (ScreenPtr pScreen)
cs->CloseScreen = pScreen->CloseScreen;
pScreen->CloseScreen = compCloseScreen;
miInitializeCompositeWrapper(pScreen);
pScreen->devPrivates[CompScreenPrivateIndex].ptr = (pointer) cs;
return TRUE;
}

4
mi/miinitext.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.10 2004/07/31 09:41:27 kem Exp $ */
/* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.11 2004/08/03 05:39:19 anholt Exp $ */
/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.67 2003/01/12 02:44:27 dawes Exp $ */
/***********************************************************
@ -493,7 +493,6 @@ InitExtensions(argc, argv)
if (!noCompositeExtension) CompositeExtensionInit();
#endif
#ifdef DAMAGE
/* Must be after Composite to layer with composite wrapper properly */
DamageExtensionInit();
#endif
}
@ -626,7 +625,6 @@ static ExtensionModule staticExtensions[] = {
{ CompositeExtensionInit, "COMPOSITE", &noCompositeExtension, NULL },
#endif
#ifdef DAMAGE
/* Must be after Composite to layer with composite wrapper properly */
{ DamageExtensionInit, "DAMAGE", NULL, NULL },
#endif
#ifdef XEVIE

13
miext/damage/damage.c
View File

@ -37,6 +37,9 @@
#include "gcstruct.h"
#include "damage.h"
#include "damagestr.h"
#ifdef COMPOSITE
#include "cw.h"
#endif
#define wrap(priv, real, mem, func) {\
priv->mem = real->mem; \
@ -1729,6 +1732,16 @@ DamageSetup (ScreenPtr pScreen)
if (!pScrPriv)
return FALSE;
#ifdef COMPOSITE
/* This is a kludge to ensure wrapping order with the composite wrapper.
* If it's done from compinit.c, then DamageSetup may be called before the
* extension init phase, so that cw will be higher in the wrapping chain and
* rewrite drawables before damage gets to it, causing confusion.
*/
if (!noCompositeExtension)
miInitializeCompositeWrapper (pScreen);
#endif
pScrPriv->internalLevel = 0;
pScrPriv->pScreenDamage = 0;