diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
| commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
| tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/damageext/damageext.c | |
| parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
| parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
| download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/damageext/damageext.c')
| -rw-r--r-- | xorg-server/damageext/damageext.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xorg-server/damageext/damageext.c b/xorg-server/damageext/damageext.c index 517c72dac..8fa1c5314 100644 --- a/xorg-server/damageext/damageext.c +++ b/xorg-server/damageext/damageext.c @@ -29,10 +29,12 @@ static unsigned char DamageReqCode; static int DamageEventBase; static int DamageErrorBase; -static DevPrivateKey DamageClientPrivateKey = &DamageClientPrivateKey; static RESTYPE DamageExtType; static RESTYPE DamageExtWinType; +static int DamageClientPrivateKeyIndex; +static DevPrivateKey DamageClientPrivateKey = &DamageClientPrivateKeyIndex; + /* Version of the damage extension supported by the server, as opposed to the * DAMAGE_* defines from damageproto for what version the proto header * supports. @@ -90,9 +92,7 @@ DamageExtNotify (DamageExtPtr pDamageExt, BoxPtr pBoxes, int nBoxes) if (pDamageClient->critical > 0) { SetCriticalOutputPending (); -#ifdef SMART_SCHEDULE pClient->smart_priority = SMART_MAX_PRIORITY; -#endif } } @@ -233,7 +233,7 @@ ProcDamageCreate (ClientPtr client) if (pDrawable->type == DRAWABLE_WINDOW) { pRegion = &((WindowPtr) pDrawable)->borderClip; - DamageDamageRegion (pDrawable, pRegion); + DamageRegionAppend(pDrawable, pRegion); } return (client->noClientException); @@ -303,7 +303,7 @@ ProcDamageAdd (ClientPtr client) * screen coordinates like damage expects. */ REGION_TRANSLATE(pScreen, pRegion, pDrawable->x, pDrawable->y); - DamageDamageRegion(pDrawable, pRegion); + DamageRegionAppend(pDrawable, pRegion); REGION_TRANSLATE(pScreen, pRegion, -pDrawable->x, -pDrawable->y); return (client->noClientException); |