summaryrefslogtreecommitdiff
path: root/src/sna/sna_trapezoids.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2011-12-22 11:19:45 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2011-12-22 14:11:39 +0000
commitf621b3de841f6037d387ca1439a0abe12ef29811 (patch)
tree1c490ae26e9ec8dc7f4afcf357021aeb2a81ef89 /src/sna/sna_trapezoids.c
parent6c08eb4d6f8789e692ef018e007d1ae97a57c25f (diff)
sna: flatten source alphamaps
Replace the source picture+alpha with a bo that contains the RGB channels from source and A from the alpha map. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/sna_trapezoids.c')
-rw-r--r--src/sna/sna_trapezoids.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/sna/sna_trapezoids.c b/src/sna/sna_trapezoids.c
index 287f8833..3837532a 100644
--- a/src/sna/sna_trapezoids.c
+++ b/src/sna/sna_trapezoids.c
@@ -3094,8 +3094,8 @@ trapezoid_span_inplace(CARD8 op, PicturePtr src, PicturePtr dst,
__FUNCTION__));
return false;
}
- if (dst->alphaMap || src->alphaMap) {
- DBG(("%s: fallback -- alphamaps\n",
+ if (dst->alphaMap) {
+ DBG(("%s: fallback -- dst alphamap\n",
__FUNCTION__));
return false;
}
@@ -3374,9 +3374,8 @@ sna_composite_trapezoids(CARD8 op,
goto fallback;
}
- if (dst->alphaMap || src->alphaMap) {
- DBG(("%s: fallback -- alpha maps=(dst=%p, src=%p)\n",
- __FUNCTION__, dst->alphaMap, src->alphaMap));
+ if (dst->alphaMap) {
+ DBG(("%s: fallback -- dst alpha map\n", __FUNCTION__));
goto fallback;
}