Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna/trapezoids: Amalgamate adjacent lines 

If we have two scanlines with identical extents and coverage, we can
amalgamate them into a set of multi-row boxes. For simplicity, we only
compare with the last box (assuming that the majority of such cases are
"rounded-rectangles" where we have a large vertical area with no
variation and can coalesce into a single box). This operates as a second
pass to the scanline converter itself coalescing pure-vertical regions.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2015-02-04 10:41:11 +00:00
parent db629a3834
commit d7bcb7bcbf
2 changed files with 58 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/sna/sna_trapezoids_imprecise.c
View File

@ -1722,7 +1722,21 @@ span_thread_box(struct sna *sna,
const BoxRec *box,
int coverage)
{
struct span_thread_boxes *b = (struct span_thread_boxes *)op;
__DBG(("%s: %d -> %d @ %d\n", __FUNCTION__, box->x1, box->x2, coverage));
if (b->num_boxes) {
struct sna_opacity_box *bb = &b->boxes[b->num_boxes-1];
if (bb->box.x1 == box->x1 &&
bb->box.x2 == box->x2 &&
bb->box.y2 == box->y1 &&
bb->alpha == AREA_TO_ALPHA(coverage)) {
bb->box.y2 = box->y2;
__DBG(("%s: contracted double row: %d -> %d\n", __func__, bb->box.y1, bb->box.y2));
return;
}
}
span_thread_add_boxes(sna, op, box, 1, AREA_TO_ALPHA(coverage));
}
@ -1741,11 +1755,26 @@ span_thread_clipped_box(struct sna *sna,
pixman_region_init_rects(&region, box, 1);
RegionIntersect(&region, &region, clip);
if (region_num_rects(&region)) {
struct span_thread_boxes *b = (struct span_thread_boxes *)op;
if (region.data == NULL && b->num_boxes) {
struct sna_opacity_box *bb = &b->boxes[b->num_boxes-1];
if (bb->box.x1 == region.extents.x1 &&
bb->box.x2 == region.extents.x2 &&
bb->box.y2 == region.extents.y1 &&
bb->alpha == AREA_TO_ALPHA(coverage)) {
bb->box.y2 = region.extents.y2;
__DBG(("%s: contracted double row: %d -> %d\n", __func__, bb->box.y1, bb->box.y2));
goto out;
}
}
span_thread_add_boxes(sna, op,
region_rects(&region),
region_num_rects(&region),
AREA_TO_ALPHA(coverage));
}
out:
pixman_region_fini(&region);
}

29
src/sna/sna_trapezoids_precise.c
View File

@ -1670,7 +1670,21 @@ span_thread_box(struct sna *sna,
const BoxRec *box,
int coverage)
{
struct span_thread_boxes *b = (struct span_thread_boxes *)op;
__DBG(("%s: %d -> %d @ %d\n", __FUNCTION__, box->x1, box->x2, coverage));
if (b->num_boxes) {
struct sna_opacity_box *bb = &b->boxes[b->num_boxes-1];
if (bb->box.x1 == box->x1 &&
bb->box.x2 == box->x2 &&
bb->box.y2 == box->y1 &&
bb->alpha == AREA_TO_FLOAT(coverage)) {
bb->box.y2 = box->y2;
__DBG(("%s: contracted double row: %d -> %d\n", __func__, bb->box.y1, bb->box.y2));
return;
}
}
span_thread_add_boxes(sna, op, box, 1, AREA_TO_FLOAT(coverage));
}
@ -1689,11 +1703,26 @@ span_thread_clipped_box(struct sna *sna,
pixman_region_init_rects(&region, box, 1);
RegionIntersect(&region, &region, clip);
if (region_num_rects(&region)) {
struct span_thread_boxes *b = (struct span_thread_boxes *)op;
if (region.data == NULL && b->num_boxes) {
struct sna_opacity_box *bb = &b->boxes[b->num_boxes-1];
if (bb->box.x1 == region.extents.x1 &&
bb->box.x2 == region.extents.x2 &&
bb->box.y2 == region.extents.y1 &&
bb->alpha == AREA_TO_FLOAT(coverage)) {
bb->box.y2 = region.extents.y2;
__DBG(("%s: contracted double row: %d -> %d\n", __func__, bb->box.y1, bb->box.y2));
goto out;
}
}
span_thread_add_boxes(sna, op,
region_rects(&region),
region_num_rects(&region),
AREA_TO_FLOAT(coverage));
}
out:
pixman_region_fini(&region);
}