summaryrefslogtreecommitdiff
path: root/src/sna
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-06-18 11:36:53 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2012-06-18 11:36:53 +0100
commita936466dd41c4bb8b0956c4da5a5838f991b332a (patch)
tree73f18531b11fc7b5820a34e11fcbb0e22b6af734 /src/sna
parent4b325d6e2b99ec3f63a7c5175f6f4746f6773550 (diff)
sna: Prefer to attempt a Composite operation rather than use pixman composite
As pixman composite performance is atrocious for anything other than solids, prefer to upload the mask and attempt a composite operation on the GPU unless we are forcing the fallback. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna')
-rw-r--r--src/sna/sna_trapezoids.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/sna/sna_trapezoids.c b/src/sna/sna_trapezoids.c
index 9da9aae2..cb9fd7c0 100644
--- a/src/sna/sna_trapezoids.c
+++ b/src/sna/sna_trapezoids.c
@@ -3412,12 +3412,8 @@ composite_unaligned_boxes_inplace(CARD8 op,
PicturePtr dst, int n, xTrapezoid *t,
bool force_fallback)
{
- if (!force_fallback &&
- (is_gpu(dst->pDrawable) ||
- (src->pDrawable && is_gpu(src->pDrawable)))) {
- DBG(("%s: fallback -- can not perform operation in place, destination busy\n",
- __FUNCTION__));
-
+ if (!force_fallback) {
+ DBG(("%s: fallback -- not forcing\n", __FUNCTION__));
return false;
}