From 3ad3a2d839f8e2f5b02f883e2b4131d4c0901fb0 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 4 Oct 2012 15:14:08 +0100 Subject: [PATCH] sna/gen2: Tidy DBG code for disabling composite operations Signed-off-by: Chris Wilson --- src/sna/gen2_render.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/sna/gen2_render.c b/src/sna/gen2_render.c index b6b259ee..60853485 100644 --- a/src/sna/gen2_render.c +++ b/src/sna/gen2_render.c @@ -1769,17 +1769,6 @@ 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, true); -#endif - /* Try to use the BLT engine unless it implies a * 3D -> 2D context switch. */ @@ -3196,7 +3185,9 @@ bool gen2_render_init(struct sna *sna) /* Use the BLT (and overlay) for everything except when forced to * use the texture combiners. */ +#if !NO_COMPOSITE render->composite = gen2_render_composite; +#endif #if !NO_COMPOSITE_SPANS render->check_composite_spans = gen2_check_composite_spans; render->composite_spans = gen2_render_composite_spans;