frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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:
Keith Packard 2013-12-15 01:53:50 -08:00
parent 04e320a4e4
commit 9c108b3ccd
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
exa/exa_accel.c
View File

@ -1039,7 +1039,6 @@ exaFillRegionSolid(DrawablePtr pDrawable, RegionPtr pRegion, Pixel pixel,
pExaPixmap->sys_ptr && pDrawable->type == DRAWABLE_PIXMAP && pExaPixmap->sys_ptr && pDrawable->type == DRAWABLE_PIXMAP &&
pDrawable->width == 1 && pDrawable->height == 1 && pDrawable->width == 1 && pDrawable->height == 1 &&
pDrawable->bitsPerPixel != 24) { pDrawable->bitsPerPixel != 24) {
ExaPixmapPriv(pPixmap);
RegionPtr pending_damage = DamagePendingRegion(pExaPixmap->pDamage); RegionPtr pending_damage = DamagePendingRegion(pExaPixmap->pDamage);
switch (pDrawable->bitsPerPixel) { switch (pDrawable->bitsPerPixel) {

6
exa/exa_render.c
View File

@ -915,7 +915,7 @@ exaComposite(CARD8 op,
if (!pSrc->repeat && xSrc >= 0 && ySrc >= 0 && if (!pSrc->repeat && xSrc >= 0 && ySrc >= 0 &&
(xSrc + width <= pSrc->pDrawable->width) && (xSrc + width <= pSrc->pDrawable->width) &&
(ySrc + height <= pSrc->pDrawable->height)) { (ySrc + height <= pSrc->pDrawable->height)) {
Bool ret; Bool suc;
xDst += pDst->pDrawable->x; xDst += pDst->pDrawable->x;
yDst += pDst->pDrawable->y; yDst += pDst->pDrawable->y;
@ -927,7 +927,7 @@ exaComposite(CARD8 op,
yDst, width, height)) yDst, width, height))
goto done; goto done;
ret = exaHWCopyNtoN(pSrc->pDrawable, pDst->pDrawable, NULL, suc = exaHWCopyNtoN(pSrc->pDrawable, pDst->pDrawable, NULL,
RegionRects(&region), RegionRects(&region),
RegionNumRects(&region), xSrc - xDst, RegionNumRects(&region), xSrc - xDst,
ySrc - yDst, FALSE, FALSE); ySrc - yDst, FALSE, FALSE);
@ -939,7 +939,7 @@ exaComposite(CARD8 op,
xSrc -= pSrc->pDrawable->x; xSrc -= pSrc->pDrawable->x;
ySrc -= pSrc->pDrawable->y; ySrc -= pSrc->pDrawable->y;
if (!ret) if (!suc)
goto fallback; goto fallback;
goto done; goto done;