diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2009-11-29 12:06:26 -0800 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-12-03 11:56:26 +1000 |
| commit | c0de621b42bd69e883e15082c7fd35709d545d55 (patch) | |
| tree | 3051263412de64621defa7bedceafdcbfaa0b47b | |
| parent | 1fff1b37a91c989c046d96d961862d592a307496 (diff) | |
Restore ABI by reintroducing the "is_src" paramter to image_from_pict.
Restores old ABI after 196aff9b18381d700fb28027186cce6e68ad587c.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Tested-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 155e61a9f0429bf28ce493c0fe7a2d076cb7e137)
| -rw-r--r-- | fb/fb.h | 3 | ||||
| -rw-r--r-- | fb/fbpict.c | 11 | ||||
| -rw-r--r-- | fb/fbtrap.c | 4 |
3 files changed, 10 insertions, 8 deletions
@@ -2080,7 +2080,8 @@ fbFillRegionSolid (DrawablePtr pDrawable, extern _X_EXPORT pixman_image_t * image_from_pict (PicturePtr pict, - Bool has_clip); + Bool has_clip, + Bool is_src); extern _X_EXPORT void free_pixman_pict (PicturePtr, pixman_image_t *); #endif /* _FB_H_ */ diff --git a/fb/fbpict.c b/fb/fbpict.c index 8057e900a..8fdaa584e 100644 --- a/fb/fbpict.c +++ b/fb/fbpict.c @@ -163,9 +163,9 @@ fbComposite (CARD8 op, if (pMask) miCompositeSourceValidate (pMask, xMask, yMask, width, height); - src = image_from_pict (pSrc, TRUE); - mask = image_from_pict (pMask, TRUE); - dest = image_from_pict (pDst, TRUE); + src = image_from_pict (pSrc, TRUE, TRUE); + mask = image_from_pict (pMask, TRUE, TRUE); + dest = image_from_pict (pDst, TRUE, FALSE); if (src && dest && !(pMask && !mask)) { @@ -361,7 +361,7 @@ set_image_properties (pixman_image_t *image, PicturePtr pict) if (pict->alphaMap) { - pixman_image_t *alpha_map = image_from_pict (pict->alphaMap, TRUE); + pixman_image_t *alpha_map = image_from_pict (pict->alphaMap, TRUE, TRUE); pixman_image_set_alpha_map ( image, alpha_map, pict->alphaOrigin.x, pict->alphaOrigin.y); @@ -395,7 +395,8 @@ set_image_properties (pixman_image_t *image, PicturePtr pict) pixman_image_t * image_from_pict (PicturePtr pict, - Bool has_clip) + Bool has_clip, + Bool is_src) { pixman_image_t *image = NULL; diff --git a/fb/fbtrap.c b/fb/fbtrap.c index 830603ae7..b1e1eff4a 100644 --- a/fb/fbtrap.c +++ b/fb/fbtrap.c @@ -40,7 +40,7 @@ fbAddTraps (PicturePtr pPicture, int ntrap, xTrap *traps) { - pixman_image_t *image = image_from_pict (pPicture, FALSE); + pixman_image_t *image = image_from_pict (pPicture, FALSE, FALSE); if (!image) return; @@ -56,7 +56,7 @@ fbRasterizeTrapezoid (PicturePtr pPicture, int x_off, int y_off) { - pixman_image_t *image = image_from_pict (pPicture, FALSE); + pixman_image_t *image = image_from_pict (pPicture, FALSE, FALSE); if (!image) return; |