summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-02-19 11:21:40 -0500
committerEric Anholt <eric@anholt.net>2010-02-20 12:55:13 -0500
commit6bdab841766c8d9febaa23cb01a7bbc9edfae471 (patch)
treebf150b29d1df1a06053a9ddf998368dc2624ce36
parenta86869e6c3131b83a2ad529bc313270a9f45f5bd (diff)
downloadxf86-video-intel-6bdab841766c8d9febaa23cb01a7bbc9edfae471.tar.gz
xf86-video-intel-6bdab841766c8d9febaa23cb01a7bbc9edfae471.tar.bz2
xf86-video-intel-6bdab841766c8d9febaa23cb01a7bbc9edfae471.zip
uxa: Skip adjusting mask coordinates when no mask is present.
Quiets clang warnings about garbage variable usage.
-rw-r--r--uxa/uxa-render.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/uxa/uxa-render.c b/uxa/uxa-render.c
index 68b406e91..3a3a7858a 100644
--- a/uxa/uxa-render.c
+++ b/uxa/uxa-render.c
@@ -860,8 +860,10 @@ uxa_try_driver_composite(CARD8 op,
nbox = REGION_NUM_RECTS(&region);
pbox = REGION_RECTS(&region);
- xMask = xMask + mask_off_x - xDst - dst_off_x;
- yMask = yMask + mask_off_y - yDst - dst_off_y;
+ if (pMask) {
+ xMask = xMask + mask_off_x - xDst - dst_off_x;
+ yMask = yMask + mask_off_y - yDst - dst_off_y;
+ }
xSrc = xSrc + src_off_x - xDst - dst_off_x;
ySrc = ySrc + src_off_y - yDst - dst_off_y;