From 4c61bf84b11e26e6f22648668c95ea760a379163 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 11 Jun 2010 12:14:52 +0000 Subject: xserver git update 11/6/2010 --- xorg-server/render/mirect.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'xorg-server/render/mirect.c') diff --git a/xorg-server/render/mirect.c b/xorg-server/render/mirect.c index 70bdf63f6..d0becd578 100644 --- a/xorg-server/render/mirect.c +++ b/xorg-server/render/mirect.c @@ -42,7 +42,6 @@ miColorRects (PicturePtr pDst, int xoff, int yoff) { - ScreenPtr pScreen = pDst->pDrawable->pScreen; CARD32 pixel; GCPtr pGC; ChangeGCVal tmpval[5]; @@ -51,7 +50,7 @@ miColorRects (PicturePtr pDst, miRenderColorToPixel (pDst->pFormat, color, &pixel); - pGC = GetScratchGC (pDst->pDrawable->depth, pScreen); + pGC = GetScratchGC (pDst->pDrawable->depth, pDst->pDrawable->pScreen); if (!pGC) return; tmpval[0].val = GXcopy; @@ -64,8 +63,8 @@ miColorRects (PicturePtr pDst, 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); } -- cgit v1.2.3