xf86-video-intel: 2 commits - src/sna/sna_accel.c
Chris Wilson
ickle at kemper.freedesktop.org
Mon Feb 20 04:53:28 PST 2012
src/sna/sna_accel.c | 83 ++++++++++++++++------------------------------------
1 file changed, 27 insertions(+), 56 deletions(-)
New commits:
commit bbb6794a3b97b1fcf72c8712ab0ec591683b128b
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Feb 20 12:25:31 2012 +0000
sna: Trim clipped lines to end within bounds
References: https://bugs.freedesktop.org/show_bug.cgi?id=46261
References: https://bugs.freedesktop.org/show_bug.cgi?id=45673
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 2088019..ab44cf3 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -5425,8 +5425,7 @@ sna_poly_zero_line_blt(DrawablePtr drawable,
PixmapPtr pixmap = get_drawable_pixmap(drawable);
struct sna *sna = to_sna_from_pixmap(pixmap);
- int x2, y2, xstart, ystart;
- int oc2, pt2_clipped = 0;
+ int x2, y2, xstart, ystart, oc2;
unsigned int bias = miGetZeroLineBias(drawable->pScreen);
bool degenerate = true;
struct sna_fill_op fill;
@@ -5471,9 +5470,7 @@ sna_poly_zero_line_blt(DrawablePtr drawable,
x2 = xstart;
y2 = ystart;
oc2 = 0;
- MIOUTCODES(oc2, x2, y2,
- extents->x1, extents->y1,
- extents->x2, extents->y2);
+ OUTCODES(oc2, x2, y2, extents);
while (--n) {
int16_t sdx, sdy;
@@ -5504,9 +5501,7 @@ sna_poly_zero_line_blt(DrawablePtr drawable,
degenerate = false;
oc2 = 0;
- MIOUTCODES(oc2, x2, y2,
- extents->x1, extents->y1,
- extents->x2, extents->y2);
+ OUTCODES(oc2, x2, y2, extents);
if (oc1 & oc2)
continue;
@@ -5554,13 +5549,12 @@ rectangle_continue:
x = x1;
y = y1;
- pt2_clipped = 0;
if (oc1 | oc2) {
- int pt1_clipped;
+ int pt1_clipped, pt2_clipped;
if (miZeroClipLine(extents->x1, extents->y1,
- extents->x2, extents->y2,
+ extents->x2-1, extents->y2-1,
&x, &y, &x2_clipped, &y2_clipped,
adx, ady,
&pt1_clipped, &pt2_clipped,
@@ -5568,12 +5562,6 @@ rectangle_continue:
continue;
length = abs(x2_clipped - x);
-
- /* if we've clipped the endpoint, always draw the full length
- * of the segment, because then the capstyle doesn't matter
- */
- if (pt2_clipped)
- length++;
if (length == 0)
continue;
@@ -5636,13 +5624,12 @@ X_continue2:
x = x1;
y = y1;
- pt2_clipped = 0;
if (oc1 | oc2) {
- int pt1_clipped;
+ int pt1_clipped, pt2_clipped;
if (miZeroClipLine(extents->x1, extents->y1,
- extents->x2, extents->y2,
+ extents->x2-1, extents->y2-1,
&x, &y, &x2_clipped, &y2_clipped,
adx, ady,
&pt1_clipped, &pt2_clipped,
@@ -5650,12 +5637,6 @@ X_continue2:
continue;
length = abs(y2_clipped - y);
-
- /* if we've clipped the endpoint, always draw the full length
- * of the segment, because then the capstyle doesn't matter
- */
- if (pt2_clipped)
- length++;
if (length == 0)
continue;
@@ -6807,17 +6788,9 @@ sna_poly_zero_segment_blt(DrawablePtr drawable,
continue;
oc1 = 0;
- MIOUTCODES(oc1, x1, y1,
- extents->x1,
- extents->y1,
- extents->x2,
- extents->y2);
+ OUTCODES(oc1, x1, y1, extents);
oc2 = 0;
- MIOUTCODES(oc2, x2, y2,
- extents->x1,
- extents->y1,
- extents->x2,
- extents->y2);
+ OUTCODES(oc2, x2, y2, extents);
if (oc1 & oc2)
continue;
@@ -6865,10 +6838,8 @@ rectangle_continue:
int pt1_clipped, pt2_clipped;
int x = x1, y = y1;
- if (miZeroClipLine(extents->x1,
- extents->y1,
- extents->x2,
- extents->y2,
+ if (miZeroClipLine(extents->x1, extents->y1,
+ extents->x2-1, extents->y2-1,
&x1, &y1, &x2, &y2,
adx, ady,
&pt1_clipped, &pt2_clipped,
@@ -6937,10 +6908,8 @@ X_continue2:
int pt1_clipped, pt2_clipped;
int x = x1, y = y1;
- if (miZeroClipLine(extents->x1,
- extents->y1,
- extents->x2,
- extents->y2,
+ if (miZeroClipLine(extents->x1, extents->y1,
+ extents->x2-1, extents->y2-1,
&x1, &y1, &x2, &y2,
adx, ady,
&pt1_clipped, &pt2_clipped,
commit 805bc3310cd0a13eab8e48e7615bdd42638cfa33
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Feb 20 12:09:19 2012 +0000
sna: When reversing line-drawing direction, use the clipped endpoint
Make sure we take the clipping into account if we choose to reverse the
draw direction (to maintain left-to-right inside the box emission).
References: https://bugs.freedesktop.org/show_bug.cgi?id=46261
References: https://bugs.freedesktop.org/show_bug.cgi?id=45673
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 23fc9ad..2088019 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -5451,11 +5451,11 @@ sna_poly_zero_line_blt(DrawablePtr drawable,
}
jump = _jump[(damage != NULL) | !!(dx|dy) << 1];
- DBG(("%s: [clipped] extents=(%d, %d), (%d, %d), delta=(%d, %d)\n",
- __FUNCTION__,
+ DBG(("%s: [clipped=%x] extents=(%d, %d), (%d, %d), delta=(%d, %d), damage=%p\n",
+ __FUNCTION__, clipped,
clip.extents.x1, clip.extents.y1,
clip.extents.x2, clip.extents.y2,
- dx, dy));
+ dx, dy, damage));
extents = REGION_RECTS(&clip);
last_extents = extents + REGION_NUM_RECTS(&clip);
@@ -5514,7 +5514,7 @@ sna_poly_zero_line_blt(DrawablePtr drawable,
adx, ady, sdx, sdy,
1, 1, octant);
- DBG(("%s: adx=(%d, %d), sdx=(%d, %d), oc1=%d, oc2=%d\n",
+ DBG(("%s: adx=(%d, %d), sdx=(%d, %d), oc1=%x, oc2=%x\n",
__FUNCTION__, adx, ady, sdx, sdy, oc1, oc2));
if (adx == 0 || ady == 0) {
if (x1 <= x2) {
@@ -5542,11 +5542,13 @@ rectangle_continue:
b = box;
}
} else if (adx >= ady) {
+ int x2_clipped = x2, y2_clipped = y2;
+
/* X-major segment */
e1 = ady << 1;
e2 = e1 - (adx << 1);
e = e1 - adx;
- length = adx; /* don't draw endpoint in main loop */
+ length = adx;
FIXUP_ERROR(e, octant, bias);
@@ -5555,7 +5557,6 @@ rectangle_continue:
pt2_clipped = 0;
if (oc1 | oc2) {
- int x2_clipped = x2, y2_clipped = y2;
int pt1_clipped;
if (miZeroClipLine(extents->x1, extents->y1,
@@ -5587,8 +5588,8 @@ rectangle_continue:
e = e - e1;
if (sdx < 0) {
- x = x2;
- y = y2;
+ x = x2_clipped;
+ y = y2_clipped;
sdy = -sdy;
}
@@ -5622,11 +5623,13 @@ X_continue2:
b = box;
}
} else {
+ int x2_clipped = x2, y2_clipped = y2;
+
/* Y-major segment */
e1 = adx << 1;
e2 = e1 - (ady << 1);
e = e1 - ady;
- length = ady; /* don't draw endpoint in main loop */
+ length = ady;
SetYMajorOctant(octant);
FIXUP_ERROR(e, octant, bias);
@@ -5636,7 +5639,6 @@ X_continue2:
pt2_clipped = 0;
if (oc1 | oc2) {
- int x2_clipped = x2, y2_clipped = y2;
int pt1_clipped;
if (miZeroClipLine(extents->x1, extents->y1,
@@ -5668,8 +5670,8 @@ X_continue2:
e = e - e1;
if (sdx < 0) {
- x = x2;
- y = y2;
+ x = x2_clipped;
+ y = y2_clipped;
sdy = -sdy;
}
More information about the xorg-commit
mailing list