diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | hw/xgl/glx/xglx.c | 4 | ||||
| -rw-r--r-- | hw/xgl/glxext/xglglxext.c | 2 | ||||
| -rw-r--r-- | hw/xgl/xglsync.c | 2 | ||||
| -rw-r--r-- | hw/xgl/xglwindow.c | 2 |
5 files changed, 15 insertions, 5 deletions
@@ -1,3 +1,13 @@ +2005-12-31 Eric Anholt <anholt@FreeBSD.org> + + * hw/xgl/glx/xglx.c: (xglxWindowExposures): + * hw/xgl/glxext/xglglxext.c: (xglCreateBuffer): + * hw/xgl/xglsync.c: (xglSyncBits): + * hw/xgl/xglwindow.c: (xglCopyWindow): + Change REGION_INIT(pScreen, &foo, NullBox, 0) to REGION_NULL(pScreen, + &foo). While it is no longer (or rather, once again not) required as of + regionstr.h r1.4, it matches the style of the rest of the xorg code. + 2005-12-30 Eric Anholt <anholt@FreeBSD.org> * hw/xgl/xglsync.c: (xglSyncBits), (xglSyncSurface): diff --git a/hw/xgl/glx/xglx.c b/hw/xgl/glx/xglx.c index f8ac366b1..842ab19ec 100644 --- a/hw/xgl/glx/xglx.c +++ b/hw/xgl/glx/xglx.c @@ -591,7 +591,7 @@ xglxWindowExposures (WindowPtr pWin, if (HasBorder (pWin)) { - REGION_INIT (pScreen, &ClipList, NullBox, 0); + REGION_NULL (pScreen, &ClipList); REGION_SUBTRACT (pScreen, &ClipList, &pWin->borderClip, &pWin->winSize); REGION_INTERSECT (pScreen, &ClipList, &ClipList, (RegionPtr) pReg); @@ -599,7 +599,7 @@ xglxWindowExposures (WindowPtr pWin, REGION_UNINIT (pScreen, &ClipList); } - REGION_INIT (pScreen, &ClipList, NullBox, 0); + REGION_NULL (pScreen, &ClipList); REGION_INTERSECT (pScreen, &ClipList, &pWin->clipList, (RegionPtr) pReg); (*pScreen->WindowExposures) (pWin, &ClipList, NullRegion); REGION_UNINIT (pScreen, &ClipList); diff --git a/hw/xgl/glxext/xglglxext.c b/hw/xgl/glxext/xglglxext.c index df365717f..3a9c4cc14 100644 --- a/hw/xgl/glxext/xglglxext.c +++ b/hw/xgl/glxext/xglglxext.c @@ -4729,7 +4729,7 @@ xglCreateBuffer (__GLXdrawablePrivate *glxPriv) pBufferPriv->private = NULL; pBufferPriv->freeBuffers = NULL; - REGION_INIT (pScreen, &pBufferPriv->damage, NullBox, 0); + REGION_NULL (pScreen, &pBufferPriv->damage); if (pScreenPriv->fbo || ((pDrawable->type == DRAWABLE_WINDOW) diff --git a/hw/xgl/xglsync.c b/hw/xgl/xglsync.c index d15733c6b..7bcff949b 100644 --- a/hw/xgl/xglsync.c +++ b/hw/xgl/xglsync.c @@ -96,7 +96,7 @@ xglSyncBits (DrawablePtr pDrawable, switch (RECT_IN_REGION (pDrawable->pScreen, &bitRegion, &box)) { case rgnIN: - REGION_INIT (pDrawable->pScreen, ®ion, NullBox, 0); + REGION_NULL (pDrawable->pScreen, ®ion); break; case rgnOUT: REGION_INIT (pDrawable->pScreen, ®ion, &box, 1); diff --git a/hw/xgl/xglwindow.c b/hw/xgl/xglwindow.c index ce921385b..9e4245c93 100644 --- a/hw/xgl/xglwindow.c +++ b/hw/xgl/xglwindow.c @@ -116,7 +116,7 @@ xglCopyWindow (WindowPtr pWin, dy = ptOldOrg.y - pWin->drawable.y; REGION_TRANSLATE (pWin->drawable.pScreen, prgnSrc, -dx, -dy); - REGION_INIT (pWin->drawable.pScreen, &rgnDst, NullBox, 0); + REGION_NULL (pWin->drawable.pScreen, &rgnDst); REGION_INTERSECT (pWin->drawable.pScreen, &rgnDst, &pWin->borderClip, prgnSrc); |