From 788ccb9a8bcf6a4fb4054c507111eec3338fb969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Tue, 11 Jan 2011 09:46:46 -0500 Subject: [PATCH] Move miTrapezoids() into fb as fbTrapezoids() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The main consumer of trapezoids, cairo, is using the Trapezoids request, which is currently implemented in the miTrapezoids() function. That function splits the request into smaller bits and calls lower level functions such as AddTrap. By moving the implementation of the whole request into fb, we can instead call pixman_composite_trapezoids() to do the whole request in one step. There are no callers of miTrapezoids in any of the open source drivers, although exa and uxa have their own copies of the function. Reviewed-by: Adam Jackson Signed-off-by: Søren Sandmann --- fb/fbpict.c | 1 + fb/fbpict.h | 10 ++++++ fb/fbtrap.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++-- render/mipict.c | 2 +- render/mipict.h | 10 ------ render/mitrap.c | 61 ------------------------------------ 6 files changed, 92 insertions(+), 75 deletions(-) diff --git a/fb/fbpict.c b/fb/fbpict.c index 7636040c6..6e66db844 100644 --- a/fb/fbpict.c +++ b/fb/fbpict.c @@ -364,6 +364,7 @@ fbPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats) ps->Glyphs = miGlyphs; ps->CompositeRects = miCompositeRects; ps->RasterizeTrapezoid = fbRasterizeTrapezoid; + ps->Trapezoids = fbTrapezoids; ps->AddTraps = fbAddTraps; ps->AddTriangles = fbAddTriangles; diff --git a/fb/fbpict.h b/fb/fbpict.h index 9abced17f..03d266589 100644 --- a/fb/fbpict.h +++ b/fb/fbpict.h @@ -65,4 +65,14 @@ fbAddTriangles (PicturePtr pPicture, int ntri, xTriangle *tris); +extern _X_EXPORT void +fbTrapezoids (CARD8 op, + PicturePtr pSrc, + PicturePtr pDst, + PictFormatPtr maskFormat, + INT16 xSrc, + INT16 ySrc, + int ntrap, + xTrapezoid *traps); + #endif /* _FBPICT_H_ */ diff --git a/fb/fbtrap.c b/fb/fbtrap.c index c309ceb27..687de5527 100644 --- a/fb/fbtrap.c +++ b/fb/fbtrap.c @@ -123,9 +123,9 @@ fbAddTriangles (PicturePtr pPicture, * / \ / \ * / \ / \ * / + + \ - * / -- -- \ - * / -- -- \ - * / --- --- \ + * / -- -- \ + * / -- -- \ + * / --- --- \ * +-- --+ */ @@ -157,3 +157,80 @@ fbAddTriangles (PicturePtr pPicture, } } + +void +fbTrapezoids (CARD8 op, + PicturePtr pSrc, + PicturePtr pDst, + PictFormatPtr maskFormat, + INT16 xSrc, + INT16 ySrc, + int ntrap, + xTrapezoid *traps) +{ + pixman_image_t *src, *dst; + int src_xoff, src_yoff; + int dst_xoff, dst_yoff; + + if (ntrap == 0) + return; + + src = image_from_pict (pSrc, FALSE, &src_xoff, &src_yoff); + dst = image_from_pict (pDst, TRUE, &dst_xoff, &dst_yoff); + + if (src && dst) + { + pixman_format_code_t format; + int x_dst, y_dst; + int i; + + x_dst = traps[0].left.p1.x >> 16; + y_dst = traps[0].left.p1.y >> 16; + + if (!maskFormat) + { + if (pDst->polyEdge == PolyEdgeSharp) + format = PIXMAN_a1; + else + format = PIXMAN_a8; + + for (i = 0; i < ntrap; ++i) + { + pixman_composite_trapezoids (op, src, dst, format, + xSrc + src_xoff, + ySrc + src_yoff, + x_dst + dst_xoff, + y_dst + dst_yoff, + 1, (pixman_trapezoid_t *)traps++); + } + } + else + { + switch (PICT_FORMAT_A (maskFormat->format)) + { + case 1: + format = PIXMAN_a1; + break; + + case 4: + format = PIXMAN_a4; + break; + + default: + case 8: + format = PIXMAN_a8; + break; + } + + pixman_composite_trapezoids (op, src, dst, format, + xSrc + src_xoff, + ySrc + src_yoff, + x_dst + dst_xoff, + y_dst + dst_yoff, + ntrap, (pixman_trapezoid_t *)traps); + } + } + + free_pixman_pict (pSrc, src); + free_pixman_pict (pDst, dst); +} diff --git a/render/mipict.c b/render/mipict.c index de5eea6be..46b45b56a 100644 --- a/render/mipict.c +++ b/render/mipict.c @@ -631,7 +631,7 @@ miPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats) ps->Composite = 0; /* requires DDX support */ ps->Glyphs = miGlyphs; ps->CompositeRects = miCompositeRects; - ps->Trapezoids = miTrapezoids; + ps->Trapezoids = 0; ps->Triangles = miTriangles; ps->TriStrip = miTriStrip; ps->TriFan = miTriFan; diff --git a/render/mipict.h b/render/mipict.h index eb6b6645d..be7b20b82 100644 --- a/render/mipict.h +++ b/render/mipict.h @@ -145,16 +145,6 @@ miCompositeRects (CARD8 op, extern _X_EXPORT void miTrapezoidBounds (int ntrap, xTrapezoid *traps, BoxPtr box); -extern _X_EXPORT void -miTrapezoids (CARD8 op, - PicturePtr pSrc, - PicturePtr pDst, - PictFormatPtr maskFormat, - INT16 xSrc, - INT16 ySrc, - int ntrap, - xTrapezoid *traps); - extern _X_EXPORT void miPointFixedBounds (int npoint, xPointFixed *points, BoxPtr bounds); diff --git a/render/mitrap.c b/render/mitrap.c index 8bdc8a8d0..1f09a1eb9 100644 --- a/render/mitrap.c +++ b/render/mitrap.c @@ -126,64 +126,3 @@ miTrapezoidBounds (int ntrap, xTrapezoid *traps, BoxPtr box) box->x2 = x2; } } - -void -miTrapezoids (CARD8 op, - PicturePtr pSrc, - PicturePtr pDst, - PictFormatPtr maskFormat, - INT16 xSrc, - INT16 ySrc, - int ntrap, - xTrapezoid *traps) -{ - ScreenPtr pScreen = pDst->pDrawable->pScreen; - PictureScreenPtr ps = GetPictureScreen(pScreen); - - /* - * Check for solid alpha add - */ - if (op == PictOpAdd && miIsSolidAlpha (pSrc)) - { - for (; ntrap; ntrap--, traps++) - (*ps->RasterizeTrapezoid) (pDst, traps, 0, 0); - } - else if (maskFormat) - { - PicturePtr pPicture; - BoxRec bounds; - INT16 xDst, yDst; - INT16 xRel, yRel; - - xDst = traps[0].left.p1.x >> 16; - yDst = traps[0].left.p1.y >> 16; - - miTrapezoidBounds (ntrap, traps, &bounds); - if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2) - return; - pPicture = miCreateAlphaPicture (pScreen, pDst, maskFormat, - bounds.x2 - bounds.x1, - bounds.y2 - bounds.y1); - if (!pPicture) - return; - for (; ntrap; ntrap--, traps++) - (*ps->RasterizeTrapezoid) (pPicture, traps, - -bounds.x1, -bounds.y1); - xRel = bounds.x1 + xSrc - xDst; - yRel = bounds.y1 + ySrc - yDst; - CompositePicture (op, pSrc, pPicture, pDst, - xRel, yRel, 0, 0, bounds.x1, bounds.y1, - bounds.x2 - bounds.x1, - bounds.y2 - bounds.y1); - FreePicture (pPicture, 0); - } - else - { - if (pDst->polyEdge == PolyEdgeSharp) - maskFormat = PictureMatchFormat (pScreen, 1, PICT_a1); - else - maskFormat = PictureMatchFormat (pScreen, 8, PICT_a8); - for (; ntrap; ntrap--, traps++) - miTrapezoids (op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, traps); - } -}