diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2014-06-18 20:55:02 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-06-18 20:55:02 +0100 |
| commit | 51a0559b120dd0a57a938b300bccefbf1142e495 (patch) | |
| tree | badfe01677b0c7e8f914768da26362cebcba0f78 /src | |
| parent | 377b0e8657aab13dc90134853a03feb95f515567 (diff) | |
sna: Do not treat both src/dst having no clones as being the same
Fixes regression from
commit 62aaf2ff4f8597067cf387865707baa00ed9a123
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed Jun 18 18:41:15 2014 +0100
sna: Skip redundant copies when already cloned
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src')
| -rw-r--r-- | src/sna/sna_accel.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index c021652a..80d67873 100644 --- a/src/sna/sna_accel.c +++ b/src/sna/sna_accel.c @@ -6120,7 +6120,9 @@ sna_copy_boxes(DrawablePtr src, DrawablePtr dst, GCPtr gc, goto fallback; } - if (src_priv && COW(src_priv->cow) == COW(dst_priv->cow) && alu == GXcopy) { + if (alu == GXcopy && + src_priv && src_priv->cow && + COW(src_priv->cow) == COW(dst_priv->cow)) { if ((dx | dy) == 0) { DBG(("%s: ignoring cow for no op\n", __FUNCTION__)); |