diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-08-11 10:21:39 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-08-11 11:12:33 +0100 |
| commit | 64488010504a6e76008bb3b3c1e61caeb025913c (patch) | |
| tree | 15866ec78f776b1f1e280c2067aa0ab627a2f610 /src/sna/gen3_render.c | |
| parent | f464d508c870293699616626d64bd64f16051467 (diff) | |
sna/gen2-5: Substitute an equivalent BLT composite operation
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/gen3_render.c')
| -rw-r--r-- | src/sna/gen3_render.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c index 18c5d852..ce71d82f 100644 --- a/src/sna/gen3_render.c +++ b/src/sna/gen3_render.c @@ -2832,14 +2832,6 @@ gen3_render_composite(struct sna *sna, return false; } - if (mask == NULL && sna->kgem.mode != KGEM_RENDER && - sna_blt_composite(sna, op, - src, dst, - src_x, src_y, - dst_x, dst_y, - width, height, tmp)) - return true; - sna_render_reduce_damage(tmp, dst_x, dst_y, width, height); tmp->op = op; @@ -2866,6 +2858,14 @@ gen3_render_composite(struct sna *sna, tmp->src.u.gen3.type = SHADER_ZERO; break; case 1: + if (mask == NULL && + sna_blt_composite__convert(sna, + src_x, src_y, + width, height, + dst_x, dst_y, + tmp)) + return true; + gen3_composite_channel_convert(&tmp->src); break; } |