frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement fbAddTriangles() in terms of pixman_add_triangles() 

This allows the remaining triangle-to-trap conversion code to be
deleted.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Søren Sandmann <ssp@redhat.com>
This commit is contained in:
Søren Sandmann Pedersen 2011-02-11 09:00:10 -05:00 committed by Søren Sandmann Pedersen
parent 566f1931ee
commit 7dff79e395
1 changed files with 9 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
fb/fbtrap.c
View File

@ -65,32 +65,6 @@ fbRasterizeTrapezoid (PicturePtr pPicture,
free_pixman_pict (pPicture, image); free_pixman_pict (pPicture, image);
} }
static int
_GreaterY (xPointFixed *a, xPointFixed *b)
{
if (a->y == b->y)
return a->x > b->x;
return a->y > b->y;
}
/*
* Note that the definition of this function is a bit odd because
* of the X coordinate space (y increasing downwards).
*/
static int
_Clockwise (xPointFixed *ref, xPointFixed *a, xPointFixed *b)
{
xPointFixed ad, bd;
ad.x = a->x - ref->x;
ad.y = a->y - ref->y;
bd.x = b->x - ref->x;
bd.y = b->y - ref->y;
return ((xFixed_32_32) bd.y * ad.x - (xFixed_32_32) ad.y * bd.x) < 0;
}
/* FIXME -- this could be made more efficient */
void void
fbAddTriangles (PicturePtr pPicture, fbAddTriangles (PicturePtr pPicture,
INT16 x_off, INT16 x_off,
@ -98,63 +72,16 @@ fbAddTriangles (PicturePtr pPicture,
int ntri, int ntri,
xTriangle *tris) xTriangle *tris)
{ {
xPointFixed *top, *left, *right, *tmp; int image_xoff, image_yoff;
xTrapezoid trap; pixman_image_t *image =
image_from_pict (pPicture, FALSE, &image_xoff, &image_yoff);
for (; ntri; ntri--, tris++) if (!image)
{ return;
top = &tris->p1;
left = &tris->p2; pixman_add_triangles (image, x_off, y_off, ntri, (pixman_triangle_t *)tris);
right = &tris->p3;
if (_GreaterY (top, left)) { free_pixman_pict (pPicture, image);
tmp = left; left = top; top = tmp;
}
if (_GreaterY (top, right)) {
tmp = right; right = top; top = tmp;
}
if (_Clockwise (top, right, left)) {
tmp = right; right = left; left = tmp;
}
/*
* Two cases:
*
* + +
* / \ / \
* / \ / \
* / + + \
* / -- -- \
* / -- -- \
* / --- --- \
* +-- --+
*/
trap.top = top->y;
trap.left.p1 = *top;
trap.left.p2 = *left;
trap.right.p1 = *top;
trap.right.p2 = *right;
if (right->y < left->y)
trap.bottom = right->y;
else
trap.bottom = left->y;
fbRasterizeTrapezoid (pPicture, &trap, x_off, y_off);
if (right->y < left->y)
{
trap.top = right->y;
trap.bottom = left->y;
trap.right.p1 = *right;
trap.right.p2 = *left;
}
else
{
trap.top = left->y;
trap.bottom = right->y;
trap.left.p1 = *left;
trap.left.p2 = *right;
}
fbRasterizeTrapezoid (pPicture, &trap, x_off, y_off);
}
} }
typedef void (* CompositeShapesFunc) (pixman_op_t op, typedef void (* CompositeShapesFunc) (pixman_op_t op,