summaryrefslogtreecommitdiff
path: root/xserver/exa/exa_render.c
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2014-09-27 17:53:06 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2014-09-27 17:53:06 +0000
commit4a4018aabb79405f1b50809f76e4bff4d0ead33c (patch)
treebbe31c32ce7b90f7ca8124d215cd1bc28516a259 /xserver/exa/exa_render.c
parent340ecc70b63a19bbc23b3ffc950d5beb49220505 (diff)
Update to xserver 1.16.1.
Tested by naddy@, jsg@ & kettenis@
Diffstat (limited to 'xserver/exa/exa_render.c')
-rw-r--r--xserver/exa/exa_render.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/xserver/exa/exa_render.c b/xserver/exa/exa_render.c
index 172e2b56d..c4edf407e 100644
--- a/xserver/exa/exa_render.c
+++ b/xserver/exa/exa_render.c
@@ -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(&region),
RegionNumRects(&region), 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;