sna: Subtract the Solid RenderFillRectangles from CPU damage

... and so avoid having to move it the GPU, as seen in the wild. It
looks like I will actually need to handle mixed Render/Core operations
on the frontbuffer.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

1 files changed, 10 insertions, 0 deletions

diff --git a/src/sna/sna_composite.c b/src/sna/sna_composite.c
index 27b1ff3c..1640309e 100644
--- a/src/sna/sna_composite.c
+++ b/src/sna/sna_composite.c
@@ -639,6 +639,16 @@ sna_composite_rectangles(CARD8		 op,
 		goto fallback;
 	}
 
+	/* If we going to be overwriting any CPU damage with a subsequent
+	 * operation, then we may as well delete it without moving it
+	 * first to the GPU.
+	 */
+	if (op == PictOpSrc || op == PictOpClear) {
+		priv = sna_pixmap_attach(pixmap);
+		if (priv && !priv->gpu_only)
+			sna_damage_subtract(&priv->cpu_damage, &region);
+	}
+
 	priv = sna_pixmap_move_to_gpu(pixmap);
 	if (priv == NULL) {
 		DBG(("%s: fallback due to no GPU bo\n", __FUNCTION__));