From 6d156c044085881c6ecbd8a13521c0a26df71c30 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 26 Apr 2006 01:33:15 +0000 Subject: [PATCH] Improve the migration debugging output. --- ChangeLog | 6 ++++++ exa/exa_migration.c | 26 ++++++++++++++------------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index abf7e5c1d..d619cb72d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-04-25 Eric Anholt + + * exa/exa_migration.c: (exaPixmapSave), (exaMoveInPixmap), + (exaMoveOutPixmap): + Improve the migration debugging output. + 2006-04-25 Eric Anholt * exa/exa_render.c: (exaGlyphsIntersect): diff --git a/exa/exa_migration.c b/exa/exa_migration.c index 8077f6802..29662b5cb 100644 --- a/exa/exa_migration.c +++ b/exa/exa_migration.c @@ -213,12 +213,12 @@ exaPixmapSave (ScreenPtr pScreen, ExaOffscreenArea *area) PixmapPtr pPixmap = area->privData; ExaPixmapPriv(pPixmap); - DBG_MIGRATE (("Save %p (%p) (%dx%d)\n", - (void*)pPixmap->drawable.id, + DBG_MIGRATE (("Save %p (%p) (%dx%d) (%c)\n", pPixmap, (void*)(ExaGetPixmapPriv(pPixmap)->area ? ExaGetPixmapPriv(pPixmap)->area->offset : 0), pPixmap->drawable.width, - pPixmap->drawable.height)); + pPixmap->drawable.height, + exaPixmapIsDirty(pPixmap) ? 'd' : 'c')); if (exaPixmapIsOffscreen(pPixmap)) { exaCopyDirtyToSys (pPixmap); @@ -289,11 +289,12 @@ exaMoveInPixmap (PixmapPtr pPixmap) pExaPixmap->area->offset; } - DBG_MIGRATE (("-> 0x%lx (0x%x) (%dx%d)\n", pPixmap->drawable.id, + DBG_MIGRATE (("-> %p (0x%x) (%dx%d) (%c)\n", pPixmap, (ExaGetPixmapPriv(pPixmap)->area ? ExaGetPixmapPriv(pPixmap)->area->offset : 0), pPixmap->drawable.width, - pPixmap->drawable.height)); + pPixmap->drawable.height, + exaPixmapIsDirty(pPixmap) ? 'd' : 'c')); exaCopyDirtyToFb (pPixmap); @@ -317,14 +318,15 @@ exaMoveOutPixmap (PixmapPtr pPixmap) if (exaPixmapIsPinned(pPixmap)) return; - DBG_MIGRATE (("<- 0x%p (0x%p) (%dx%d)\n", - (void*)pPixmap->drawable.id, - (void*)(ExaGetPixmapPriv(pPixmap)->area ? - ExaGetPixmapPriv(pPixmap)->area->offset : 0), - pPixmap->drawable.width, - pPixmap->drawable.height)); - if (exaPixmapIsOffscreen(pPixmap)) { + + DBG_MIGRATE (("<- %p (%p) (%dx%d) (%c)\n", pPixmap, + (void*)(ExaGetPixmapPriv(pPixmap)->area ? + ExaGetPixmapPriv(pPixmap)->area->offset : 0), + pPixmap->drawable.width, + pPixmap->drawable.height, + exaPixmapIsDirty(pPixmap) ? 'd' : 'c')); + exaCopyDirtyToSys (pPixmap); pPixmap->devPrivate.ptr = pExaPixmap->sys_ptr;