From f4e9a1a98f97155de62908309e87c10487125926 Mon Sep 17 00:00:00 2001 From: Maarten Maathuis Date: Sun, 31 Aug 2008 17:45:08 +0200 Subject: [PATCH] damage: choose less ambiguous function names --- composite/compalloc.c | 2 +- composite/compwindow.c | 4 +- damageext/damageext.c | 4 +- exa/exa_render.c | 14 +++---- glx/glxdri.c | 4 +- hw/xfree86/modes/xf86Rotate.c | 2 +- miext/damage/damage.c | 72 +++++++++++++++++------------------ miext/damage/damage.h | 6 +-- 8 files changed, 54 insertions(+), 54 deletions(-) diff --git a/composite/compalloc.c b/composite/compalloc.c index a62647e92..e16eecf21 100644 --- a/composite/compalloc.c +++ b/composite/compalloc.c @@ -224,7 +224,7 @@ compFreeClientWindow (WindowPtr pWin, XID id) DamageRegister (&pWin->drawable, cw->damage); cw->damageRegistered = TRUE; pWin->redirectDraw = RedirectDrawAutomatic; - DamageRegionPending(&pWin->drawable, &pWin->borderSize); + DamageRegionAppend(&pWin->drawable, &pWin->borderSize); } if (wasMapped && !pWin->mapped) { diff --git a/composite/compwindow.c b/composite/compwindow.c index d2931e752..577fa733e 100644 --- a/composite/compwindow.c +++ b/composite/compwindow.c @@ -585,7 +585,7 @@ compCopyWindow (WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) REGION_TRANSLATE (prgnSrc, prgnSrc, pWin->drawable.x - ptOldOrg.x, pWin->drawable.y - ptOldOrg.y); - DamageRegionPending(&pWin->drawable, prgnSrc); + DamageRegionAppend(&pWin->drawable, prgnSrc); } cs->CopyWindow = pScreen->CopyWindow; pScreen->CopyWindow = compCopyWindow; @@ -664,7 +664,7 @@ compSetRedirectBorderClip (WindowPtr pWin, RegionPtr pRegion) /* * Report that as damaged so it will be redrawn */ - DamageRegionPending(&pWin->drawable, &damage); + DamageRegionAppend(&pWin->drawable, &damage); REGION_UNINIT (pScreen, &damage); /* * Save the new border clip region diff --git a/damageext/damageext.c b/damageext/damageext.c index fdf31f323..8fa1c5314 100755 --- a/damageext/damageext.c +++ b/damageext/damageext.c @@ -233,7 +233,7 @@ ProcDamageCreate (ClientPtr client) if (pDrawable->type == DRAWABLE_WINDOW) { pRegion = &((WindowPtr) pDrawable)->borderClip; - DamageRegionPending(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); - DamageRegionPending(pDrawable, pRegion); + DamageRegionAppend(pDrawable, pRegion); REGION_TRANSLATE(pScreen, pRegion, -pDrawable->x, -pDrawable->y); return (client->noClientException); diff --git a/exa/exa_render.c b/exa/exa_render.c index 9f6ac3f92..f9c6b40ee 100644 --- a/exa/exa_render.c +++ b/exa/exa_render.c @@ -518,7 +518,7 @@ exaCompositeRects(CARD8 op, REGION_INIT(pScreen, ®ion, &box, 1); - DamageRegionPending(pDst->pDrawable, ®ion); + DamageRegionAppend(pDst->pDrawable, ®ion); REGION_UNINIT(pScreen, ®ion); } @@ -545,10 +545,10 @@ exaCompositeRects(CARD8 op, if (pExaPixmap->pDamage) { /* Now we have to flush the damage out from pendingDamage => damage - * Calling DamageRegionSubmitted has that effect. + * Calling DamageRegionProcessPending has that effect. */ - DamageRegionSubmitted(pDst->pDrawable); + DamageRegionProcessPending(pDst->pDrawable); } } @@ -1075,7 +1075,7 @@ exaTrapezoids (CARD8 op, PicturePtr pSrc, PicturePtr pDst, bounds.y2 += pDraw->y; REGION_INIT(pScreen, &migration, &bounds, 1); - DamageRegionPending(pDraw, &migration); + DamageRegionAppend(pDraw, &migration); REGION_UNINIT(pScreen, &migration); } @@ -1087,7 +1087,7 @@ exaTrapezoids (CARD8 op, PicturePtr pSrc, PicturePtr pDst, exaFinishAccess(pDraw, EXA_PREPARE_DEST); if (pExaPixmap->pDamage) - DamageRegionSubmitted(pDraw); + DamageRegionProcessPending(pDraw); } else if (maskFormat) { @@ -1179,7 +1179,7 @@ exaTriangles (CARD8 op, PicturePtr pSrc, PicturePtr pDst, bounds.y2 += pDraw->y; REGION_INIT(pScreen, &migration, &bounds, 1); - DamageRegionPending(pDraw, &migration); + DamageRegionAppend(pDraw, &migration); REGION_UNINIT(pScreen, &migration); } @@ -1188,7 +1188,7 @@ exaTriangles (CARD8 op, PicturePtr pSrc, PicturePtr pDst, exaFinishAccess(pDraw, EXA_PREPARE_DEST); if (pExaPixmap->pDamage) - DamageRegionSubmitted(pDraw); + DamageRegionProcessPending(pDraw); } else if (maskFormat) { diff --git a/glx/glxdri.c b/glx/glxdri.c index eedb8ad8a..aa763deed 100644 --- a/glx/glxdri.c +++ b/glx/glxdri.c @@ -804,9 +804,9 @@ static void __glXReportDamage(__DRIdrawable *driDraw, REGION_INIT(pDraw->pScreen, ®ion, (BoxPtr) rects, num_rects); REGION_TRANSLATE(pScreen, ®ion, pDraw->x, pDraw->y); - DamageRegionPending(pDraw, ®ion); + DamageRegionAppend(pDraw, ®ion); /* This is wrong, this needs a seperate function. */ - DamageRegionSubmitted(pDraw); + DamageRegionProcessPending(pDraw); REGION_UNINIT(pDraw->pScreen, ®ion); __glXleaveServer(GL_FALSE); diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c index 952628496..12bd75404 100644 --- a/hw/xfree86/modes/xf86Rotate.c +++ b/hw/xfree86/modes/xf86Rotate.c @@ -336,7 +336,7 @@ xf86CrtcDamageShadow (xf86CrtcPtr crtc) damage_box.y1 = crtc->y; damage_box.y2 = crtc->y + xf86ModeHeight (&crtc->mode, crtc->rotation); REGION_INIT (pScreen, &damage_region, &damage_box, 1); - DamageRegionPending (&(*pScreen->GetScreenPixmap)(pScreen)->drawable, + DamageRegionAppend(&(*pScreen->GetScreenPixmap)(pScreen)->drawable, &damage_region); REGION_UNINIT (pScreen, &damage_region); } diff --git a/miext/damage/damage.c b/miext/damage/damage.c index a90ee08fe..d7a29672a 100755 --- a/miext/damage/damage.c +++ b/miext/damage/damage.c @@ -212,11 +212,11 @@ damageReportDamagePostRendering (DamagePtr pDamage, RegionPtr pOldDamage, Region #if DAMAGE_DEBUG_ENABLE static void -_damageRegionPending (DrawablePtr pDrawable, RegionPtr pRegion, Bool clip, int subWindowMode, const char *where) -#define damageRegionPending(d,r,c,m) _damageRegionPending(d,r,c,m,__FUNCTION__) +_damageRegionAppend (DrawablePtr pDrawable, RegionPtr pRegion, Bool clip, int subWindowMode, const char *where) +#define damageRegionAppend(d,r,c,m) _damageRegionAppend(d,r,c,m,__FUNCTION__) #else static void -damageRegionPending (DrawablePtr pDrawable, RegionPtr pRegion, Bool clip, +damageRegionAppend (DrawablePtr pDrawable, RegionPtr pRegion, Bool clip, int subWindowMode) #endif { @@ -381,7 +381,7 @@ damageRegionPending (DrawablePtr pDrawable, RegionPtr pRegion, Bool clip, } static void -damageRegionSubmitted (DrawablePtr pDrawable) +damageRegionProcessPending (DrawablePtr pDrawable) { drawableDamage(pDrawable); @@ -420,9 +420,9 @@ damageDamageBox (DrawablePtr pDrawable, BoxPtr pBox, int subWindowMode) REGION_INIT (pDrawable->pScreen, ®ion, pBox, 1); #if DAMAGE_DEBUG_ENABLE - _damageRegionPending (pDrawable, ®ion, TRUE, subWindowMode, where); + _damageRegionAppend (pDrawable, ®ion, TRUE, subWindowMode, where); #else - damageRegionPending (pDrawable, ®ion, TRUE, subWindowMode); + damageRegionAppend (pDrawable, ®ion, TRUE, subWindowMode); #endif REGION_UNINIT (pDrawable->pScreen, ®ion); } @@ -652,7 +652,7 @@ damageComposite (CARD8 op, yDst, width, height); - damageRegionSubmitted (pDst->pDrawable); + damageRegionProcessPending (pDst->pDrawable); wrap (pScrPriv, ps, Composite, damageComposite); } @@ -719,7 +719,7 @@ damageGlyphs (CARD8 op, } unwrap (pScrPriv, ps, Glyphs); (*ps->Glyphs) (op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, glyphs); - damageRegionSubmitted (pDst->pDrawable); + damageRegionProcessPending (pDst->pDrawable); wrap (pScrPriv, ps, Glyphs, damageGlyphs); } #endif @@ -772,7 +772,7 @@ damageFillSpans(DrawablePtr pDrawable, (*pGC->ops->FillSpans)(pDrawable, pGC, npt, ppt, pwidth, fSorted); - damageRegionSubmitted (pDrawable); + damageRegionProcessPending (pDrawable); DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable); } @@ -820,7 +820,7 @@ damageSetSpans(DrawablePtr pDrawable, damageDamageBox (pDrawable, &box, pGC->subWindowMode); } (*pGC->ops->SetSpans)(pDrawable, pGC, pcharsrc, ppt, pwidth, npt, fSorted); - damageRegionSubmitted (pDrawable); + damageRegionProcessPending (pDrawable); DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable); } @@ -852,7 +852,7 @@ damagePutImage(DrawablePtr pDrawable, } (*pGC->ops->PutImage)(pDrawable, pGC, depth, x, y, w, h, leftPad, format, pImage); - damageRegionSubmitted (pDrawable); + damageRegionProcessPending (pDrawable); DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable); } @@ -896,7 +896,7 @@ damageCopyArea(DrawablePtr pSrc, ret = (*pGC->ops->CopyArea)(pSrc, pDst, pGC, srcx, srcy, width, height, dstx, dsty); - damageRegionSubmitted (pDst); + damageRegionProcessPending (pDst); DAMAGE_GC_OP_EPILOGUE(pGC, pDst); return ret; } @@ -942,7 +942,7 @@ damageCopyPlane(DrawablePtr pSrc, ret = (*pGC->ops->CopyPlane)(pSrc, pDst, pGC, srcx, srcy, width, height, dstx, dsty, bitPlane); - damageRegionSubmitted (pDst); + damageRegionProcessPending (pDst); DAMAGE_GC_OP_EPILOGUE(pGC, pDst); return ret; } @@ -984,7 +984,7 @@ damagePolyPoint(DrawablePtr pDrawable, damageDamageBox (pDrawable, &box, pGC->subWindowMode); } (*pGC->ops->PolyPoint)(pDrawable, pGC, mode, npt, ppt); - damageRegionSubmitted (pDrawable); + damageRegionProcessPending (pDrawable); DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable); } @@ -1058,7 +1058,7 @@ damagePolylines(DrawablePtr pDrawable, damageDamageBox (pDrawable, &box, pGC->subWindowMode); } (*pGC->ops->Polylines)(pDrawable, pGC, mode, npt, ppt); - damageRegionSubmitted (pDrawable); + damageRegionProcessPending (pDrawable); DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable); } @@ -1137,7 +1137,7 @@ damagePolySegment(DrawablePtr pDrawable, damageDamageBox (pDrawable, &box, pGC->subWindowMode); } (*pGC->ops->PolySegment)(pDrawable, pGC, nSeg, pSeg); - damageRegionSubmitted (pDrawable); + damageRegionProcessPending (pDrawable); DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable); } @@ -1199,7 +1199,7 @@ damagePolyRectangle(DrawablePtr pDrawable, } } (*pGC->ops->PolyRectangle)(pDrawable, pGC, nRects, pRects); - damageRegionSubmitted (pDrawable); + damageRegionProcessPending (pDrawable); DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable); } @@ -1252,7 +1252,7 @@ damagePolyArc(DrawablePtr pDrawable, damageDamageBox (pDrawable, &box, pGC->subWindowMode); } (*pGC->ops->PolyArc)(pDrawable, pGC, nArcs, pArcs); - damageRegionSubmitted (pDrawable); + damageRegionProcessPending (pDrawable); DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable); } @@ -1311,7 +1311,7 @@ damageFillPolygon(DrawablePtr pDrawable, } (*pGC->ops->FillPolygon)(pDrawable, pGC, shape, mode, npt, ppt); - damageRegionSubmitted (pDrawable); + damageRegionProcessPending (pDrawable); DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable); } @@ -1350,7 +1350,7 @@ damagePolyFillRect(DrawablePtr pDrawable, damageDamageBox (pDrawable, &box, pGC->subWindowMode); } (*pGC->ops->PolyFillRect)(pDrawable, pGC, nRects, pRects); - damageRegionSubmitted (pDrawable); + damageRegionProcessPending (pDrawable); DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable); } @@ -1392,7 +1392,7 @@ damagePolyFillArc(DrawablePtr pDrawable, damageDamageBox (pDrawable, &box, pGC->subWindowMode); } (*pGC->ops->PolyFillArc)(pDrawable, pGC, nArcs, pArcs); - damageRegionSubmitted (pDrawable); + damageRegionProcessPending (pDrawable); DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable); } @@ -1503,7 +1503,7 @@ damagePolyText8(DrawablePtr pDrawable, Linear8Bit, TT_POLY8); else x = (*pGC->ops->PolyText8)(pDrawable, pGC, x, y, count, chars); - damageRegionSubmitted (pDrawable); + damageRegionProcessPending (pDrawable); DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable); return x; } @@ -1524,7 +1524,7 @@ damagePolyText16(DrawablePtr pDrawable, TT_POLY16); else x = (*pGC->ops->PolyText16)(pDrawable, pGC, x, y, count, chars); - damageRegionSubmitted (pDrawable); + damageRegionProcessPending (pDrawable); DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable); return x; } @@ -1544,7 +1544,7 @@ damageImageText8(DrawablePtr pDrawable, Linear8Bit, TT_IMAGE8); else (*pGC->ops->ImageText8)(pDrawable, pGC, x, y, count, chars); - damageRegionSubmitted (pDrawable); + damageRegionProcessPending (pDrawable); DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable); } @@ -1564,7 +1564,7 @@ damageImageText16(DrawablePtr pDrawable, TT_IMAGE16); else (*pGC->ops->ImageText16)(pDrawable, pGC, x, y, count, chars); - damageRegionSubmitted (pDrawable); + damageRegionProcessPending (pDrawable); DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable); } @@ -1583,7 +1583,7 @@ damageImageGlyphBlt(DrawablePtr pDrawable, nglyph, ppci, TRUE, pGC->subWindowMode); (*pGC->ops->ImageGlyphBlt)(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase); - damageRegionSubmitted (pDrawable); + damageRegionProcessPending (pDrawable); DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable); } @@ -1601,7 +1601,7 @@ damagePolyGlyphBlt(DrawablePtr pDrawable, nglyph, ppci, FALSE, pGC->subWindowMode); (*pGC->ops->PolyGlyphBlt)(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase); - damageRegionSubmitted (pDrawable); + damageRegionProcessPending (pDrawable); DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable); } @@ -1635,7 +1635,7 @@ damagePushPixels(GCPtr pGC, damageDamageBox (pDrawable, &box, pGC->subWindowMode); } (*pGC->ops->PushPixels)(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg); - damageRegionSubmitted (pDrawable); + damageRegionProcessPending (pDrawable); DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable); } @@ -1715,12 +1715,12 @@ damageCopyWindow(WindowPtr pWindow, * at the destination location. Translate back and forth. */ REGION_TRANSLATE (pScreen, prgnSrc, dx, dy); - damageRegionPending (&pWindow->drawable, prgnSrc, FALSE, -1); + damageRegionAppend (&pWindow->drawable, prgnSrc, FALSE, -1); REGION_TRANSLATE (pScreen, prgnSrc, -dx, -dy); } unwrap (pScrPriv, pScreen, CopyWindow); (*pScreen->CopyWindow) (pWindow, ptOldOrg, prgnSrc); - damageRegionSubmitted (&pWindow->drawable); + damageRegionProcessPending (&pWindow->drawable); wrap (pScrPriv, pScreen, CopyWindow, damageCopyWindow); } @@ -2010,15 +2010,15 @@ DamagePendingRegion (DamagePtr pDamage) } _X_EXPORT void -DamageRegionPending (DrawablePtr pDrawable, RegionPtr pRegion) +DamageRegionAppend (DrawablePtr pDrawable, RegionPtr pRegion) { - damageRegionPending (pDrawable, pRegion, FALSE, -1); + damageRegionAppend (pDrawable, pRegion, FALSE, -1); } _X_EXPORT void -DamageRegionSubmitted (DrawablePtr pDrawable) +DamageRegionProcessPending (DrawablePtr pDrawable) { - damageRegionSubmitted (pDrawable); + damageRegionProcessPending (pDrawable); } /* If a damage marker is provided, then this function must be called after rendering is done. */ @@ -2036,13 +2036,13 @@ _X_EXPORT void DamageDamageRegion (DrawablePtr pDrawable, RegionPtr pRegion) { - damageRegionPending (pDrawable, pRegion, FALSE, -1); + damageRegionAppend (pDrawable, pRegion, FALSE, -1); /* Go back and report this damage for DamagePtrs with reportAfter set, since * this call isn't part of an in-progress drawing op in the call chain and * the DDX probably just wants to know about it right away. */ - damageRegionSubmitted (pDrawable); + damageRegionProcessPending (pDrawable); } _X_EXPORT void diff --git a/miext/damage/damage.h b/miext/damage/damage.h index c20a250b3..a70f1f86e 100755 --- a/miext/damage/damage.h +++ b/miext/damage/damage.h @@ -81,13 +81,13 @@ DamageRegion (DamagePtr pDamage); RegionPtr DamagePendingRegion (DamagePtr pDamage); -/* Call this function before rendering to a destination. */ +/* In case of rendering, call this before the submitting the commands. */ void -DamageRegionPending (DrawablePtr pDrawable, RegionPtr pRegion); +DamageRegionAppend (DrawablePtr pDrawable, RegionPtr pRegion); /* Call this directly after the rendering operation has been submitted. */ void -DamageRegionSubmitted (DrawablePtr pDrawable); +DamageRegionProcessPending (DrawablePtr pDrawable); /* Call this some time after rendering is done, only relevant when a damageMarker is provided. */ void