casa-mp-base

From 055a7bb8f22eb94a35cae6224d109daa435d288d Mon Sep 17 00:00:00 2001

From: Jeremy Huddleston <jeremyhu@apple.com>

Date: Fri, 12 Feb 2010 19:48:52 -0800

Subject: [PATCH 5004/5005] fb: Revert fb changes that broke XQuartz

​

http://bugs.freedesktop.org/show_bug.cgi?id=26124

​

Revert "Fix source pictures getting random transforms after 2d6a8f668342a5190cdf43b5."

Revert "fb: Adjust transform or composite coordinates for pixman operations"

​

http://bugs.freedesktop.org/26124

​

This reverts commit a72c65e9176c51de95db2fdbf4c5d946a4911695.

This reverts commit a6bd5d2e482a5aa84acb3d4932e2a166d8670ef1.

​

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>

---

 fb/fb.h     |  3 +--

 fb/fbpict.c | 82 ++++++++++++++++++-------------------------------------------

 fb/fbtrap.c | 43 ++++++++++++++------------------

 3 files changed, 43 insertions(+), 85 deletions(-)

​

diff --git a/fb/fb.h b/fb/fb.h

index c687aa7..256a1ee 100644

--- a/fb/fb.h

+++ b/fb/fb.h

@@ -1149,8 +1149,7 @@

                   RegionPtr pRegion, FbBits and, FbBits xor);

 extern _X_EXPORT pixman_image_t *image_from_pict(PicturePtr pict,

-                                                 Bool has_clip,

-                                                 int *xoff, int *yoff);

+                                                 Bool has_clip);

 extern _X_EXPORT void free_pixman_pict(PicturePtr, pixman_image_t *);

diff --git a/fb/fbpict.c b/fb/fbpict.c

index 434d890..be8274b 100644

--- a/fb/fbpict.c

+++ b/fb/fbpict.c

@@ -46,23 +46,18 @@ fbComposite(CARD8 op,

             INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height)

 {

     pixman_image_t *src, *mask, *dest;

-    int src_xoff, src_yoff;

-    int msk_xoff, msk_yoff;

-    int dst_xoff, dst_yoff;

-

     miCompositeSourceValidate(pSrc);

     if (pMask)

         miCompositeSourceValidate(pMask);

-    src = image_from_pict(pSrc, FALSE, &src_xoff, &src_yoff);

-    mask = image_from_pict(pMask, FALSE, &msk_xoff, &msk_yoff);

-    dest = image_from_pict(pDst, TRUE, &dst_xoff, &dst_yoff);

+    src = image_from_pict(pSrc, TRUE);

+    mask = image_from_pict(pMask, TRUE);

+    dest = image_from_pict(pDst, TRUE);

     if (src && dest && !(pMask && !mask)) {

         pixman_image_composite(op, src, mask, dest,

-                               xSrc + src_xoff, ySrc + src_yoff,

-                               xMask + msk_xoff, yMask + msk_yoff,