diff options
Diffstat (limited to 'xorg-server/exa/exa_migration.c')
| -rw-r--r-- | xorg-server/exa/exa_migration.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/xorg-server/exa/exa_migration.c b/xorg-server/exa/exa_migration.c index b7cc06240..4623eccdd 100644 --- a/xorg-server/exa/exa_migration.c +++ b/xorg-server/exa/exa_migration.c @@ -33,10 +33,7 @@ #include <string.h> #include "exa_priv.h" -#include <X11/fonts/fontstruct.h> -#include "dixfontstr.h" #include "exa.h" -#include "cw.h" #if DEBUG_MIGRATE #define DBG_MIGRATE(a) ErrorF a @@ -165,6 +162,7 @@ exaCopyDirty(ExaMigrationPtr migrate, RegionPtr pValidDst, RegionPtr pValidSrc, if (pExaScr->optimize_migration) { RegionPtr pending_damage = DamagePendingRegion(pExaPixmap->pDamage); +#if DEBUG_MIGRATE if (REGION_NIL(pending_damage)) { static Bool firsttime = TRUE; @@ -173,6 +171,7 @@ exaCopyDirty(ExaMigrationPtr migrate, RegionPtr pValidDst, RegionPtr pValidSrc, firsttime = FALSE; } } +#endif REGION_INTERSECT(pScreen, &CopyReg, &CopyReg, pending_damage); } @@ -212,9 +211,9 @@ exaCopyDirty(ExaMigrationPtr migrate, RegionPtr pValidDst, RegionPtr pValidSrc, pBox->x1, pBox->y1, pBox->x2 - pBox->x1, pBox->y2 - pBox->y1, - pExaPixmap->sys_ptr + (char *) (pExaPixmap->sys_ptr + pBox->y1 * pExaPixmap->sys_pitch - + pBox->x1 * pPixmap->drawable.bitsPerPixel / 8, + + pBox->x1 * pPixmap->drawable.bitsPerPixel / 8), pExaPixmap->sys_pitch)) { if (!access_prepared) { |