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

sna: Use the correct storage for box_from_seg 

Fixes regression from 3aa98289e3 with clipped segments. As we clipped
the empty box rather than the segment, we never drew any outlines.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2012-05-14 12:08:09 +01:00
parent b654b8794d
commit 053bd5bf24
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/sna/sna_accel.c
View File

@ -6918,7 +6918,7 @@ sna_poly_segment_blt(DrawablePtr drawable,
nbox = ARRAY_SIZE(boxes);
n -= nbox;
do {
box_from_seg(b, seg, gc);
box_from_seg(b, seg++, gc);
if (b->y2 > b->y1 && b->x2 > b->x1) {
b->x1 += dx;
b->x2 += dx;
@ -6926,7 +6926,6 @@ sna_poly_segment_blt(DrawablePtr drawable,
b->y2 += dy;
b++;
}
seg++;
} while (--nbox);
if (b != boxes) {
@ -6943,10 +6942,7 @@ sna_poly_segment_blt(DrawablePtr drawable,
nbox = ARRAY_SIZE(boxes);
n -= nbox;
do {
box_from_seg(b, seg, gc);
if (b->y2 > b->y1 && b->x2 > b->x1)
b++;
seg++;
box_from_seg(b++, seg++, gc);
} while (--nbox);
if (b != boxes) {
@ -6972,7 +6968,7 @@ sna_poly_segment_blt(DrawablePtr drawable,
do {
BoxRec box;
box_from_seg(b, seg, gc);
box_from_seg(&box, seg++, gc);
box.x1 += drawable->x;
box.x2 += drawable->x;
box.y1 += drawable->y;
@ -6998,12 +6994,10 @@ sna_poly_segment_blt(DrawablePtr drawable,
}
}
}
seg++;
} while (--n);
} else {
do {
box_from_seg(b, seg, gc);
box_from_seg(b, seg++, gc);
b->x1 += drawable->x;
b->x2 += drawable->x;
b->y1 += drawable->y;
@ -7020,8 +7014,6 @@ sna_poly_segment_blt(DrawablePtr drawable,
b = boxes;
}
}
seg++;
} while (--n);
}
RegionUninit(&clip);

2
src/sna/sna_trapezoids.c
View File

@ -2475,7 +2475,7 @@ trapezoids_fallback(CARD8 op, PicturePtr src, PicturePtr dst,
depth = maskFormat->depth;
if (depth == 1) {
format = PIXMAN_a1;
} else if (depth < 8) {
} else if (depth <= 4) {
format = PIXMAN_a4;
depth = 4;
} else