casa-mp-base

From 2850855f560451bb64dd5af3f005c6988961336e Mon Sep 17 00:00:00 2001

From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>

Date: Sat, 2 Nov 2013 11:00:23 -0700

Subject: [PATCH 5003/5005] Use old miTrapezoids and miTriangles routines

​

Reverts commits:

    788ccb9a8bcf6a4fb4054c507111eec3338fb969

    566f1931ee2916269e164e114bffaf2da1d039d1

​

http://xquartz.macosforge.org/trac/ticket/525

​

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

---

 fb/fbpict.c     |   2 -

 render/mipict.c |   4 +-

 render/mipict.h |  27 ++++++++++++++

 render/mitrap.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++

 render/mitri.c  |  61 +++++++++++++++++++++++++++++++

 5 files changed, 201 insertions(+), 4 deletions(-)

​

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

index 7ea0b66..434d890 100644

--- a/fb/fbpict.c

+++ b/fb/fbpict.c

@@ -498,10 +498,8 @@

     ps->UnrealizeGlyph = fbUnrealizeGlyph;

     ps->CompositeRects = miCompositeRects;

     ps->RasterizeTrapezoid = fbRasterizeTrapezoid;

-    ps->Trapezoids = fbTrapezoids;

     ps->AddTraps = fbAddTraps;

     ps->AddTriangles = fbAddTriangles;

-    ps->Triangles = fbTriangles;

     return TRUE;

 }

diff --git a/render/mipict.c b/render/mipict.c

index 4b85512..a39eb2c 100644

--- a/render/mipict.c

+++ b/render/mipict.c

@@ -575,8 +575,8 @@ miPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)

     ps->Composite = 0;          /* requires DDX support */

     ps->Glyphs = miGlyphs;

     ps->CompositeRects = miCompositeRects;

-    ps->Trapezoids = 0;

-    ps->Triangles = 0;

+    ps->Trapezoids = miTrapezoids;

+    ps->Triangles = miTriangles;

     ps->RasterizeTrapezoid = 0; /* requires DDX support */

     ps->AddTraps = 0;           /* requires DDX support */

diff --git a/render/mipict.h b/render/mipict.h

index 3241be4..8ee7a8a 100644

--- a/render/mipict.h

+++ b/render/mipict.h

@@ -102,9 +102,36 @@ miCompositeRects(CARD8 op,

                  xRenderColor * color, int nRect, xRectangle *rects);

 extern _X_EXPORT void

+miTriangles (CARD8     op,

+        PicturePtr     pSrc,

+        PicturePtr     pDst,

+        PictFormatPtr  maskFormat,

+        INT16      xSrc,