exa: Fix -Wshadow warnings
In exa_accel, there was a duplicate fetch of a pixmap private field. exa_render just had a regular shadowed value. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
parent
04e320a4e4
commit
9c108b3ccd
|
@ -1039,7 +1039,6 @@ exaFillRegionSolid(DrawablePtr pDrawable, RegionPtr pRegion, Pixel pixel,
|
|||
pExaPixmap->sys_ptr && pDrawable->type == DRAWABLE_PIXMAP &&
|
||||
pDrawable->width == 1 && pDrawable->height == 1 &&
|
||||
pDrawable->bitsPerPixel != 24) {
|
||||
ExaPixmapPriv(pPixmap);
|
||||
RegionPtr pending_damage = DamagePendingRegion(pExaPixmap->pDamage);
|
||||
|
||||
switch (pDrawable->bitsPerPixel) {
|
||||
|
|
|
@ -915,7 +915,7 @@ exaComposite(CARD8 op,
|
|||
if (!pSrc->repeat && xSrc >= 0 && ySrc >= 0 &&
|
||||
(xSrc + width <= pSrc->pDrawable->width) &&
|
||||
(ySrc + height <= pSrc->pDrawable->height)) {
|
||||
Bool ret;
|
||||
Bool suc;
|
||||
|
||||
xDst += pDst->pDrawable->x;
|
||||
yDst += pDst->pDrawable->y;
|
||||
|
@ -927,7 +927,7 @@ exaComposite(CARD8 op,
|
|||
yDst, width, height))
|
||||
goto done;
|
||||
|
||||
ret = exaHWCopyNtoN(pSrc->pDrawable, pDst->pDrawable, NULL,
|
||||
suc = exaHWCopyNtoN(pSrc->pDrawable, pDst->pDrawable, NULL,
|
||||
RegionRects(®ion),
|
||||
RegionNumRects(®ion), xSrc - xDst,
|
||||
ySrc - yDst, FALSE, FALSE);
|
||||
|
@ -939,7 +939,7 @@ exaComposite(CARD8 op,
|
|||
xSrc -= pSrc->pDrawable->x;
|
||||
ySrc -= pSrc->pDrawable->y;
|
||||
|
||||
if (!ret)
|
||||
if (!suc)
|
||||
goto fallback;
|
||||
|
||||
goto done;
|
||||
|
|
Loading…
Reference in New Issue