diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-09-30 12:38:19 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-09-30 12:38:19 +0100 |
| commit | aad53e37a7e6c842ae688df74a06024315e07ba2 (patch) | |
| tree | 609225595af701352365294d55cad428feb145a1 /src | |
| parent | 2c06e9576aa62290a133cea5158bb979284ac8a8 (diff) | |
sna/gen3: Tidy up fallback handling from fill-boxes
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src')
| -rw-r--r-- | src/sna/gen3_render.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c index 4c058e1a..ebe108de 100644 --- a/src/sna/gen3_render.c +++ b/src/sna/gen3_render.c @@ -3160,9 +3160,9 @@ gen3_composite_set_target(struct sna *sna, } else sna_render_picture_extents(dst, &box); - op->dst.bo = sna_drawable_use_bo (dst->pDrawable, - PREFER_GPU | FORCE_GPU | RENDER_GPU, - &box, &op->damage); + op->dst.bo = sna_drawable_use_bo(dst->pDrawable, + PREFER_GPU | FORCE_GPU | RENDER_GPU, + &box, &op->damage); if (op->dst.bo == NULL) return false; @@ -3493,7 +3493,7 @@ gen3_render_composite(struct sna *sna, return true; if (gen3_composite_fallback(sna, op, src, mask, dst)) - return false; + goto fallback; if (need_tiling(sna, width, height)) return sna_tiling_composite(op, src, mask, dst, @@ -3517,7 +3517,7 @@ gen3_render_composite(struct sna *sna, if (!sna_render_composite_redirect(sna, tmp, dst_x, dst_y, width, height, op > PictOpSrc || dst->pCompositeClip->data)) - return false; + goto fallback; } tmp->u.gen3.num_constants = 0; @@ -3819,7 +3819,14 @@ cleanup_src: cleanup_dst: if (tmp->redirect.real_bo) kgem_bo_destroy(&sna->kgem, tmp->dst.bo); - return false; +fallback: + return (mask == NULL && + sna_blt_composite(sna, + op, src, dst, + src_x, src_y, + dst_x, dst_y, + width, height, + tmp, true)); } static void @@ -5910,7 +5917,7 @@ gen3_render_fill_boxes(struct sna *sna, return false; } } - DBG(("%s: using shader for op=%d, format=%x, pixel=%x\n", + DBG(("%s: using shader for op=%d, format=%08x, pixel=%08x\n", __FUNCTION__, op, (int)format, pixel)); tmp.op = op; |