diff options
| author | Jamey Sharp <jamey@minilop.net> | 2010-05-08 14:10:51 -0700 |
|---|---|---|
| committer | Jamey Sharp <jamey@minilop.net> | 2010-05-13 17:13:48 -0700 |
| commit | e2929db7b737413cf93fbebdf4d15abdfebff05c (patch) | |
| tree | b32ddbf9c163f8eb814ebdaa4b22301b82af0906 /hw/kdrive | |
| parent | 95728ca09d45afc84c8d1828c09c6b6725f1a58d (diff) | |
dixChangeGC callers: Use ChangeGCVal instead of XID almost everywhere.
The exceptions are ProcChangeGC and CreateGC.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'hw/kdrive')
| -rw-r--r-- | hw/kdrive/ephyr/ephyr_draw.c | 18 | ||||
| -rw-r--r-- | hw/kdrive/src/kxv.c | 8 |
2 files changed, 13 insertions, 13 deletions
diff --git a/hw/kdrive/ephyr/ephyr_draw.c b/hw/kdrive/ephyr/ephyr_draw.c index 672e0e4ea..f5a324745 100644 --- a/hw/kdrive/ephyr/ephyr_draw.c +++ b/hw/kdrive/ephyr/ephyr_draw.c @@ -97,17 +97,17 @@ ephyrPrepareSolid(PixmapPtr pPix, int alu, Pixel pm, Pixel fg) KdScreenInfo *screen = pScreenPriv->screen; EphyrScrPriv *scrpriv = screen->driver; EphyrFakexaPriv *fakexa = scrpriv->fakexa; - CARD32 tmpval[3]; + ChangeGCVal tmpval[3]; ephyrPreparePipelinedAccess(pPix, EXA_PREPARE_DEST); fakexa->pDst = pPix; fakexa->pGC = GetScratchGC(pPix->drawable.depth, pScreen); - tmpval[0] = alu; - tmpval[1] = pm; - tmpval[2] = fg; - dixChangeGC(NullClient, fakexa->pGC, GCFunction | GCPlaneMask | GCForeground, tmpval, NULL); + tmpval[0].val = alu; + tmpval[1].val = pm; + tmpval[2].val = fg; + dixChangeGC(NullClient, fakexa->pGC, GCFunction | GCPlaneMask | GCForeground, NULL, tmpval); ValidateGC(&pPix->drawable, fakexa->pGC); @@ -161,7 +161,7 @@ ephyrPrepareCopy(PixmapPtr pSrc, PixmapPtr pDst, int dx, int dy, int alu, KdScreenInfo *screen = pScreenPriv->screen; EphyrScrPriv *scrpriv = screen->driver; EphyrFakexaPriv *fakexa = scrpriv->fakexa; - CARD32 tmpval[2]; + ChangeGCVal tmpval[2]; ephyrPreparePipelinedAccess(pDst, EXA_PREPARE_DEST); ephyrPreparePipelinedAccess(pSrc, EXA_PREPARE_SRC); @@ -170,9 +170,9 @@ ephyrPrepareCopy(PixmapPtr pSrc, PixmapPtr pDst, int dx, int dy, int alu, fakexa->pDst = pDst; fakexa->pGC = GetScratchGC(pDst->drawable.depth, pScreen); - tmpval[0] = alu; - tmpval[1] = pm; - dixChangeGC (NullClient, fakexa->pGC, GCFunction | GCPlaneMask, tmpval, NULL); + tmpval[0].val = alu; + tmpval[1].val = pm; + dixChangeGC (NullClient, fakexa->pGC, GCFunction | GCPlaneMask, NULL, tmpval); ValidateGC(&pDst->drawable, fakexa->pGC); diff --git a/hw/kdrive/src/kxv.c b/hw/kdrive/src/kxv.c index bf6600a09..aedf06833 100644 --- a/hw/kdrive/src/kxv.c +++ b/hw/kdrive/src/kxv.c @@ -1867,7 +1867,7 @@ void KXVPaintRegion (DrawablePtr pDraw, RegionPtr pRgn, Pixel fg) { GCPtr pGC; - CARD32 val[2]; + ChangeGCVal val[2]; xRectangle *rects, *r; BoxPtr pBox = REGION_RECTS (pRgn); int nBox = REGION_NUM_RECTS (pRgn); @@ -1890,9 +1890,9 @@ KXVPaintRegion (DrawablePtr pDraw, RegionPtr pRgn, Pixel fg) if (!pGC) goto bail1; - val[0] = fg; - val[1] = IncludeInferiors; - dixChangeGC (NullClient, pGC, GCForeground|GCSubwindowMode, val, NULL); + val[0].val = fg; + val[1].val = IncludeInferiors; + dixChangeGC (NullClient, pGC, GCForeground|GCSubwindowMode, NULL, val); ValidateGC (pDraw, pGC); |