From 2dc138922b7588515d5f2447e4b9dcdc0bef15e0 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 21 May 2010 15:05:48 -0700 Subject: Rename region macros to eliminate screen argument This is a combination of a huge mechanical patch and a few small fixups required to finish the job. They were reviewed separately, but because the server does not build without both pieces, I've merged them together at this time. The mechanical changes were performed by running the included 'fix-region' script over the whole tree: $ git ls-files | grep -v '^fix-' | xargs ./fix-region And then, the white space errors in the resulting patch were fixed using the provided fix-patch-whitespace script. $ sh ./fix-patch-whitespace Thanks to Jamey Sharp for the mighty fine sed-generating sed script. The hand-done changes involve removing functions from dix/region.c that duplicate inline functions in include/regionstr.h, along with their declarations in regionstr.h, mi.h and mispans.h. Reviewed-by: Jamey Sharp Signed-off-by: Keith Packard --- exa/exa_mixed.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'exa/exa_mixed.c') diff --git a/exa/exa_mixed.c b/exa/exa_mixed.c index 49e04f22a..89cb137e4 100644 --- a/exa/exa_mixed.c +++ b/exa/exa_mixed.c @@ -180,7 +180,7 @@ exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth, exaSetAccelBlock(pExaScr, pExaPixmap, width, height, bitsPerPixel); - REGION_EMPTY(pScreen, &pExaPixmap->validFB); + RegionEmpty(&pExaPixmap->validFB); } /* Need to re-create system copy if there's also a GPU copy */ @@ -192,7 +192,7 @@ exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth, DamageUnregister(&pPixmap->drawable, pExaPixmap->pDamage); DamageDestroy(pExaPixmap->pDamage); pExaPixmap->pDamage = NULL; - REGION_EMPTY(pScreen, &pExaPixmap->validSys); + RegionEmpty(&pExaPixmap->validSys); if (pExaScr->deferred_mixed_pixmap == pPixmap) pExaScr->deferred_mixed_pixmap = NULL; -- cgit v1.2.3