xf86-video-intel: src/sna/sna_blt.c

[Chris Wilson]

 src/sna/sna_blt.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit b6917eced7b2a96ec2432eac924a526e94371643
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Apr 9 20:45:29 2016 +0100

    sna: Restict reduction of ADD white when we have compatibile formats
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_blt.c b/src/sna/sna_blt.c
index d7441ad..8b1bee1 100644
--- a/src/sna/sna_blt.c
+++ b/src/sna/sna_blt.c
@@ -2647,7 +2647,9 @@ nop:
 		}
 		if (op == PictOpOver && is_opaque_solid(src))
 			op = PictOpSrc;
-		if (op == PictOpAdd && is_white(src))
+		if (op == PictOpAdd &&
+		    PICT_FORMAT_RGB(src->format) == PICT_FORMAT_RGB(dst->format) &&
+		    is_white(src))
 			op = PictOpSrc;
 		if (was_clear && (op == PictOpAdd || op == PictOpOver)) {
 			if (sna_pixmap(tmp->dst.pixmap)->clear_color == 0)