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

[Chris Wilson]

 src/sna/gen2_render.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

New commits:
commit 7ad2d3b695115439f685a12d43ab240cf5e18ef7
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Nov 25 09:44:21 2011 +0000

    sna/gen2: Wire up NO_COMPOSITE for debugging
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/gen2_render.c b/src/sna/gen2_render.c
index 98a02cb..e97e2d7 100644
--- a/src/sna/gen2_render.c
+++ b/src/sna/gen2_render.c
@@ -1258,6 +1258,17 @@ gen2_render_composite(struct sna *sna,
 		return FALSE;
 	}
 
+#if NO_COMPOSITE
+	if (mask)
+		return FALSE;
+
+	return sna_blt_composite(sna, op,
+				 src, dst,
+				 src_x, src_y,
+				 dst_x, dst_y,
+				 width, height, tmp);
+#endif
+
 	/* Try to use the BLT engine unless it implies a
 	 * 3D -> 2D context switch.
 	 */