summaryrefslogtreecommitdiff
path: root/src/sna/gen2_render.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-08-11 10:21:39 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2012-08-11 11:12:33 +0100
commit64488010504a6e76008bb3b3c1e61caeb025913c (patch)
tree15866ec78f776b1f1e280c2067aa0ab627a2f610 /src/sna/gen2_render.c
parentf464d508c870293699616626d64bd64f16051467 (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/gen2_render.c')
-rw-r--r--src/sna/gen2_render.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/sna/gen2_render.c b/src/sna/gen2_render.c
index b65454d8..431b972f 100644
--- a/src/sna/gen2_render.c
+++ b/src/sna/gen2_render.c
@@ -1755,14 +1755,6 @@ gen2_render_composite(struct sna *sna,
return false;
}
- if (mask == NULL && sna->kgem.mode == KGEM_BLT &&
- 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;
@@ -1783,6 +1775,13 @@ gen2_render_composite(struct sna *sna,
case 0:
gen2_composite_solid_init(sna, &tmp->src, 0);
case 1:
+ if (mask == NULL &&
+ sna_blt_composite__convert(sna,
+ src_x, src_y,
+ width, height,
+ dst_x, dst_y,
+ tmp))
+ return true;
break;
}