diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-12-05 15:36:12 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-12-05 15:36:12 +0000 |
| commit | a90ee792d96752ad1b71b9ada922fa6afe478c99 (patch) | |
| tree | 6143b00f7646951d23dfe2a4fe2992ca40b77069 /xserver/render/mirect.c | |
| parent | bc97d4ecc0aa9e1b823565b07282f848700bd11a (diff) | |
Upgrade to xorg-server 1.9.2.
Tested by ajacoutot@, krw@, shadchin@ and jasper@ on various configurations
including multihead with both zaphod and xrandr.
Diffstat (limited to 'xserver/render/mirect.c')
| -rw-r--r-- | xserver/render/mirect.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/xserver/render/mirect.c b/xserver/render/mirect.c index b54fe6fe6..4fb347a93 100644 --- a/xserver/render/mirect.c +++ b/xserver/render/mirect.c @@ -42,35 +42,34 @@ miColorRects (PicturePtr pDst, int xoff, int yoff) { - ScreenPtr pScreen = pDst->pDrawable->pScreen; CARD32 pixel; GCPtr pGC; - CARD32 tmpval[5]; + ChangeGCVal tmpval[5]; RegionPtr pClip; unsigned long mask; miRenderColorToPixel (pDst->pFormat, color, &pixel); - pGC = GetScratchGC (pDst->pDrawable->depth, pScreen); + pGC = GetScratchGC (pDst->pDrawable->depth, pDst->pDrawable->pScreen); if (!pGC) return; - tmpval[0] = GXcopy; - tmpval[1] = pixel; - tmpval[2] = pDst->subWindowMode; + tmpval[0].val = GXcopy; + tmpval[1].val = pixel; + tmpval[2].val = pDst->subWindowMode; mask = GCFunction | GCForeground | GCSubwindowMode; if (pClipPict->clientClipType == CT_REGION) { - tmpval[3] = pDst->clipOrigin.x - xoff; - tmpval[4] = pDst->clipOrigin.y - yoff; + tmpval[3].val = pDst->clipOrigin.x - xoff; + tmpval[4].val = pDst->clipOrigin.y - yoff; mask |= GCClipXOrigin|GCClipYOrigin; - pClip = REGION_CREATE (pScreen, NULL, 1); - REGION_COPY (pScreen, pClip, + pClip = RegionCreate(NULL, 1); + RegionCopy(pClip, (RegionPtr) pClipPict->clientClip); (*pGC->funcs->ChangeClip) (pGC, CT_REGION, pClip, 0); } - ChangeGC (pGC, mask, tmpval); + ChangeGC (NullClient, pGC, mask, tmpval); ValidateGC (pDst->pDrawable, pGC); if (xoff || yoff) { @@ -129,7 +128,8 @@ miCompositeRects (CARD8 op, int error; Pixel pixel; GCPtr pGC; - CARD32 tmpval[2]; + ChangeGCVal gcvals[2]; + XID tmpval[1]; rgbaFormat = PictureMatchFormat (pScreen, 32, PICT_a8r8g8b8); if (!rgbaFormat) @@ -145,10 +145,10 @@ miCompositeRects (CARD8 op, pGC = GetScratchGC (rgbaFormat->depth, pScreen); if (!pGC) goto bail3; - tmpval[0] = GXcopy; - tmpval[1] = pixel; + gcvals[0].val = GXcopy; + gcvals[1].val = pixel; - ChangeGC (pGC, GCFunction | GCForeground, tmpval); + ChangeGC (NullClient, pGC, GCFunction | GCForeground, gcvals); ValidateGC (&pPixmap->drawable, pGC); one.x = 0; one.y = 0; |