diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-10-04 18:37:01 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-10-05 18:52:56 +0100 |
| commit | c98b770a87a5ec5ed9dc0aa375ad173b0e98322e (patch) | |
| tree | be457f634828fc06077e3476c048c9e9e80f5821 /src/sna/sna_trapezoids.c | |
| parent | 27ad2fc1dcb2a6177eda7f1319b4f4eccdbea140 (diff) | |
sna/trapezoids: Add a precise scan converter
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/sna_trapezoids.c')
| -rw-r--r-- | src/sna/sna_trapezoids.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/sna/sna_trapezoids.c b/src/sna/sna_trapezoids.c index a50d205a..5f6e82db 100644 --- a/src/sna/sna_trapezoids.c +++ b/src/sna/sna_trapezoids.c @@ -70,7 +70,7 @@ line_x_for_y(const xLineFixed *l, xFixed y, bool ceil) return l->p1.x + (xFixed) (ex / d); } -void trapezoids_bounds(int n, const xTrapezoid *t, BoxPtr box) +bool trapezoids_bounds(int n, const xTrapezoid *t, BoxPtr box) { xFixed x1, y1, x2, y2; @@ -134,6 +134,8 @@ void trapezoids_bounds(int n, const xTrapezoid *t, BoxPtr box) box->x2 = pixman_fixed_to_int(x2); box->y1 = pixman_fixed_integer_floor(y1); box->y2 = pixman_fixed_integer_ceil(y2); + + return box->x2 > box->x1 && box->y2 > box->y1; } static bool @@ -461,11 +463,8 @@ trapezoid_spans_maybe_inplace(struct sna *sna, if (NO_SCAN_CONVERTER) return false; - if (dst->polyMode == PolyModePrecise && !is_mono(dst, maskFormat)) - return false; if (dst->alphaMap) return false; - if (is_mono(dst, maskFormat)) goto out; @@ -601,12 +600,12 @@ sna_composite_trapezoids(CARD8 op, } } else if (dst->polyMode != PolyModePrecise) { for (n = 0; n < ntrap && rectilinear; n++) { - int lx1 = pixman_fixed_to_grid(traps[n].left.p1.x); - int lx2 = pixman_fixed_to_grid(traps[n].left.p2.x); - int rx1 = pixman_fixed_to_grid(traps[n].right.p1.x); - int rx2 = pixman_fixed_to_grid(traps[n].right.p2.x); - int top = pixman_fixed_to_grid(traps[n].top); - int bot = pixman_fixed_to_grid(traps[n].bottom); + int lx1 = pixman_fixed_to_fast(traps[n].left.p1.x); + int lx2 = pixman_fixed_to_fast(traps[n].left.p2.x); + int rx1 = pixman_fixed_to_fast(traps[n].right.p1.x); + int rx2 = pixman_fixed_to_fast(traps[n].right.p2.x); + int top = pixman_fixed_to_fast(traps[n].top); + int bot = pixman_fixed_to_fast(traps[n].bottom); rectilinear &= lx1 == lx2 && rx1 == rx2; pixel_aligned &= ((top | bot | lx1 | lx2 | rx1 | rx2) & FAST_SAMPLES_mask) == 0; |