diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2014-10-01 10:25:16 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-10-01 10:28:51 +0100 |
| commit | c6d9303303a5ccb3ec6d072c510c09d6576cb398 (patch) | |
| tree | 75e2d63bf23e73ecdb63cac2b2109e83c8d7fa54 | |
| parent | bca08dc4155c0ee304c60340ccf95fe7b03ac11b (diff) | |
sna/trapezoids: Consistently use NO_GPU_THREADS to disable threading for DBG
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/sna_trapezoids_precise.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/sna/sna_trapezoids_precise.c b/src/sna/sna_trapezoids_precise.c index b237666e..85efb2a4 100644 --- a/src/sna/sna_trapezoids_precise.c +++ b/src/sna/sna_trapezoids_precise.c @@ -2077,7 +2077,8 @@ precise_trapezoid_mask_converter(CARD8 op, PicturePtr src, PicturePtr dst, __FUNCTION__, scratch->devPrivate.ptr, scratch->devKind)); num_threads = 1; - if ((flags & COMPOSITE_SPANS_RECTILINEAR) == 0) + if (!NO_GPU_THREADS && + (flags & COMPOSITE_SPANS_RECTILINEAR) == 0) num_threads = sna_use_threads(extents.x2 - extents.x1, extents.y2 - extents.y1, 4); @@ -2693,7 +2694,9 @@ trapezoid_span_inplace__x8r8g8b8(CARD8 op, dy = dst->pDrawable->y * SAMPLES_Y; num_threads = 1; - if ((flags & COMPOSITE_SPANS_RECTILINEAR) == 0 && (lerp || is_solid)) + if (!NO_GPU_THREADS && + (flags & COMPOSITE_SPANS_RECTILINEAR) == 0 && + (lerp || is_solid)) num_threads = sna_use_threads(4*(region.extents.x2 - region.extents.x1), region.extents.y2 - region.extents.y1, 4); @@ -3048,7 +3051,8 @@ precise_trapezoid_span_inplace(struct sna *sna, inplace.opacity = color >> 24; num_threads = 1; - if ((flags & COMPOSITE_SPANS_RECTILINEAR) == 0) + if (!NO_GPU_THREADS && + (flags & COMPOSITE_SPANS_RECTILINEAR) == 0) num_threads = sna_use_threads(region.extents.x2 - region.extents.x1, region.extents.y2 - region.extents.y1, 4); @@ -3190,7 +3194,8 @@ precise_trapezoid_span_fallback(CARD8 op, PicturePtr src, PicturePtr dst, __FUNCTION__, scratch->devPrivate.ptr, scratch->devKind)); num_threads = 1; - if ((flags & COMPOSITE_SPANS_RECTILINEAR) == 0) + if (!NO_GPU_THREADS && + (flags & COMPOSITE_SPANS_RECTILINEAR) == 0) num_threads = sna_use_threads(extents.x2 - extents.x1, extents.y2 - extents.y1, 4); @@ -3442,7 +3447,7 @@ precise_tristrip_span_converter(struct sna *sna, dy *= SAMPLES_Y; num_threads = 1; - if (!NO_GPU_THREADS && 0 && + if (!NO_GPU_THREADS && tmp.thread_boxes && thread_choose_span(&tmp, dst, maskFormat, &clip)) num_threads = sna_use_threads(extents.x2 - extents.x1, |