diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2014-09-24 08:05:01 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-09-24 08:10:07 +0100 |
| commit | 911a0ad8d0520554dc55883997dd59dc3f5f9139 (patch) | |
| tree | e0fccb6f241e8fee566e3f9aefd880a7cde235d1 /src/sna/sna_trapezoids_imprecise.c | |
| parent | dbe6d105a60ff28419b549d439bbb29f50b28f08 (diff) | |
sna/trapezoids: Flesh out alternate rasterisers for tristrips
And undo the accidental commit of
commit 4e00cbe35d1a409a02ee27d991213d9a0807e500
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon Sep 22 08:54:57 2014 +0100
traps
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/sna_trapezoids_imprecise.c')
| -rw-r--r-- | src/sna/sna_trapezoids_imprecise.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/src/sna/sna_trapezoids_imprecise.c b/src/sna/sna_trapezoids_imprecise.c index 8bb54265..82306651 100644 --- a/src/sna/sna_trapezoids_imprecise.c +++ b/src/sna/sna_trapezoids_imprecise.c @@ -42,7 +42,7 @@ #undef SAMPLES_X #undef SAMPLES_Y -#if 1 +#if 0 #define __DBG DBG #else #define __DBG(x) @@ -633,6 +633,7 @@ polygon_add_line(struct polygon *polygon, unsigned ix = EDGE_Y_BUCKET_INDEX(e->ytop, polygon->ymin); polygon->y_buckets[ix] = prev->next; + polygon->num_edges--; return; } } @@ -1940,7 +1941,7 @@ imprecise_trapezoid_span_converter(struct sna *sna, dy *= FAST_SAMPLES_Y; num_threads = 1; - if (!NO_GPU_THREADS && 0 && + if (!NO_GPU_THREADS && (flags & COMPOSITE_SPANS_RECTILINEAR) == 0 && tmp.thread_boxes && thread_choose_span(&tmp, dst, maskFormat, &clip)) @@ -3876,10 +3877,10 @@ tristrip_thread(void *arg) } bool -tristrip_span_converter(struct sna *sna, - CARD8 op, PicturePtr src, PicturePtr dst, - PictFormatPtr maskFormat, INT16 src_x, INT16 src_y, - int count, xPointFixed *points) +imprecise_tristrip_span_converter(struct sna *sna, + CARD8 op, PicturePtr src, PicturePtr dst, + PictFormatPtr maskFormat, INT16 src_x, INT16 src_y, + int count, xPointFixed *points) { struct sna_composite_spans_op tmp; BoxRec extents; @@ -3888,16 +3889,6 @@ tristrip_span_converter(struct sna *sna, int dx, dy, num_threads; bool was_clear; - if (NO_SCAN_CONVERTER) - return false; - - /* XXX strict adherence to the Render specification */ - if (is_precise(dst, maskFormat)) { - DBG(("%s: fallback -- precise rasterisation requested\n", - __FUNCTION__)); - return false; - } - if (!sna->render.check_composite_spans(sna, op, src, dst, 0, 0, 0)) { DBG(("%s: fallback -- composite spans not supported\n", __FUNCTION__)); |