summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-09-13 19:53:29 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2012-09-13 19:53:29 +0100
commit5781de2e5ab0d7e8e62965bda714789879555ed4 (patch)
tree8bd2a122e6c5b01325e185e0f1e6efb9281bc8a3
parentdd1432b2c00c94ac75af4740b66b5cd1a573e261 (diff)
downloadxorg-driver-xf86-video-intel-5781de2e5ab0d7e8e62965bda714789879555ed4.tar.gz
sna/gen3: Tidy NO_COMPOSITE debugging
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/gen3_render.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c
index c5ec9bcb..60e197e0 100644
--- a/src/sna/gen3_render.c
+++ b/src/sna/gen3_render.c
@@ -2811,17 +2811,6 @@ gen3_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.
*/
@@ -4688,7 +4677,9 @@ bool gen3_render_init(struct sna *sna)
{
struct sna_render *render = &sna->render;
+#if !NO_COMPOSITE
render->composite = gen3_render_composite;
+#endif
#if !NO_COMPOSITE_SPANS
render->check_composite_spans = gen3_check_composite_spans;
render->composite_spans = gen3_render_composite_spans;