test: Use the test-traps as the reference images for xlib/xcb

The test-traps provides a reference implementation of the
traps-compositor as used by xlib, so we can use it to generate the
reference images as well. (Of course checking that test-traps is itself
correct and only differs in the renderer! ;-)

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

1 files changed, 778 insertions, 1 deletions

diff --git a/test/Makefile.refs b/test/Makefile.refs
index 312ed8ab..a0135b6f 100644
--- a/test/Makefile.refs
+++ b/test/Makefile.refs
@@ -6,73 +6,111 @@ REFERENCE_IMAGES = \
 	reference/a1-bug.image16.ref.png \
 	reference/a1-bug.quartz.xfail.png \
 	reference/a1-bug.ref.png \
+	reference/a1-bug.traps.argb32.ref.png \
+	reference/a1-bug.traps.rgb24.ref.png \
 	reference/a1-bug.xlib.ref.png \
 	reference/a1-clip-fill-equal.base.argb32.ref.png \
 	reference/a1-clip-fill-equal.base.rgb24.ref.png \
 	reference/a1-clip-fill-equal.ref.png \
+	reference/a1-clip-fill-equal.traps.argb32.ref.png \
+	reference/a1-clip-fill-equal.traps.rgb24.ref.png \
 	reference/a1-clip-fill-rule.argb32.ref.png \
 	reference/a1-clip-fill-rule.base.argb32.ref.png \
 	reference/a1-clip-fill-rule.base.rgb24.ref.png \
 	reference/a1-clip-fill-rule.rgb24.ref.png \
+	reference/a1-clip-fill-rule.traps.argb32.ref.png \
+	reference/a1-clip-fill-rule.traps.rgb24.ref.png \
 	reference/a1-clip-fill.base.argb32.ref.png \
 	reference/a1-clip-fill.base.rgb24.ref.png \
 	reference/a1-clip-fill.ref.png \
+	reference/a1-clip-fill.traps.argb32.ref.png \
+	reference/a1-clip-fill.traps.rgb24.ref.png \
 	reference/a1-clip-paint.base.argb32.ref.png \
 	reference/a1-clip-paint.base.rgb24.ref.png \
 	reference/a1-clip-paint.ref.png \
+	reference/a1-clip-paint.traps.argb32.ref.png \
+	reference/a1-clip-paint.traps.rgb24.ref.png \
 	reference/a1-clip-stroke.base.argb32.ref.png \
 	reference/a1-clip-stroke.base.rgb24.ref.png \
 	reference/a1-clip-stroke.ref.png \
+	reference/a1-clip-stroke.traps.argb32.ref.png \
+	reference/a1-clip-stroke.traps.rgb24.ref.png \
 	reference/a1-image-sample.base.argb32.ref.png \
 	reference/a1-image-sample.base.rgb24.ref.png \
 	reference/a1-image-sample.gl.xfail.png \
 	reference/a1-image-sample.ref.png \
+	reference/a1-image-sample.traps.argb32.ref.png \
+	reference/a1-image-sample.traps.rgb24.ref.png \
 	reference/a1-line-width.base.argb32.ref.png \
 	reference/a1-line-width.base.rgb24.ref.png \
 	reference/a1-line-width.pdf.ref.png \
 	reference/a1-line-width.ps.ref.png \
 	reference/a1-line-width.ref.png \
+	reference/a1-line-width.traps.argb32.ref.png \
+	reference/a1-line-width.traps.rgb24.ref.png \
 	reference/a1-mask-sample.base.argb32.ref.png \
 	reference/a1-mask-sample.base.rgb24.ref.png \
 	reference/a1-mask-sample.ref.png \
+	reference/a1-mask-sample.traps.argb32.ref.png \
+	reference/a1-mask-sample.traps.rgb24.ref.png \
 	reference/a1-mask.base.argb32.ref.png \
 	reference/a1-mask.base.rgb24.ref.png \
 	reference/a1-mask.pdf.ref.png \
 	reference/a1-mask.ps.ref.png \
 	reference/a1-mask.ref.png \
+	reference/a1-mask.traps.argb32.ref.png \
+	reference/a1-mask.traps.rgb24.ref.png \
 	reference/a1-rasterisation-rectangles.base.argb32.ref.png \
 	reference/a1-rasterisation-rectangles.base.rgb24.ref.png \
 	reference/a1-rasterisation-rectangles.quartz.xfail.png \
 	reference/a1-rasterisation-rectangles.ref.png \
+	reference/a1-rasterisation-rectangles.traps.argb32.ref.png \
+	reference/a1-rasterisation-rectangles.traps.rgb24.ref.png \
 	reference/a1-rasterisation-triangles.base.argb32.ref.png \
 	reference/a1-rasterisation-triangles.base.rgb24.ref.png \
 	reference/a1-rasterisation-triangles.quartz.xfail.png \
 	reference/a1-rasterisation-triangles.ref.png \
+	reference/a1-rasterisation-triangles.traps.argb32.ref.png \
+	reference/a1-rasterisation-triangles.traps.rgb24.ref.png \
 	reference/a1-rectilinear-grid.base.argb32.ref.png \
 	reference/a1-rectilinear-grid.base.rgb24.ref.png \
 	reference/a1-rectilinear-grid.ref.png \
+	reference/a1-rectilinear-grid.traps.argb32.ref.png \
+	reference/a1-rectilinear-grid.traps.rgb24.ref.png \
 	reference/a1-sample.base.argb32.ref.png \
 	reference/a1-sample.base.rgb24.ref.png \
 	reference/a1-sample.ref.png \
+	reference/a1-sample.traps.argb32.ref.png \
+	reference/a1-sample.traps.rgb24.ref.png \
 	reference/a1-tiger.base.argb32.ref.png \
 	reference/a1-tiger.base.rgb24.ref.png \
 	reference/a1-tiger.ref.png \
+	reference/a1-tiger.traps.argb32.ref.png \
+	reference/a1-tiger.traps.rgb24.ref.png \
 	reference/a1-traps-sample.base.argb32.ref.png \
 	reference/a1-traps-sample.base.rgb24.ref.png \
 	reference/a1-traps-sample.quartz.xfail.png \
 	reference/a1-traps-sample.ref.png \
+	reference/a1-traps-sample.traps.argb32.ref.png \
+	reference/a1-traps-sample.traps.rgb24.ref.png \
 	reference/a8-clear.base.argb32.ref.png \
 	reference/a8-clear.base.rgb24.ref.png \
 	reference/a8-clear.quartz.ref.png \
 	reference/a8-clear.ref.png \
+	reference/a8-clear.traps.argb32.ref.png \
+	reference/a8-clear.traps.rgb24.ref.png \
 	reference/a8-mask.base.argb32.ref.png \
 	reference/a8-mask.base.rgb24.ref.png \
 	reference/a8-mask.ref.png \
+	reference/a8-mask.traps.argb32.ref.png \
+	reference/a8-mask.traps.rgb24.ref.png \
 	reference/aliasing.base.argb32.ref.png \
 	reference/aliasing.base.rgb24.ref.png \
 	reference/aliasing.image16.ref.png \
 	reference/aliasing.quartz.ref.png \
 	reference/aliasing.ref.png \
+	reference/aliasing.traps.argb32.ref.png \
+	reference/aliasing.traps.rgb24.ref.png \
 	reference/aliasing.xlib.ref.png \
 	reference/alpha-similar.base.argb32.ref.png \
 	reference/alpha-similar.base.rgb24.ref.png \
@@ -86,68 +124,100 @@ REFERENCE_IMAGES = \
 	reference/alpha-similar.rgb24.ref.png \
 	reference/alpha-similar.svg.argb32.xfail.png \
 	reference/alpha-similar.svg.rgb24.xfail.png \
+	reference/alpha-similar.traps.argb32.ref.png \
+	reference/alpha-similar.traps.rgb24.ref.png \
 	reference/api-special-cases.base.argb32.ref.png \
 	reference/api-special-cases.base.rgb24.ref.png \
 	reference/api-special-cases.ref.png \
+	reference/api-special-cases.traps.argb32.ref.png \
+	reference/api-special-cases.traps.rgb24.ref.png \
 	reference/arc-infinite-loop.base.argb32.ref.png \
 	reference/arc-infinite-loop.base.rgb24.ref.png \
 	reference/arc-infinite-loop.ref.png \
+	reference/arc-infinite-loop.traps.argb32.ref.png \
+	reference/arc-infinite-loop.traps.rgb24.ref.png \
 	reference/arc-looping-dash.base.argb32.ref.png \
 	reference/arc-looping-dash.base.rgb24.ref.png \
 	reference/arc-looping-dash.image16.ref.png \
 	reference/arc-looping-dash.ps.ref.png \
 	reference/arc-looping-dash.quartz.ref.png \
 	reference/arc-looping-dash.ref.png \
+	reference/arc-looping-dash.traps.argb32.ref.png \
+	reference/arc-looping-dash.traps.rgb24.ref.png \
 	reference/big-empty-box.argb32.ref.png \
 	reference/big-empty-box.base.argb32.ref.png \
 	reference/big-empty-box.base.rgb24.ref.png \
 	reference/big-empty-box.rgb24.ref.png \
+	reference/big-empty-box.traps.argb32.ref.png \
+	reference/big-empty-box.traps.rgb24.ref.png \
 	reference/big-empty-triangle.argb32.ref.png \
 	reference/big-empty-triangle.base.argb32.ref.png \
 	reference/big-empty-triangle.base.rgb24.ref.png \
 	reference/big-empty-triangle.rgb24.ref.png \
+	reference/big-empty-triangle.traps.argb32.ref.png \
+	reference/big-empty-triangle.traps.rgb24.ref.png \
 	reference/big-line.base.argb32.ref.png \
 	reference/big-line.base.rgb24.ref.png \
 	reference/big-line.image16.ref.png \
 	reference/big-line.ps.ref.png \
 	reference/big-line.quartz.ref.png \
 	reference/big-line.ref.png \
+	reference/big-line.traps.argb32.ref.png \
+	reference/big-line.traps.rgb24.ref.png \
 	reference/big-line.xlib.ref.png \
 	reference/big-little-box.argb32.ref.png \
 	reference/big-little-box.base.argb32.ref.png \
 	reference/big-little-box.base.rgb24.ref.png \
 	reference/big-little-box.rgb24.ref.png \
+	reference/big-little-box.traps.argb32.ref.png \
+	reference/big-little-box.traps.rgb24.ref.png \
 	reference/big-little-triangle.argb32.ref.png \
 	reference/big-little-triangle.base.argb32.ref.png \
 	reference/big-little-triangle.base.rgb24.ref.png \
 	reference/big-little-triangle.rgb24.ref.png \
+	reference/big-little-triangle.traps.argb32.ref.png \
+	reference/big-little-triangle.traps.rgb24.ref.png \
 	reference/big-trap.base.argb32.ref.png \
 	reference/big-trap.base.rgb24.ref.png \
+	reference/big-trap.traps.argb32.ref.png \
+	reference/big-trap.traps.rgb24.ref.png \
 	reference/bilevel-image.base.argb32.ref.png \
 	reference/bilevel-image.base.rgb24.ref.png \
 	reference/bilevel-image.ref.png \
+	reference/bilevel-image.traps.argb32.ref.png \
+	reference/bilevel-image.traps.rgb24.ref.png \
 	reference/bitmap-font.base.argb32.ref.png \
 	reference/bitmap-font.base.rgb24.ref.png \
 	reference/bitmap-font.ref.png \
 	reference/bitmap-font.rgb24.ref.png \
+	reference/bitmap-font.traps.argb32.ref.png \
+	reference/bitmap-font.traps.rgb24.ref.png \
 	reference/bug-40410.base.argb32.ref.png \
 	reference/bug-40410.base.rgb24.ref.png \
 	reference/bug-40410.ref.png \
+	reference/bug-40410.traps.argb32.ref.png \
+	reference/bug-40410.traps.rgb24.ref.png \
 	reference/bug-bo-rectangular.base.argb32.ref.png \
 	reference/bug-bo-rectangular.base.rgb24.ref.png \
 	reference/bug-bo-rectangular.image16.ref.png \
 	reference/bug-bo-rectangular.ps.xfail.png \
 	reference/bug-bo-rectangular.ref.png \
+	reference/bug-bo-rectangular.traps.argb32.ref.png \
+	reference/bug-bo-rectangular.traps.rgb24.ref.png \
 	reference/bug-extents.base.argb32.ref.png \
 	reference/bug-extents.base.rgb24.ref.png \
 	reference/bug-extents.image16.ref.png \
 	reference/bug-extents.ps.ref.png \
 	reference/bug-extents.quartz.ref.png \
 	reference/bug-extents.ref.png \
+	reference/bug-extents.traps.argb32.ref.png \
+	reference/bug-extents.traps.rgb24.ref.png \
 	reference/bug-extents.xlib.ref.png \
 	reference/bug-seams.base.argb32.ref.png \
 	reference/bug-seams.base.rgb24.ref.png \
 	reference/bug-seams.ref.png \
+	reference/bug-seams.traps.argb32.ref.png \
+	reference/bug-seams.traps.rgb24.ref.png \
 	reference/bug-seams.xlib-fallback.ref.png \
 	reference/bug-seams.xlib.ref.png \
 	reference/caps-joins-alpha.base.argb32.ref.png \
@@ -155,6 +225,8 @@ REFERENCE_IMAGES = \
 	reference/caps-joins-alpha.image16.ref.png \
 	reference/caps-joins-alpha.quartz.ref.png \
 	reference/caps-joins-alpha.ref.png \
+	reference/caps-joins-alpha.traps.argb32.ref.png \
+	reference/caps-joins-alpha.traps.rgb24.ref.png \
 	reference/caps-joins-alpha.xlib.ref.png \
 	reference/caps-joins-curve.base.argb32.ref.png \
 	reference/caps-joins-curve.base.rgb24.ref.png \
@@ -162,35 +234,49 @@ REFERENCE_IMAGES = \
 	reference/caps-joins-curve.ps.ref.png \
 	reference/caps-joins-curve.quartz.ref.png \
 	reference/caps-joins-curve.ref.png \
+	reference/caps-joins-curve.traps.argb32.ref.png \
+	reference/caps-joins-curve.traps.rgb24.ref.png \
 	reference/caps-joins-curve.xlib.ref.png \
 	reference/caps-joins.base.argb32.ref.png \
 	reference/caps-joins.base.rgb24.ref.png \
 	reference/caps-joins.image16.ref.png \
 	reference/caps-joins.ps.ref.png \
 	reference/caps-joins.ref.png \
+	reference/caps-joins.traps.argb32.ref.png \
+	reference/caps-joins.traps.rgb24.ref.png \
 	reference/caps-sub-paths.base.argb32.ref.png \
 	reference/caps-sub-paths.base.rgb24.ref.png \
 	reference/caps-sub-paths.image16.ref.png \
 	reference/caps-sub-paths.ps.ref.png \
 	reference/caps-sub-paths.ref.png \
+	reference/caps-sub-paths.traps.argb32.ref.png \
+	reference/caps-sub-paths.traps.rgb24.ref.png \
 	reference/caps-tails-curve.base.argb32.ref.png \
 	reference/caps-tails-curve.base.rgb24.ref.png \
 	reference/caps-tails-curve.ps.ref.png \
 	reference/caps-tails-curve.ref.png \
+	reference/caps-tails-curve.traps.argb32.ref.png \
+	reference/caps-tails-curve.traps.rgb24.ref.png \
 	reference/caps.base.argb32.ref.png \
 	reference/caps.base.rgb24.ref.png \
 	reference/caps.image16.ref.png \
 	reference/caps.ps.ref.png \
 	reference/caps.ref.png \
+	reference/caps.traps.argb32.ref.png \
+	reference/caps.traps.rgb24.ref.png \
 	reference/checkerboard.base.argb32.ref.png \
 	reference/checkerboard.base.rgb24.ref.png \
 	reference/checkerboard.ref.png \
+	reference/checkerboard.traps.argb32.ref.png \
+	reference/checkerboard.traps.rgb24.ref.png \
 	reference/clear-source.base.argb32.ref.png \
 	reference/clear-source.base.rgb24.ref.png \
 	reference/clear-source.image16.ref.png \
 	reference/clear-source.pdf.xfail.png \
 	reference/clear-source.ps.xfail.png \
 	reference/clear-source.ref.png \
+	reference/clear-source.traps.argb32.ref.png \
+	reference/clear-source.traps.rgb24.ref.png \
 	reference/clear.argb32.ref.png \
 	reference/clear.base.argb32.ref.png \
 	reference/clear.base.rgb24.ref.png \
@@ -201,41 +287,63 @@ REFERENCE_IMAGES = \
 	reference/clear.rgb24.ref.png \
 	reference/clear.svg12.argb32.xfail.png \
 	reference/clear.svg12.rgb24.xfail.png \
+	reference/clear.traps.argb32.ref.png \
+	reference/clear.traps.rgb24.ref.png \
 	reference/clip-all.base.argb32.ref.png \
 	reference/clip-all.base.rgb24.ref.png \
 	reference/clip-all.ref.png \
+	reference/clip-all.traps.argb32.ref.png \
+	reference/clip-all.traps.rgb24.ref.png \
 	reference/clip-complex-shape-eo-aa.base.argb32.ref.png \
 	reference/clip-complex-shape-eo-aa.base.rgb24.ref.png \
 	reference/clip-complex-shape-eo-aa.ref.png \
+	reference/clip-complex-shape-eo-aa.traps.argb32.ref.png \
+	reference/clip-complex-shape-eo-aa.traps.rgb24.ref.png \
 	reference/clip-complex-shape-eo-mono.base.argb32.ref.png \
 	reference/clip-complex-shape-eo-mono.base.rgb24.ref.png \
 	reference/clip-complex-shape-eo-mono.ref.png \
+	reference/clip-complex-shape-eo-mono.traps.argb32.ref.png \
+	reference/clip-complex-shape-eo-mono.traps.rgb24.ref.png \
 	reference/clip-contexts.base.argb32.ref.png \
 	reference/clip-contexts.base.rgb24.ref.png \
 	reference/clip-contexts.ref.png \
+	reference/clip-contexts.traps.argb32.ref.png \
+	reference/clip-contexts.traps.rgb24.ref.png \
 	reference/clip-device-offset.argb32.ref.png \
 	reference/clip-device-offset.base.argb32.ref.png \
 	reference/clip-device-offset.base.rgb24.ref.png \
 	reference/clip-device-offset.rgb24.ref.png \
+	reference/clip-device-offset.traps.argb32.ref.png \
+	reference/clip-device-offset.traps.rgb24.ref.png \
 	reference/clip-disjoint-hatching.base.argb32.ref.png \
 	reference/clip-disjoint-hatching.base.rgb24.ref.png \
 	reference/clip-disjoint-hatching.ref.png \
+	reference/clip-disjoint-hatching.traps.argb32.ref.png \
+	reference/clip-disjoint-hatching.traps.rgb24.ref.png \
 	reference/clip-disjoint.base.argb32.ref.png \
 	reference/clip-disjoint.base.rgb24.ref.png \
 	reference/clip-disjoint.image16.ref.png \
 	reference/clip-disjoint.ps.ref.png \
 	reference/clip-disjoint.quartz.ref.png \
 	reference/clip-disjoint.ref.png \
+	reference/clip-disjoint.traps.argb32.ref.png \
+	reference/clip-disjoint.traps.rgb24.ref.png \
 	reference/clip-disjoint.xlib.ref.png \
 	reference/clip-empty-group.base.argb32.ref.png \
 	reference/clip-empty-group.base.rgb24.ref.png \
 	reference/clip-empty-group.ref.png \
+	reference/clip-empty-group.traps.argb32.ref.png \
+	reference/clip-empty-group.traps.rgb24.ref.png \
 	reference/clip-empty-save.base.argb32.ref.png \
 	reference/clip-empty-save.base.rgb24.ref.png \
 	reference/clip-empty-save.ref.png \
+	reference/clip-empty-save.traps.argb32.ref.png \
+	reference/clip-empty-save.traps.rgb24.ref.png \
 	reference/clip-empty.base.argb32.ref.png \
 	reference/clip-empty.base.rgb24.ref.png \
 	reference/clip-empty.ref.png \
+	reference/clip-empty.traps.argb32.ref.png \
+	reference/clip-empty.traps.rgb24.ref.png \
 	reference/clip-fill-eo-unbounded.argb32.ref.png \
 	reference/clip-fill-eo-unbounded.base.argb32.ref.png \
 	reference/clip-fill-eo-unbounded.base.rgb24.ref.png \
@@ -244,6 +352,7 @@ REFERENCE_IMAGES = \
 	reference/clip-fill-eo-unbounded.quartz.rgb24.ref.png \
 	reference/clip-fill-eo-unbounded.rgb24.ref.png \
 	reference/clip-fill-eo-unbounded.svg12.rgb24.xfail.png \
+	reference/clip-fill-eo-unbounded.traps.argb32.ref.png \
 	reference/clip-fill-eo-unbounded.xlib-fallback.rgb24.ref.png \
 	reference/clip-fill-eo-unbounded.xlib.argb32.ref.png \
 	reference/clip-fill-eo-unbounded.xlib.rgb24.ref.png \
@@ -251,6 +360,8 @@ REFERENCE_IMAGES = \
 	reference/clip-fill-no-op.base.rgb24.ref.png \
 	reference/clip-fill-no-op.image16.ref.png \
 	reference/clip-fill-no-op.ref.png \
+	reference/clip-fill-no-op.traps.argb32.ref.png \
+	reference/clip-fill-no-op.traps.rgb24.ref.png \
 	reference/clip-fill-nz-unbounded.argb32.ref.png \
 	reference/clip-fill-nz-unbounded.base.argb32.ref.png \
 	reference/clip-fill-nz-unbounded.base.rgb24.ref.png \
@@ -259,6 +370,7 @@ REFERENCE_IMAGES = \
 	reference/clip-fill-nz-unbounded.quartz.rgb24.ref.png \
 	reference/clip-fill-nz-unbounded.rgb24.ref.png \
 	reference/clip-fill-nz-unbounded.svg12.rgb24.xfail.png \
+	reference/clip-fill-nz-unbounded.traps.argb32.ref.png \
 	reference/clip-fill-nz-unbounded.xlib-fallback.rgb24.ref.png \
 	reference/clip-fill-nz-unbounded.xlib.argb32.ref.png \
 	reference/clip-fill-nz-unbounded.xlib.rgb24.ref.png \
@@ -266,6 +378,8 @@ REFERENCE_IMAGES = \
 	reference/clip-fill-rule-pixel-aligned.base.rgb24.ref.png \
 	reference/clip-fill-rule-pixel-aligned.ref.png \
 	reference/clip-fill-rule-pixel-aligned.rgb24.ref.png \
+	reference/clip-fill-rule-pixel-aligned.traps.argb32.ref.png \
+	reference/clip-fill-rule-pixel-aligned.traps.rgb24.ref.png \
 	reference/clip-fill-rule.argb32.ref.png \
 	reference/clip-fill-rule.base.argb32.ref.png \
 	reference/clip-fill-rule.base.rgb24.ref.png \
@@ -276,6 +390,8 @@ REFERENCE_IMAGES = \
 	reference/clip-fill-rule.quartz.rgb24.ref.png \
 	reference/clip-fill-rule.rgb24.ref.png \
 	reference/clip-fill-rule.test-paginated.rgb24.ref.png \
+	reference/clip-fill-rule.traps.argb32.ref.png \
+	reference/clip-fill-rule.traps.rgb24.ref.png \
 	reference/clip-fill-rule.xlib.rgb24.ref.png \
 	reference/clip-fill.base.argb32.ref.png \
 	reference/clip-fill.base.rgb24.ref.png \
@@ -283,32 +399,46 @@ REFERENCE_IMAGES = \
 	reference/clip-fill.ps.xfail.png \
 	reference/clip-fill.quartz.ref.png \
 	reference/clip-fill.ref.png \
+	reference/clip-fill.traps.argb32.ref.png \
+	reference/clip-fill.traps.rgb24.ref.png \
 	reference/clip-fill.xlib-fallback.ref.png \
 	reference/clip-fill.xlib.ref.png \
 	reference/clip-group-shapes-aligned-rectangles.base.argb32.ref.png \
 	reference/clip-group-shapes-aligned-rectangles.base.rgb24.ref.png \
 	reference/clip-group-shapes-aligned-rectangles.ref.png \
+	reference/clip-group-shapes-aligned-rectangles.traps.argb32.ref.png \
+	reference/clip-group-shapes-aligned-rectangles.traps.rgb24.ref.png \
 	reference/clip-group-shapes-circles.base.argb32.ref.png \
 	reference/clip-group-shapes-circles.base.rgb24.ref.png \
 	reference/clip-group-shapes-circles.ps.ref.png \
 	reference/clip-group-shapes-circles.quartz.ref.png \
 	reference/clip-group-shapes-circles.ref.png \
+	reference/clip-group-shapes-circles.traps.argb32.ref.png \
+	reference/clip-group-shapes-circles.traps.rgb24.ref.png \
 	reference/clip-group-shapes-circles.xlib.ref.png \
 	reference/clip-group-shapes-unaligned-rectangles.base.argb32.ref.png \
 	reference/clip-group-shapes-unaligned-rectangles.base.rgb24.ref.png \
 	reference/clip-group-shapes-unaligned-rectangles.ref.png \
+	reference/clip-group-shapes-unaligned-rectangles.traps.argb32.ref.png \
+	reference/clip-group-shapes-unaligned-rectangles.traps.rgb24.ref.png \
 	reference/clip-group-shapes-unaligned-rectangles.xlib.ref.png \
 	reference/clip-image.base.argb32.ref.png \
 	reference/clip-image.base.rgb24.ref.png \
 	reference/clip-image.image16.ref.png \
 	reference/clip-image.ps.ref.png \
 	reference/clip-image.ref.png \
+	reference/clip-image.traps.argb32.ref.png \
+	reference/clip-image.traps.rgb24.ref.png \
 	reference/clip-intersect.base.argb32.ref.png \
 	reference/clip-intersect.base.rgb24.ref.png \
 	reference/clip-intersect.ref.png \
+	reference/clip-intersect.traps.argb32.ref.png \
+	reference/clip-intersect.traps.rgb24.ref.png \
 	reference/clip-mixed-antialias.base.argb32.ref.png \
 	reference/clip-mixed-antialias.base.rgb24.ref.png \
 	reference/clip-mixed-antialias.ref.png \
+	reference/clip-mixed-antialias.traps.argb32.ref.png \
+	reference/clip-mixed-antialias.traps.rgb24.ref.png \
 	reference/clip-nesting.argb32.ref.png \
 	reference/clip-nesting.base.argb32.ref.png \
 	reference/clip-nesting.base.rgb24.ref.png \
@@ -319,6 +449,8 @@ REFERENCE_IMAGES = \
 	reference/clip-nesting.quartz.rgb24.ref.png \
 	reference/clip-nesting.rgb24.ref.png \
 	reference/clip-nesting.test-paginated.rgb24.ref.png \
+	reference/clip-nesting.traps.argb32.ref.png \
+	reference/clip-nesting.traps.rgb24.ref.png \
 	reference/clip-nesting.xlib.rgb24.ref.png \
 	reference/clip-operator.argb32.ref.png \
 	reference/clip-operator.base.argb32.ref.png \
@@ -337,6 +469,7 @@ REFERENCE_IMAGES = \
 	reference/clip-operator.svg12.argb32.xfail.png \
 	reference/clip-operator.svg12.rgb24.xfail.png \
 	reference/clip-operator.test-paginated.argb32.ref.png \
+	reference/clip-operator.traps.argb32.ref.png \
 	reference/clip-operator.xlib-fallback.ref.png \
 	reference/clip-operator.xlib.ref.png \
 	reference/clip-operator.xlib.rgb24.ref.png \
@@ -348,22 +481,30 @@ REFERENCE_IMAGES = \
 	reference/clip-push-group.quartz.ref.png \
 	reference/clip-push-group.ref.png \
 	reference/clip-push-group.svg.ref.png \
+	reference/clip-push-group.traps.argb32.ref.png \
+	reference/clip-push-group.traps.rgb24.ref.png \
 	reference/clip-push-group.xlib.ref.png \
 	reference/clip-rotate-image-surface-paint.base.argb32.ref.png \
 	reference/clip-rotate-image-surface-paint.base.rgb24.ref.png \
 	reference/clip-rotate-image-surface-paint.ref.png \
+	reference/clip-rotate-image-surface-paint.traps.argb32.ref.png \
+	reference/clip-rotate-image-surface-paint.traps.rgb24.ref.png \
 	reference/clip-shape.base.argb32.ref.png \
 	reference/clip-shape.base.rgb24.ref.png \
 	reference/clip-shape.image16.ref.png \
 	reference/clip-shape.ps.ref.png \
 	reference/clip-shape.quartz.ref.png \
 	reference/clip-shape.ref.png \
+	reference/clip-shape.traps.argb32.ref.png \
+	reference/clip-shape.traps.rgb24.ref.png \
 	reference/clip-shape.xlib-fallback.ref.png \
 	reference/clip-shape.xlib.ref.png \
 	reference/clip-stroke-no-op.base.argb32.ref.png \
 	reference/clip-stroke-no-op.base.rgb24.ref.png \
 	reference/clip-stroke-no-op.image16.ref.png \
 	reference/clip-stroke-no-op.ref.png \
+	reference/clip-stroke-no-op.traps.argb32.ref.png \
+	reference/clip-stroke-no-op.traps.rgb24.ref.png \
 	reference/clip-stroke-unbounded.argb32.ref.png \
 	reference/clip-stroke-unbounded.base.argb32.ref.png \
 	reference/clip-stroke-unbounded.base.rgb24.ref.png \
@@ -372,6 +513,7 @@ REFERENCE_IMAGES = \
 	reference/clip-stroke-unbounded.quartz.rgb24.ref.png \
 	reference/clip-stroke-unbounded.rgb24.ref.png \
 	reference/clip-stroke-unbounded.svg12.rgb24.xfail.png \
+	reference/clip-stroke-unbounded.traps.argb32.ref.png \
 	reference/clip-stroke-unbounded.xlib-fallback.rgb24.ref.png \
 	reference/clip-stroke-unbounded.xlib.argb32.ref.png \
 	reference/clip-stroke-unbounded.xlib.rgb24.ref.png \
@@ -381,6 +523,8 @@ REFERENCE_IMAGES = \
 	reference/clip-stroke.ps.xfail.png \
 	reference/clip-stroke.quartz.ref.png \
 	reference/clip-stroke.ref.png \
+	reference/clip-stroke.traps.argb32.ref.png \
+	reference/clip-stroke.traps.rgb24.ref.png \
 	reference/clip-stroke.xlib-fallback.ref.png \
 	reference/clip-stroke.xlib.ref.png \
 	reference/clip-text.base.argb32.ref.png \
@@ -390,10 +534,14 @@ REFERENCE_IMAGES = \
 	reference/clip-text.quartz.ref.png \
 	reference/clip-text.ref.png \
 	reference/clip-text.svg.ref.png \
+	reference/clip-text.traps.argb32.ref.png \
+	reference/clip-text.traps.rgb24.ref.png \
 	reference/clip-text.xlib.ref.png \
 	reference/clip-twice-rectangle.base.argb32.ref.png \
 	reference/clip-twice-rectangle.base.rgb24.ref.png \
 	reference/clip-twice-rectangle.ref.png \
+	reference/clip-twice-rectangle.traps.argb32.ref.png \
+	reference/clip-twice-rectangle.traps.rgb24.ref.png \
 	reference/clip-twice.argb32.ref.png \
 	reference/clip-twice.base.argb32.ref.png \
 	reference/clip-twice.base.rgb24.ref.png \
@@ -406,6 +554,8 @@ REFERENCE_IMAGES = \
 	reference/clip-twice.rgb24.ref.png \
 	reference/clip-twice.test-paginated.argb32.ref.png \
 	reference/clip-twice.test-paginated.rgb24.ref.png \
+	reference/clip-twice.traps.argb32.ref.png \
+	reference/clip-twice.traps.rgb24.ref.png \
 	reference/clip-twice.xlib.ref.png \
 	reference/clip-twice.xlib.rgb24.ref.png \
 	reference/clip-unbounded.base.argb32.ref.png \
@@ -415,6 +565,8 @@ REFERENCE_IMAGES = \
 	reference/clip-unbounded.ref.png \
 	reference/clip-unbounded.rgb24.ref.png \
 	reference/clip-unbounded.svg12.rgb24.xfail.png \
+	reference/clip-unbounded.traps.argb32.ref.png \
+	reference/clip-unbounded.traps.rgb24.ref.png \
 	reference/clipped-group.base.argb32.ref.png \
 	reference/clipped-group.base.rgb24.ref.png \
 	reference/clipped-group.image16.ref.png \
@@ -424,34 +576,46 @@ REFERENCE_IMAGES = \
 	reference/clipped-group.quartz.ref.png \
 	reference/clipped-group.ref.png \
 	reference/clipped-group.svg.ref.png \
+	reference/clipped-group.traps.argb32.ref.png \
+	reference/clipped-group.traps.rgb24.ref.png \
 	reference/clipped-group.xlib-fallback.ref.png \
 	reference/clipped-group.xlib.ref.png \
 	reference/clipped-surface.base.argb32.ref.png \
 	reference/clipped-surface.base.rgb24.ref.png \
 	reference/clipped-surface.image16.ref.png \
 	reference/clipped-surface.ref.png \
+	reference/clipped-surface.traps.argb32.ref.png \
+	reference/clipped-surface.traps.rgb24.ref.png \
 	reference/clipped-trapezoids.ref.png \
 	reference/close-path-current-point.base.argb32.ref.png \
 	reference/close-path-current-point.base.rgb24.ref.png \
 	reference/close-path-current-point.image16.ref.png \
 	reference/close-path-current-point.ps.ref.png \
 	reference/close-path-current-point.ref.png \
+	reference/close-path-current-point.traps.argb32.ref.png \
+	reference/close-path-current-point.traps.rgb24.ref.png \
 	reference/close-path.base.argb32.ref.png \
 	reference/close-path.base.rgb24.ref.png \
 	reference/close-path.ps2.ref.png \
 	reference/close-path.ps3.ref.png \
 	reference/close-path.ref.png \
+	reference/close-path.traps.argb32.ref.png \
+	reference/close-path.traps.rgb24.ref.png \
 	reference/composite-integer-translate-over-repeat.base.argb32.ref.png \
 	reference/composite-integer-translate-over-repeat.base.rgb24.ref.png \
 	reference/composite-integer-translate-over-repeat.ps2.ref.png \
 	reference/composite-integer-translate-over-repeat.ps3.ref.png \
 	reference/composite-integer-translate-over-repeat.ref.png \
+	reference/composite-integer-translate-over-repeat.traps.argb32.ref.png \
+	reference/composite-integer-translate-over-repeat.traps.rgb24.ref.png \
 	reference/composite-integer-translate-over.base.argb32.ref.png \
 	reference/composite-integer-translate-over.base.rgb24.ref.png \
 	reference/composite-integer-translate-over.image16.ref.png \
 	reference/composite-integer-translate-over.ps2.ref.png \
 	reference/composite-integer-translate-over.ps3.ref.png \
 	reference/composite-integer-translate-over.ref.png \
+	reference/composite-integer-translate-over.traps.argb32.ref.png \
+	reference/composite-integer-translate-over.traps.rgb24.ref.png \
 	reference/composite-integer-translate-source.base.argb32.ref.png \
 	reference/composite-integer-translate-source.base.rgb24.ref.png \
 	reference/composite-integer-translate-source.image16.ref.png \
@@ -460,11 +624,15 @@ REFERENCE_IMAGES = \
 	reference/composite-integer-translate-source.ref.png \
 	reference/composite-integer-translate-source.svg12.argb32.xfail.png \
 	reference/composite-integer-translate-source.svg12.rgb24.xfail.png \
+	reference/composite-integer-translate-source.traps.argb32.ref.png \
+	reference/composite-integer-translate-source.traps.rgb24.ref.png \
 	reference/copy-path.base.argb32.ref.png \
 	reference/copy-path.base.rgb24.ref.png \
 	reference/copy-path.image16.ref.png \
 	reference/copy-path.ps.ref.png \
 	reference/copy-path.ref.png \
+	reference/copy-path.traps.argb32.ref.png \
+	reference/copy-path.traps.rgb24.ref.png \
 	reference/coverage-column-triangles.ref.png \
 	reference/coverage-column-triangles.xlib.xfail.png \
 	reference/coverage-intersecting-quads.ref.png \
@@ -480,6 +648,8 @@ REFERENCE_IMAGES = \
 	reference/create-from-png-stream.base.argb32.ref.png \
 	reference/create-from-png-stream.base.rgb24.ref.png \
 	reference/create-from-png-stream.ref.png \
+	reference/create-from-png-stream.traps.argb32.ref.png \
+	reference/create-from-png-stream.traps.rgb24.ref.png \
 	reference/create-from-png.alpha.ref.png \
 	reference/create-from-png.base.argb32.ref.png \
 	reference/create-from-png.base.rgb24.ref.png \
@@ -494,16 +664,22 @@ REFERENCE_IMAGES = \
 	reference/culled-glyphs.ps.ref.png \
 	reference/culled-glyphs.quartz.ref.png \
 	reference/culled-glyphs.ref.png \
+	reference/culled-glyphs.traps.argb32.ref.png \
+	reference/culled-glyphs.traps.rgb24.ref.png \
 	reference/curve-to-as-line-to.base.argb32.ref.png \
 	reference/curve-to-as-line-to.base.rgb24.ref.png \
 	reference/curve-to-as-line-to.ps.xfail.png \
 	reference/curve-to-as-line-to.ref.png \
+	reference/curve-to-as-line-to.traps.argb32.ref.png \
+	reference/curve-to-as-line-to.traps.rgb24.ref.png \
 	reference/dash-caps-joins.base.argb32.ref.png \
 	reference/dash-caps-joins.base.rgb24.ref.png \
 	reference/dash-caps-joins.image16.ref.png \
 	reference/dash-caps-joins.ps.ref.png \
 	reference/dash-caps-joins.quartz.xfail.png \
 	reference/dash-caps-joins.ref.png \
+	reference/dash-caps-joins.traps.argb32.ref.png \
+	reference/dash-caps-joins.traps.rgb24.ref.png \
 	reference/dash-curve.base.argb32.ref.png \
 	reference/dash-curve.base.rgb24.ref.png \
 	reference/dash-curve.image16.ref.png \
@@ -511,27 +687,39 @@ REFERENCE_IMAGES = \
 	reference/dash-curve.ps3.ref.png \
 	reference/dash-curve.quartz.xfail.png \
 	reference/dash-curve.ref.png \
+	reference/dash-curve.traps.argb32.ref.png \
+	reference/dash-curve.traps.rgb24.ref.png \
 	reference/dash-curve.xlib.ref.png \
 	reference/dash-infinite-loop.base.argb32.ref.png \
 	reference/dash-infinite-loop.base.rgb24.ref.png \
 	reference/dash-infinite-loop.ps.ref.png \
 	reference/dash-infinite-loop.ref.png \
+	reference/dash-infinite-loop.traps.argb32.ref.png \
+	reference/dash-infinite-loop.traps.rgb24.ref.png \
 	reference/dash-no-dash.base.argb32.ref.png \
 	reference/dash-no-dash.base.rgb24.ref.png \
 	reference/dash-no-dash.ref.png \
+	reference/dash-no-dash.traps.argb32.ref.png \
+	reference/dash-no-dash.traps.rgb24.ref.png \
 	reference/dash-offset-negative.base.argb32.ref.png \
 	reference/dash-offset-negative.base.rgb24.ref.png \
 	reference/dash-offset-negative.pdf.ref.png \
 	reference/dash-offset-negative.ref.png \
+	reference/dash-offset-negative.traps.argb32.ref.png \
+	reference/dash-offset-negative.traps.rgb24.ref.png \
 	reference/dash-offset.base.argb32.ref.png \
 	reference/dash-offset.base.rgb24.ref.png \
 	reference/dash-offset.ref.png \
+	reference/dash-offset.traps.argb32.ref.png \
+	reference/dash-offset.traps.rgb24.ref.png \
 	reference/dash-scale.base.argb32.ref.png \
 	reference/dash-scale.base.rgb24.ref.png \
 	reference/dash-scale.image16.ref.png \
 	reference/dash-scale.ps.ref.png \
 	reference/dash-scale.quartz.ref.png \
 	reference/dash-scale.ref.png \
+	reference/dash-scale.traps.argb32.ref.png \
+	reference/dash-scale.traps.rgb24.ref.png \
 	reference/dash-state.base.argb32.ref.png \
 	reference/dash-state.base.rgb24.ref.png \
 	reference/dash-state.image16.ref.png \
@@ -539,6 +727,8 @@ REFERENCE_IMAGES = \
 	reference/dash-state.ps3.ref.png \
 	reference/dash-state.quartz.xfail.png \
 	reference/dash-state.ref.png \
+	reference/dash-state.traps.argb32.ref.png \
+	reference/dash-state.traps.rgb24.ref.png \
 	reference/dash-zero-length.base.argb32.ref.png \
 	reference/dash-zero-length.base.rgb24.ref.png \
 	reference/dash-zero-length.ps2.ref.png \
@@ -547,6 +737,8 @@ REFERENCE_IMAGES = \
 	reference/dash-zero-length.ps3.rgb24.ref.png \
 	reference/dash-zero-length.ref.png \
 	reference/dash-zero-length.rgb24.ref.png \
+	reference/dash-zero-length.traps.argb32.ref.png \
+	reference/dash-zero-length.traps.rgb24.ref.png \
 	reference/degenerate-arc.base.argb32.ref.png \
 	reference/degenerate-arc.base.rgb24.ref.png \
 	reference/degenerate-arc.image16.ref.png \
@@ -554,26 +746,36 @@ REFERENCE_IMAGES = \
 	reference/degenerate-arc.ps3.ref.png \
 	reference/degenerate-arc.quartz.ref.png \
 	reference/degenerate-arc.ref.png \
+	reference/degenerate-arc.traps.argb32.ref.png \
+	reference/degenerate-arc.traps.rgb24.ref.png \
 	reference/degenerate-arc.xlib.ref.png \
 	reference/degenerate-arcs.base.argb32.ref.png \
 	reference/degenerate-arcs.base.rgb24.ref.png \
 	reference/degenerate-arcs.image16.ref.png \
 	reference/degenerate-arcs.ref.png \
+	reference/degenerate-arcs.traps.argb32.ref.png \
+	reference/degenerate-arcs.traps.rgb24.ref.png \
 	reference/degenerate-curve-to.base.argb32.ref.png \
 	reference/degenerate-curve-to.base.rgb24.ref.png \
 	reference/degenerate-curve-to.image16.ref.png \
 	reference/degenerate-curve-to.ps.xfail.png \
 	reference/degenerate-curve-to.quartz.ref.png \
 	reference/degenerate-curve-to.ref.png \
+	reference/degenerate-curve-to.traps.argb32.ref.png \
+	reference/degenerate-curve-to.traps.rgb24.ref.png \
 	reference/degenerate-dash.base.argb32.ref.png \
 	reference/degenerate-dash.base.rgb24.ref.png \
 	reference/degenerate-dash.ps.xfail.png \
 	reference/degenerate-dash.quartz.xfail.png \
 	reference/degenerate-dash.ref.png \
+	reference/degenerate-dash.traps.argb32.ref.png \
+	reference/degenerate-dash.traps.rgb24.ref.png \
 	reference/degenerate-dash.xlib.ref.png \
 	reference/degenerate-linear-gradient.base.argb32.ref.png \
 	reference/degenerate-linear-gradient.base.rgb24.ref.png \
 	reference/degenerate-linear-gradient.ref.png \
+	reference/degenerate-linear-gradient.traps.argb32.ref.png \
+	reference/degenerate-linear-gradient.traps.rgb24.ref.png \
 	reference/degenerate-path.argb32.ref.png \
 	reference/degenerate-path.base.argb32.ref.png \
 	reference/degenerate-path.base.rgb24.ref.png \
@@ -582,21 +784,29 @@ REFERENCE_IMAGES = \
 	reference/degenerate-path.quartz.argb32.xfail.png \
 	reference/degenerate-path.quartz.rgb24.xfail.png \
 	reference/degenerate-path.rgb24.ref.png \
+	reference/degenerate-path.traps.argb32.ref.png \
+	reference/degenerate-path.traps.rgb24.ref.png \
 	reference/degenerate-pen.base.argb32.ref.png \
 	reference/degenerate-pen.base.rgb24.ref.png \
 	reference/degenerate-pen.image16.ref.png \
 	reference/degenerate-pen.ps.ref.png \
 	reference/degenerate-pen.ref.png \
+	reference/degenerate-pen.traps.argb32.ref.png \
+	reference/degenerate-pen.traps.rgb24.ref.png \
 	reference/degenerate-pen.xlib.ref.png \
 	reference/degenerate-radial-gradient.base.argb32.ref.png \
 	reference/degenerate-radial-gradient.base.rgb24.ref.png \
 	reference/degenerate-radial-gradient.ref.png \
+	reference/degenerate-radial-gradient.traps.argb32.ref.png \
+	reference/degenerate-radial-gradient.traps.rgb24.ref.png \
 	reference/degenerate-rel-curve-to.base.argb32.ref.png \
 	reference/degenerate-rel-curve-to.base.rgb24.ref.png \
 	reference/degenerate-rel-curve-to.image16.ref.png \
 	reference/degenerate-rel-curve-to.ps.ref.png \
 	reference/degenerate-rel-curve-to.quartz.ref.png \
 	reference/degenerate-rel-curve-to.ref.png \
+	reference/degenerate-rel-curve-to.traps.argb32.ref.png \
+	reference/degenerate-rel-curve-to.traps.rgb24.ref.png \
 	reference/device-offset-fractional.base.argb32.ref.png \
 	reference/device-offset-fractional.base.rgb24.ref.png \
 	reference/device-offset-fractional.gl.xfail.png \
@@ -604,22 +814,32 @@ REFERENCE_IMAGES = \
 	reference/device-offset-fractional.ps2.ref.png \
 	reference/device-offset-fractional.ps3.ref.png \
 	reference/device-offset-fractional.ref.png \
+	reference/device-offset-fractional.traps.argb32.ref.png \
+	reference/device-offset-fractional.traps.rgb24.ref.png \
 	reference/device-offset-positive.base.argb32.ref.png \
 	reference/device-offset-positive.base.rgb24.ref.png \
 	reference/device-offset-positive.ref.png \
 	reference/device-offset-positive.rgb24.ref.png \
+	reference/device-offset-positive.traps.argb32.ref.png \
+	reference/device-offset-positive.traps.rgb24.ref.png \
 	reference/device-offset-scale.base.argb32.ref.png \
 	reference/device-offset-scale.base.rgb24.ref.png \
 	reference/device-offset-scale.ref.png \
 	reference/device-offset-scale.svg.xfail.png \
+	reference/device-offset-scale.traps.argb32.ref.png \
+	reference/device-offset-scale.traps.rgb24.ref.png \
 	reference/device-offset.base.argb32.ref.png \
 	reference/device-offset.base.rgb24.ref.png \
 	reference/device-offset.ref.png \
 	reference/device-offset.rgb24.ref.png \
+	reference/device-offset.traps.argb32.ref.png \
+	reference/device-offset.traps.rgb24.ref.png \
 	reference/drunkard-tails.base.argb32.ref.png \
 	reference/drunkard-tails.base.rgb24.ref.png \
 	reference/drunkard-tails.ps.ref.png \
 	reference/drunkard-tails.ref.png \
+	reference/drunkard-tails.traps.argb32.ref.png \
+	reference/drunkard-tails.traps.rgb24.ref.png \
 	reference/extend-pad-border.base.argb32.ref.png \
 	reference/extend-pad-border.base.rgb24.ref.png \
 	reference/extend-pad-border.image16.ref.png \
@@ -628,45 +848,61 @@ REFERENCE_IMAGES = \
 	reference/extend-pad-border.quartz.ref.png \
 	reference/extend-pad-border.ref.png \
 	reference/extend-pad-border.svg.xfail.png \
+	reference/extend-pad-border.traps.argb32.ref.png \
+	reference/extend-pad-border.traps.rgb24.ref.png \
 	reference/extend-pad-similar.base.argb32.ref.png \
 	reference/extend-pad-similar.base.rgb24.ref.png \
 	reference/extend-pad-similar.quartz.xfail.png \
 	reference/extend-pad-similar.ref.png \
 	reference/extend-pad-similar.svg.xfail.png \
+	reference/extend-pad-similar.traps.argb32.ref.png \
+	reference/extend-pad-similar.traps.rgb24.ref.png \
 	reference/extend-pad.base.argb32.ref.png \
 	reference/extend-pad.base.rgb24.ref.png \
 	reference/extend-pad.ps.ref.png \
 	reference/extend-pad.quartz.xfail.png \
 	reference/extend-pad.ref.png \
 	reference/extend-pad.svg.xfail.png \
+	reference/extend-pad.traps.argb32.ref.png \
+	reference/extend-pad.traps.rgb24.ref.png \
 	reference/extend-reflect-similar.base.argb32.ref.png \
 	reference/extend-reflect-similar.base.rgb24.ref.png \
 	reference/extend-reflect-similar.image16.ref.png \
 	reference/extend-reflect-similar.ps2.ref.png \
 	reference/extend-reflect-similar.ps3.ref.png \
 	reference/extend-reflect-similar.ref.png \
+	reference/extend-reflect-similar.traps.argb32.ref.png \
+	reference/extend-reflect-similar.traps.rgb24.ref.png \
 	reference/extend-reflect.base.argb32.ref.png \
 	reference/extend-reflect.base.rgb24.ref.png \
 	reference/extend-reflect.image16.ref.png \
 	reference/extend-reflect.ps2.ref.png \
 	reference/extend-reflect.ps3.ref.png \
 	reference/extend-reflect.ref.png \
+	reference/extend-reflect.traps.argb32.ref.png \
+	reference/extend-reflect.traps.rgb24.ref.png \
 	reference/extend-repeat-similar.base.argb32.ref.png \
 	reference/extend-repeat-similar.base.rgb24.ref.png \
 	reference/extend-repeat-similar.image16.ref.png \
 	reference/extend-repeat-similar.ps2.ref.png \
 	reference/extend-repeat-similar.ps3.ref.png \
 	reference/extend-repeat-similar.ref.png \
+	reference/extend-repeat-similar.traps.argb32.ref.png \
+	reference/extend-repeat-similar.traps.rgb24.ref.png \
 	reference/extend-repeat.base.argb32.ref.png \
 	reference/extend-repeat.base.rgb24.ref.png \
 	reference/extend-repeat.image16.ref.png \
 	reference/extend-repeat.ps2.ref.png \
 	reference/extend-repeat.ps3.ref.png \
 	reference/extend-repeat.ref.png \
+	reference/extend-repeat.traps.argb32.ref.png \
+	reference/extend-repeat.traps.rgb24.ref.png \
 	reference/extended-blend-alpha-mask.argb32.ref.png \
 	reference/extended-blend-alpha-mask.base.argb32.ref.png \
 	reference/extended-blend-alpha-mask.base.rgb24.ref.png \
 	reference/extended-blend-alpha-mask.rgb24.ref.png \
+	reference/extended-blend-alpha-mask.traps.argb32.ref.png \
+	reference/extended-blend-alpha-mask.traps.rgb24.ref.png \
 	reference/extended-blend-alpha.argb32.ref.png \
 	reference/extended-blend-alpha.base.argb32.ref.png \
 	reference/extended-blend-alpha.base.rgb24.ref.png \
@@ -676,20 +912,28 @@ REFERENCE_IMAGES = \
 	reference/extended-blend-alpha.rgb24.ref.png \
 	reference/extended-blend-alpha.svg12.argb32.xfail.png \
 	reference/extended-blend-alpha.svg12.rgb24.xfail.png \
+	reference/extended-blend-alpha.traps.argb32.ref.png \
+	reference/extended-blend-alpha.traps.rgb24.ref.png \
 	reference/extended-blend-mask.argb32.ref.png \
 	reference/extended-blend-mask.base.argb32.ref.png \
 	reference/extended-blend-mask.base.rgb24.ref.png \
 	reference/extended-blend-mask.rgb24.ref.png \
+	reference/extended-blend-mask.traps.argb32.ref.png \
+	reference/extended-blend-mask.traps.rgb24.ref.png \
 	reference/extended-blend-solid-alpha.argb32.ref.png \
 	reference/extended-blend-solid-alpha.base.argb32.ref.png \
 	reference/extended-blend-solid-alpha.base.rgb24.ref.png \
 	reference/extended-blend-solid-alpha.image16.ref.png \
 	reference/extended-blend-solid-alpha.rgb24.ref.png \
+	reference/extended-blend-solid-alpha.traps.argb32.ref.png \
+	reference/extended-blend-solid-alpha.traps.rgb24.ref.png \
 	reference/extended-blend-solid.argb32.ref.png \
 	reference/extended-blend-solid.base.argb32.ref.png \
 	reference/extended-blend-solid.base.rgb24.ref.png \
 	reference/extended-blend-solid.image16.ref.png \
 	reference/extended-blend-solid.rgb24.ref.png \
+	reference/extended-blend-solid.traps.argb32.ref.png \
+	reference/extended-blend-solid.traps.rgb24.ref.png \
 	reference/extended-blend.argb32.ref.png \
 	reference/extended-blend.base.argb32.ref.png \
 	reference/extended-blend.base.rgb24.ref.png \
@@ -699,6 +943,8 @@ REFERENCE_IMAGES = \
 	reference/extended-blend.rgb24.ref.png \
 	reference/extended-blend.svg12.argb32.xfail.png \
 	reference/extended-blend.svg12.rgb24.xfail.png \
+	reference/extended-blend.traps.argb32.ref.png \
+	reference/extended-blend.traps.rgb24.ref.png \
 	reference/fallback-resolution.ppi144x144.ps.ref.png \
 	reference/fallback-resolution.ppi144x144.ref.png \
 	reference/fallback-resolution.ppi144x72.ps.ref.png \
@@ -727,6 +973,8 @@ REFERENCE_IMAGES = \
 	reference/fill-alpha-pattern.ps3.argb32.ref.png \
 	reference/fill-alpha-pattern.quartz.ref.png \
 	reference/fill-alpha-pattern.ref.png \
+	reference/fill-alpha-pattern.traps.argb32.ref.png \
+	reference/fill-alpha-pattern.traps.rgb24.ref.png \
 	reference/fill-alpha-pattern.xlib.ref.png \
 	reference/fill-alpha.base.argb32.ref.png \
 	reference/fill-alpha.base.rgb24.ref.png \
@@ -734,6 +982,8 @@ REFERENCE_IMAGES = \
 	reference/fill-alpha.ps.argb32.ref.png \
 	reference/fill-alpha.quartz.ref.png \
 	reference/fill-alpha.ref.png \
+	reference/fill-alpha.traps.argb32.ref.png \
+	reference/fill-alpha.traps.rgb24.ref.png \
 	reference/fill-alpha.xlib.ref.png \
 	reference/fill-and-stroke-alpha-add.base.argb32.ref.png \
 	reference/fill-and-stroke-alpha-add.base.rgb24.ref.png \
@@ -741,10 +991,14 @@ REFERENCE_IMAGES = \
 	reference/fill-and-stroke-alpha-add.quartz.ref.png \
 	reference/fill-and-stroke-alpha-add.ref.png \
 	reference/fill-and-stroke-alpha-add.svg12.xfail.png \
+	reference/fill-and-stroke-alpha-add.traps.argb32.ref.png \
+	reference/fill-and-stroke-alpha-add.traps.rgb24.ref.png \
 	reference/fill-and-stroke-alpha.base.argb32.ref.png \
 	reference/fill-and-stroke-alpha.base.rgb24.ref.png \
 	reference/fill-and-stroke-alpha.image16.ref.png \
 	reference/fill-and-stroke-alpha.ref.png \
+	reference/fill-and-stroke-alpha.traps.argb32.ref.png \
+	reference/fill-and-stroke-alpha.traps.rgb24.ref.png \
 	reference/fill-and-stroke.argb32.ref.png \
 	reference/fill-and-stroke.base.argb32.ref.png \
 	reference/fill-and-stroke.base.rgb24.ref.png \
@@ -754,6 +1008,8 @@ REFERENCE_IMAGES = \
 	reference/fill-and-stroke.quartz.argb32.ref.png \
 	reference/fill-and-stroke.quartz.rgb24.ref.png \
 	reference/fill-and-stroke.rgb24.ref.png \
+	reference/fill-and-stroke.traps.argb32.ref.png \
+	reference/fill-and-stroke.traps.rgb24.ref.png \
 	reference/fill-and-stroke.xlib.argb32.ref.png \
 	reference/fill-and-stroke.xlib.rgb24.ref.png \
 	reference/fill-degenerate-sort-order.argb32.ref.png \
@@ -765,6 +1021,8 @@ REFERENCE_IMAGES = \
 	reference/fill-degenerate-sort-order.quartz.argb32.ref.png \
 	reference/fill-degenerate-sort-order.quartz.rgb24.ref.png \
 	reference/fill-degenerate-sort-order.rgb24.ref.png \
+	reference/fill-degenerate-sort-order.traps.argb32.ref.png \
+	reference/fill-degenerate-sort-order.traps.rgb24.ref.png \
 	reference/fill-degenerate-sort-order.xlib.ref.png \
 	reference/fill-degenerate-sort-order.xlib.rgb24.ref.png \
 	reference/fill-empty.argb32.ref.png \
@@ -772,12 +1030,16 @@ REFERENCE_IMAGES = \
 	reference/fill-empty.base.rgb24.ref.png \
 	reference/fill-empty.rgb24.ref.png \
 	reference/fill-empty.svg12.rgb24.xfail.png \
+	reference/fill-empty.traps.argb32.ref.png \
+	reference/fill-empty.traps.rgb24.ref.png \
 	reference/fill-image.base.argb32.ref.png \
 	reference/fill-image.base.rgb24.ref.png \
 	reference/fill-image.image16.ref.png \
 	reference/fill-image.ps.ref.png \
 	reference/fill-image.quartz.ref.png \
 	reference/fill-image.ref.png \
+	reference/fill-image.traps.argb32.ref.png \
+	reference/fill-image.traps.rgb24.ref.png \
 	reference/fill-image.xlib.ref.png \
 	reference/fill-missed-stop.base.argb32.ref.png \
 	reference/fill-missed-stop.base.rgb24.ref.png \
@@ -788,6 +1050,8 @@ REFERENCE_IMAGES = \
 	reference/fill-missed-stop.ps3.rgb24.ref.png \
 	reference/fill-missed-stop.ref.png \
 	reference/fill-missed-stop.rgb24.ref.png \
+	reference/fill-missed-stop.traps.argb32.ref.png \
+	reference/fill-missed-stop.traps.rgb24.ref.png \
 	reference/fill-rule.base.argb32.ref.png \
 	reference/fill-rule.base.rgb24.ref.png \
 	reference/fill-rule.image16.ref.png \
@@ -799,6 +1063,8 @@ REFERENCE_IMAGES = \
 	reference/fill-rule.quartz.rgb24.ref.png \
 	reference/fill-rule.ref.png \
 	reference/fill-rule.rgb24.ref.png \
+	reference/fill-rule.traps.argb32.ref.png \
+	reference/fill-rule.traps.rgb24.ref.png \
 	reference/fill-rule.xlib.ref.png \
 	reference/fill-rule.xlib.rgb24.ref.png \
 	reference/filter-bilinear-extents.base.argb32.ref.png \
@@ -809,6 +1075,8 @@ REFERENCE_IMAGES = \
 	reference/filter-bilinear-extents.ps3.ref.png \
 	reference/filter-bilinear-extents.quartz.xfail.png \
 	reference/filter-bilinear-extents.ref.png \
+	reference/filter-bilinear-extents.traps.argb32.ref.png \
+	reference/filter-bilinear-extents.traps.rgb24.ref.png \
 	reference/filter-nearest-offset.base.argb32.ref.png \
 	reference/filter-nearest-offset.base.rgb24.ref.png \
 	reference/filter-nearest-offset.gl.xfail.png \
@@ -817,6 +1085,8 @@ REFERENCE_IMAGES = \
 	reference/filter-nearest-offset.ps3.ref.png \
 	reference/filter-nearest-offset.ref.png \
 	reference/filter-nearest-offset.svg.xfail.png \
+	reference/filter-nearest-offset.traps.argb32.ref.png \
+	reference/filter-nearest-offset.traps.rgb24.ref.png \
 	reference/filter-nearest-transformed.base.argb32.ref.png \
 	reference/filter-nearest-transformed.base.rgb24.ref.png \
 	reference/filter-nearest-transformed.gl.xfail.png \
@@ -825,6 +1095,8 @@ REFERENCE_IMAGES = \
 	reference/filter-nearest-transformed.quartz.xfail.png \
 	reference/filter-nearest-transformed.ref.png \
 	reference/filter-nearest-transformed.svg.xfail.png \
+	reference/filter-nearest-transformed.traps.argb32.ref.png \
+	reference/filter-nearest-transformed.traps.rgb24.ref.png \
 	reference/finer-grained-fallbacks.argb32.ref.png \
 	reference/finer-grained-fallbacks.base.argb32.ref.png \
 	reference/finer-grained-fallbacks.base.rgb24.ref.png \
@@ -841,6 +1113,8 @@ REFERENCE_IMAGES = \
 	reference/finer-grained-fallbacks.rgb24.ref.png \
 	reference/finer-grained-fallbacks.svg12.argb32.ref.png \
 	reference/finer-grained-fallbacks.svg12.rgb24.ref.png \
+	reference/finer-grained-fallbacks.traps.argb32.ref.png \
+	reference/finer-grained-fallbacks.traps.rgb24.ref.png \
 	reference/finer-grained-fallbacks.xlib-fallback.ref.png \
 	reference/finer-grained-fallbacks.xlib.ref.png \
 	reference/finer-grained-fallbacks.xlib.rgb24.ref.png \
@@ -854,6 +1128,8 @@ REFERENCE_IMAGES = \
 	reference/font-matrix-translation.quartz.ref.png \
 	reference/font-matrix-translation.ref.png \
 	reference/font-matrix-translation.svg.ref.png \
+	reference/font-matrix-translation.traps.argb32.ref.png \
+	reference/font-matrix-translation.traps.rgb24.ref.png \
 	reference/ft-show-glyphs-positioning.base.argb32.ref.png \
 	reference/ft-show-glyphs-positioning.base.rgb24.ref.png \
 	reference/ft-show-glyphs-positioning.image16.ref.png \
@@ -862,6 +1138,8 @@ REFERENCE_IMAGES = \
 	reference/ft-show-glyphs-positioning.ps3.ref.png \
 	reference/ft-show-glyphs-positioning.ref.png \
 	reference/ft-show-glyphs-positioning.svg.ref.png \
+	reference/ft-show-glyphs-positioning.traps.argb32.ref.png \
+	reference/ft-show-glyphs-positioning.traps.rgb24.ref.png \
 	reference/ft-show-glyphs-table.base.argb32.ref.png \
 	reference/ft-show-glyphs-table.base.rgb24.ref.png \
 	reference/ft-show-glyphs-table.image16.ref.png \
@@ -870,11 +1148,15 @@ REFERENCE_IMAGES = \
 	reference/ft-show-glyphs-table.quartz.xfail.png \
 	reference/ft-show-glyphs-table.ref.png \
 	reference/ft-show-glyphs-table.svg.ref.png \
+	reference/ft-show-glyphs-table.traps.argb32.ref.png \
+	reference/ft-show-glyphs-table.traps.rgb24.ref.png \
 	reference/ft-text-antialias-none.base.argb32.ref.png \
 	reference/ft-text-antialias-none.base.rgb24.ref.png \
 	reference/ft-text-antialias-none.ps2.argb32.ref.png \
 	reference/ft-text-antialias-none.ps3.argb32.ref.png \
 	reference/ft-text-antialias-none.ref.png \
+	reference/ft-text-antialias-none.traps.argb32.ref.png \
+	reference/ft-text-antialias-none.traps.rgb24.ref.png \
 	reference/ft-text-vertical-layout-type1.base.argb32.ref.png \
 	reference/ft-text-vertical-layout-type1.base.rgb24.ref.png \
 	reference/ft-text-vertical-layout-type1.image16.ref.png \
@@ -883,6 +1165,8 @@ REFERENCE_IMAGES = \
 	reference/ft-text-vertical-layout-type1.quartz.xfail.png \
 	reference/ft-text-vertical-layout-type1.ref.png \
 	reference/ft-text-vertical-layout-type1.svg.ref.png \
+	reference/ft-text-vertical-layout-type1.traps.argb32.ref.png \
+	reference/ft-text-vertical-layout-type1.traps.rgb24.ref.png \
 	reference/ft-text-vertical-layout-type1.xfail.png \
 	reference/ft-text-vertical-layout-type1.xlib.ref.png \
 	reference/ft-text-vertical-layout-type3.base.argb32.ref.png \
@@ -893,10 +1177,14 @@ REFERENCE_IMAGES = \
 	reference/ft-text-vertical-layout-type3.quartz.ref.png \
 	reference/ft-text-vertical-layout-type3.ref.png \
 	reference/ft-text-vertical-layout-type3.svg.ref.png \
+	reference/ft-text-vertical-layout-type3.traps.argb32.ref.png \
+	reference/ft-text-vertical-layout-type3.traps.rgb24.ref.png \
 	reference/ft-text-vertical-layout-type3.xlib.ref.png \
 	reference/get-group-target.base.argb32.ref.png \
 	reference/get-group-target.base.rgb24.ref.png \
 	reference/get-group-target.ref.png \
+	reference/get-group-target.traps.argb32.ref.png \
+	reference/get-group-target.traps.rgb24.ref.png \
 	reference/gl-surface-source.argb32.ref.png \
 	reference/gl-surface-source.image16.ref.png \
 	reference/gl-surface-source.rgb24.ref.png \
@@ -907,6 +1195,8 @@ REFERENCE_IMAGES = \
 	reference/glyph-cache-pressure.ps3.ref.png \
 	reference/glyph-cache-pressure.quartz.ref.png \
 	reference/glyph-cache-pressure.ref.png \
+	reference/glyph-cache-pressure.traps.argb32.ref.png \
+	reference/glyph-cache-pressure.traps.rgb24.ref.png \
 	reference/gradient-alpha.base.argb32.ref.png \
 	reference/gradient-alpha.base.rgb24.ref.png \
 	reference/gradient-alpha.ps2.argb32.ref.png \
@@ -915,6 +1205,8 @@ REFERENCE_IMAGES = \
 	reference/gradient-alpha.ps3.rgb24.ref.png \
 	reference/gradient-alpha.ref.png \
 	reference/gradient-alpha.rgb24.ref.png \
+	reference/gradient-alpha.traps.argb32.ref.png \
+	reference/gradient-alpha.traps.rgb24.ref.png \
 	reference/gradient-constant-alpha.base.argb32.ref.png \
 	reference/gradient-constant-alpha.base.rgb24.ref.png \
 	reference/gradient-constant-alpha.ps3.ref.png \
@@ -922,21 +1214,31 @@ REFERENCE_IMAGES = \
 	reference/gradient-constant-alpha.quartz.argb32.ref.png \
 	reference/gradient-constant-alpha.ref.png \
 	reference/gradient-constant-alpha.rgb24.ref.png \
+	reference/gradient-constant-alpha.traps.argb32.ref.png \
+	reference/gradient-constant-alpha.traps.rgb24.ref.png \
 	reference/gradient-zero-stops-mask.argb32.ref.png \
 	reference/gradient-zero-stops-mask.base.argb32.ref.png \
 	reference/gradient-zero-stops-mask.base.rgb24.ref.png \
 	reference/gradient-zero-stops-mask.rgb24.ref.png \
+	reference/gradient-zero-stops-mask.traps.argb32.ref.png \
+	reference/gradient-zero-stops-mask.traps.rgb24.ref.png \
 	reference/gradient-zero-stops.base.argb32.ref.png \
 	reference/gradient-zero-stops.base.rgb24.ref.png \
 	reference/gradient-zero-stops.ref.png \
 	reference/gradient-zero-stops.rgb24.ref.png \
+	reference/gradient-zero-stops.traps.argb32.ref.png \
+	reference/gradient-zero-stops.traps.rgb24.ref.png \
 	reference/group-clip.base.argb32.ref.png \
 	reference/group-clip.base.rgb24.ref.png \
 	reference/group-clip.image16.ref.png \
 	reference/group-clip.ref.png \
+	reference/group-clip.traps.argb32.ref.png \
+	reference/group-clip.traps.rgb24.ref.png \
 	reference/group-paint.base.argb32.ref.png \
 	reference/group-paint.base.rgb24.ref.png \
 	reference/group-paint.ref.png \
+	reference/group-paint.traps.argb32.ref.png \
+	reference/group-paint.traps.rgb24.ref.png \
 	reference/group-unaligned.base.argb32.ref.png \
 	reference/group-unaligned.base.rgb24.ref.png \
 	reference/group-unaligned.image16.ref.png \
@@ -946,6 +1248,8 @@ REFERENCE_IMAGES = \
 	reference/group-unaligned.ref.png \
 	reference/group-unaligned.svg.argb32.xfail.png \
 	reference/group-unaligned.svg.rgb24.xfail.png \
+	reference/group-unaligned.traps.argb32.ref.png \
+	reference/group-unaligned.traps.rgb24.ref.png \
 	reference/group-unaligned.xlib-fallback.ref.png \
 	reference/group-unaligned.xlib.ref.png \
 	reference/halo-transform.base.argb32.ref.png \
@@ -954,6 +1258,8 @@ REFERENCE_IMAGES = \
 	reference/halo-transform.ps.ref.png \
 	reference/halo-transform.quartz.ref.png \
 	reference/halo-transform.ref.png \
+	reference/halo-transform.traps.argb32.ref.png \
+	reference/halo-transform.traps.rgb24.ref.png \
 	reference/halo-transform.xlib.ref.png \
 	reference/halo.base.argb32.ref.png \
 	reference/halo.base.rgb24.ref.png \
@@ -961,14 +1267,19 @@ REFERENCE_IMAGES = \
 	reference/halo.ps.ref.png \
 	reference/halo.quartz.ref.png \
 	reference/halo.ref.png \
+	reference/halo.traps.argb32.ref.png \
+	reference/halo.traps.rgb24.ref.png \
 	reference/halo.xlib.ref.png \
 	reference/hatchings.base.argb32.ref.png \
 	reference/hatchings.base.rgb24.ref.png \
 	reference/hatchings.ref.png \
+	reference/hatchings.traps.argb32.ref.png \
 	reference/hatchings.xlib.ref.png \
 	reference/horizontal-clip.base.argb32.ref.png \
 	reference/horizontal-clip.base.rgb24.ref.png \
 	reference/horizontal-clip.ref.png \
+	reference/horizontal-clip.traps.argb32.ref.png \
+	reference/horizontal-clip.traps.rgb24.ref.png \
 	reference/huge-linear.base.argb32.ref.png \
 	reference/huge-linear.base.rgb24.ref.png \
 	reference/huge-linear.image16.ref.png \
@@ -976,6 +1287,8 @@ REFERENCE_IMAGES = \
 	reference/huge-linear.ps3.ref.png \
 	reference/huge-linear.quartz.ref.png \
 	reference/huge-linear.ref.png \
+	reference/huge-linear.traps.argb32.ref.png \
+	reference/huge-linear.traps.rgb24.ref.png \
 	reference/huge-radial.base.argb32.ref.png \
 	reference/huge-radial.base.rgb24.ref.png \
 	reference/huge-radial.image16.ref.png \
@@ -984,12 +1297,18 @@ REFERENCE_IMAGES = \
 	reference/huge-radial.ps3.ref.png \
 	reference/huge-radial.quartz.ref.png \
 	reference/huge-radial.ref.png \
+	reference/huge-radial.traps.argb32.ref.png \
+	reference/huge-radial.traps.rgb24.ref.png \
 	reference/image-bug-710072-aligned.base.argb32.ref.png \
 	reference/image-bug-710072-aligned.base.rgb24.ref.png \
 	reference/image-bug-710072-aligned.ref.png \
+	reference/image-bug-710072-aligned.traps.argb32.ref.png \
+	reference/image-bug-710072-aligned.traps.rgb24.ref.png \
 	reference/image-bug-710072-unaligned.base.argb32.ref.png \
 	reference/image-bug-710072-unaligned.base.rgb24.ref.png \
 	reference/image-bug-710072-unaligned.ref.png \
+	reference/image-bug-710072-unaligned.traps.argb32.ref.png \
+	reference/image-bug-710072-unaligned.traps.rgb24.ref.png \
 	reference/image-bug-710072-unaligned.xlib.ref.png \
 	reference/image-surface-source.argb32.ref.png \
 	reference/image-surface-source.base.argb32.ref.png \
@@ -1000,53 +1319,79 @@ REFERENCE_IMAGES = \
 	reference/image-surface-source.rgb24.ref.png \
 	reference/image-surface-source.svg12.argb32.xfail.png \
 	reference/image-surface-source.svg12.rgb24.xfail.png \
+	reference/image-surface-source.traps.argb32.ref.png \
+	reference/image-surface-source.traps.rgb24.ref.png \
 	reference/implicit-close.base.argb32.ref.png \
 	reference/implicit-close.base.rgb24.ref.png \
 	reference/implicit-close.ps.ref.png \
 	reference/implicit-close.ref.png \
+	reference/implicit-close.traps.argb32.ref.png \
+	reference/implicit-close.traps.rgb24.ref.png \
 	reference/infinite-join.base.argb32.ref.png \
 	reference/infinite-join.base.rgb24.ref.png \
 	reference/infinite-join.ps2.ref.png \
 	reference/infinite-join.ps3.ref.png \
 	reference/infinite-join.ref.png \
+	reference/infinite-join.traps.argb32.ref.png \
+	reference/infinite-join.traps.rgb24.ref.png \
 	reference/inverse-text.base.argb32.ref.png \
 	reference/inverse-text.base.rgb24.ref.png \
 	reference/inverse-text.image16.ref.png \
 	reference/inverse-text.ps.ref.png \
 	reference/inverse-text.quartz.ref.png \
 	reference/inverse-text.ref.png \
+	reference/inverse-text.traps.argb32.ref.png \
+	reference/inverse-text.traps.rgb24.ref.png \
 	reference/joins-loop.base.argb32.ref.png \
 	reference/joins-loop.base.rgb24.ref.png \
 	reference/joins-loop.ref.png \
+	reference/joins-loop.traps.argb32.ref.png \
+	reference/joins-loop.traps.rgb24.ref.png \
 	reference/joins-retrace.base.argb32.ref.png \
 	reference/joins-retrace.base.rgb24.ref.png \
 	reference/joins-retrace.ref.png \
+	reference/joins-retrace.traps.argb32.ref.png \
+	reference/joins-retrace.traps.rgb24.ref.png \
 	reference/joins-star.base.argb32.ref.png \
 	reference/joins-star.base.rgb24.ref.png \
 	reference/joins-star.ref.png \
+	reference/joins-star.traps.argb32.ref.png \
+	reference/joins-star.traps.rgb24.ref.png \
 	reference/joins.base.argb32.ref.png \
 	reference/joins.base.rgb24.ref.png \
 	reference/joins.image16.ref.png \
 	reference/joins.ps.ref.png \
 	reference/joins.quartz.ref.png \
 	reference/joins.ref.png \
+	reference/joins.traps.argb32.ref.png \
+	reference/joins.traps.rgb24.ref.png \
 	reference/large-clip.base.argb32.ref.png \
 	reference/large-clip.base.rgb24.ref.png \
 	reference/large-clip.ref.png \
+	reference/large-clip.traps.argb32.ref.png \
+	reference/large-clip.traps.rgb24.ref.png \
 	reference/large-font.base.argb32.ref.png \
 	reference/large-font.base.rgb24.ref.png \
 	reference/large-font.image16.ref.png \
 	reference/large-font.ref.png \
+	reference/large-font.traps.argb32.ref.png \
+	reference/large-font.traps.rgb24.ref.png \
 	reference/large-source-roi.base.argb32.ref.png \
 	reference/large-source-roi.base.rgb24.ref.png \
 	reference/large-source-roi.ref.png \
+	reference/large-source-roi.traps.argb32.ref.png \
+	reference/large-source-roi.traps.rgb24.ref.png \
 	reference/large-source.base.argb32.ref.png \
 	reference/large-source.base.rgb24.ref.png \
 	reference/large-source.ref.png \
+	reference/large-source.traps.argb32.ref.png \
+	reference/large-source.traps.rgb24.ref.png \
 	reference/large-twin-antialias-mixed.base.argb32.ref.png \
 	reference/large-twin-antialias-mixed.base.rgb24.ref.png \
 	reference/large-twin-antialias-mixed.image16.ref.png \
 	reference/large-twin-antialias-mixed.ref.png \
+	reference/large-twin-antialias-mixed.traps.argb32.ref.png \
+	reference/large-twin-antialias-mixed.traps.rgb24.ref.png \
 	reference/large-twin-antialias-mixed.xlib.ref.png \
 	reference/leaky-dash.base.argb32.ref.png \
 	reference/leaky-dash.base.rgb24.ref.png \
@@ -1056,6 +1401,8 @@ REFERENCE_IMAGES = \
 	reference/leaky-dash.ps3.rgb24.ref.png \
 	reference/leaky-dash.quartz.ref.png \
 	reference/leaky-dash.ref.png \
+	reference/leaky-dash.traps.argb32.ref.png \
+	reference/leaky-dash.traps.rgb24.ref.png \
 	reference/leaky-dashed-rectangle.base.argb32.ref.png \
 	reference/leaky-dashed-rectangle.base.rgb24.ref.png \
 	reference/leaky-dashed-rectangle.image16.ref.png \
@@ -1063,6 +1410,8 @@ REFERENCE_IMAGES = \
 	reference/leaky-dashed-rectangle.ps.ref.png \
 	reference/leaky-dashed-rectangle.quartz.ref.png \
 	reference/leaky-dashed-rectangle.ref.png \
+	reference/leaky-dashed-rectangle.traps.argb32.ref.png \
+	reference/leaky-dashed-rectangle.traps.rgb24.ref.png \
 	reference/leaky-dashed-rectangle.xlib.ref.png \
 	reference/leaky-dashed-stroke.base.argb32.ref.png \
 	reference/leaky-dashed-stroke.base.rgb24.ref.png \
@@ -1070,29 +1419,45 @@ REFERENCE_IMAGES = \
 	reference/leaky-dashed-stroke.ps.ref.png \
 	reference/leaky-dashed-stroke.quartz.ref.png \
 	reference/leaky-dashed-stroke.ref.png \
+	reference/leaky-dashed-stroke.traps.argb32.ref.png \
+	reference/leaky-dashed-stroke.traps.rgb24.ref.png \
 	reference/leaky-dashed-stroke.xlib.ref.png \
 	reference/leaky-polygon.base.argb32.ref.png \
 	reference/leaky-polygon.base.rgb24.ref.png \
 	reference/leaky-polygon.image16.ref.png \
 	reference/leaky-polygon.ps.ref.png \
 	reference/leaky-polygon.ref.png \
+	reference/leaky-polygon.traps.argb32.ref.png \
+	reference/leaky-polygon.traps.rgb24.ref.png \
 	reference/line-width-overlap-dashed.base.argb32.ref.png \
 	reference/line-width-overlap-dashed.base.rgb24.ref.png \
+	reference/line-width-overlap-dashed.traps.argb32.ref.png \
+	reference/line-width-overlap-dashed.traps.rgb24.ref.png \
 	reference/line-width-overlap-flipped.base.argb32.ref.png \
 	reference/line-width-overlap-flipped.base.rgb24.ref.png \
 	reference/line-width-overlap-flipped.ref.png \
+	reference/line-width-overlap-flipped.traps.argb32.ref.png \
+	reference/line-width-overlap-flipped.traps.rgb24.ref.png \
 	reference/line-width-overlap-flopped.base.argb32.ref.png \
 	reference/line-width-overlap-flopped.base.rgb24.ref.png \
 	reference/line-width-overlap-flopped.ref.png \
+	reference/line-width-overlap-flopped.traps.argb32.ref.png \
+	reference/line-width-overlap-flopped.traps.rgb24.ref.png \
 	reference/line-width-overlap-offset.base.argb32.ref.png \
 	reference/line-width-overlap-offset.base.rgb24.ref.png \
 	reference/line-width-overlap-offset.ref.png \
+	reference/line-width-overlap-offset.traps.argb32.ref.png \
+	reference/line-width-overlap-offset.traps.rgb24.ref.png \
 	reference/line-width-overlap-rotated.base.argb32.ref.png \
 	reference/line-width-overlap-rotated.base.rgb24.ref.png \
 	reference/line-width-overlap-rotated.ref.png \
+	reference/line-width-overlap-rotated.traps.argb32.ref.png \
+	reference/line-width-overlap-rotated.traps.rgb24.ref.png \
 	reference/line-width-overlap.base.argb32.ref.png \
 	reference/line-width-overlap.base.rgb24.ref.png \
 	reference/line-width-overlap.ref.png \
+	reference/line-width-overlap.traps.argb32.ref.png \
+	reference/line-width-overlap.traps.rgb24.ref.png \
 	reference/line-width-scale.base.argb32.ref.png \
 	reference/line-width-scale.base.rgb24.ref.png \
 	reference/line-width-scale.image16.ref.png \
@@ -1100,23 +1465,35 @@ REFERENCE_IMAGES = \
 	reference/line-width-scale.ps3.ref.png \
 	reference/line-width-scale.quartz.ref.png \
 	reference/line-width-scale.ref.png \
+	reference/line-width-scale.traps.argb32.ref.png \
+	reference/line-width-scale.traps.rgb24.ref.png \
 	reference/line-width-tolerance.base.argb32.ref.png \
 	reference/line-width-tolerance.base.rgb24.ref.png \
 	reference/line-width-tolerance.ref.png \
+	reference/line-width-tolerance.traps.argb32.ref.png \
+	reference/line-width-tolerance.traps.rgb24.ref.png \
 	reference/line-width.base.argb32.ref.png \
 	reference/line-width.base.rgb24.ref.png \
 	reference/line-width.ref.png \
+	reference/line-width.traps.argb32.ref.png \
+	reference/line-width.traps.rgb24.ref.png \
 	reference/linear-gradient-extend.base.argb32.ref.png \
 	reference/linear-gradient-extend.base.rgb24.ref.png \
 	reference/linear-gradient-extend.ref.png \
+	reference/linear-gradient-extend.traps.argb32.ref.png \
+	reference/linear-gradient-extend.traps.rgb24.ref.png \
 	reference/linear-gradient-large.base.argb32.ref.png \
 	reference/linear-gradient-large.base.rgb24.ref.png \
 	reference/linear-gradient-large.quartz.ref.png \
 	reference/linear-gradient-large.ref.png \
+	reference/linear-gradient-large.traps.argb32.ref.png \
+	reference/linear-gradient-large.traps.rgb24.ref.png \
 	reference/linear-gradient-one-stop.argb32.ref.png \
 	reference/linear-gradient-one-stop.base.argb32.ref.png \
 	reference/linear-gradient-one-stop.base.rgb24.ref.png \
 	reference/linear-gradient-one-stop.rgb24.ref.png \
+	reference/linear-gradient-one-stop.traps.argb32.ref.png \
+	reference/linear-gradient-one-stop.traps.rgb24.ref.png \
 	reference/linear-gradient-reflect.base.argb32.ref.png \
 	reference/linear-gradient-reflect.base.rgb24.ref.png \
 	reference/linear-gradient-reflect.image16.ref.png \
@@ -1125,12 +1502,16 @@ REFERENCE_IMAGES = \
 	reference/linear-gradient-reflect.ps3.ref.png \
 	reference/linear-gradient-reflect.quartz.ref.png \
 	reference/linear-gradient-reflect.ref.png \
+	reference/linear-gradient-reflect.traps.argb32.ref.png \
+	reference/linear-gradient-reflect.traps.rgb24.ref.png \
 	reference/linear-gradient-subset.base.argb32.ref.png \
 	reference/linear-gradient-subset.base.rgb24.ref.png \
 	reference/linear-gradient-subset.image16.ref.png \
 	reference/linear-gradient-subset.ps3.ref.png \
 	reference/linear-gradient-subset.quartz.ref.png \
 	reference/linear-gradient-subset.ref.png \
+	reference/linear-gradient-subset.traps.argb32.ref.png \
+	reference/linear-gradient-subset.traps.rgb24.ref.png \
 	reference/linear-gradient-subset.xlib.ref.png \
 	reference/linear-gradient.base.argb32.ref.png \
 	reference/linear-gradient.base.rgb24.ref.png \
@@ -1138,14 +1519,20 @@ REFERENCE_IMAGES = \
 	reference/linear-gradient.ps3.ref.png \
 	reference/linear-gradient.quartz.ref.png \
 	reference/linear-gradient.ref.png \
+	reference/linear-gradient.traps.argb32.ref.png \
+	reference/linear-gradient.traps.rgb24.ref.png \
 	reference/linear-gradient.xlib.ref.png \
 	reference/linear-step-function.base.argb32.ref.png \
 	reference/linear-step-function.base.rgb24.ref.png \
+	reference/linear-step-function.traps.argb32.ref.png \
+	reference/linear-step-function.traps.rgb24.ref.png \
 	reference/linear-step-function.xfail.png \
 	reference/linear-uniform.base.argb32.ref.png \
 	reference/linear-uniform.base.rgb24.ref.png \
 	reference/linear-uniform.image16.ref.png \
 	reference/linear-uniform.ref.png \
+	reference/linear-uniform.traps.argb32.ref.png \
+	reference/linear-uniform.traps.rgb24.ref.png \
 	reference/long-dashed-lines.base.argb32.ref.png \
 	reference/long-dashed-lines.base.rgb24.ref.png \
 	reference/long-dashed-lines.image16.ref.png \
@@ -1153,17 +1540,27 @@ REFERENCE_IMAGES = \
 	reference/long-dashed-lines.ps3.ref.png \
 	reference/long-dashed-lines.quartz.ref.png \
 	reference/long-dashed-lines.ref.png \
+	reference/long-dashed-lines.traps.argb32.ref.png \
+	reference/long-dashed-lines.traps.rgb24.ref.png \
 	reference/long-lines.base.argb32.ref.png \
 	reference/long-lines.base.rgb24.ref.png \
+	reference/long-lines.traps.argb32.ref.png \
+	reference/long-lines.traps.rgb24.ref.png \
 	reference/map-all-to-image.base.argb32.ref.png \
 	reference/map-all-to-image.base.rgb24.ref.png \
 	reference/map-all-to-image.ref.png \
+	reference/map-all-to-image.traps.argb32.ref.png \
+	reference/map-all-to-image.traps.rgb24.ref.png \
 	reference/map-bit-to-image.base.argb32.ref.png \
 	reference/map-bit-to-image.base.rgb24.ref.png \
 	reference/map-bit-to-image.ref.png \
+	reference/map-bit-to-image.traps.argb32.ref.png \
+	reference/map-bit-to-image.traps.rgb24.ref.png \
 	reference/map-to-image-fill.base.argb32.ref.png \
 	reference/map-to-image-fill.base.rgb24.ref.png \
 	reference/map-to-image-fill.ref.png \
+	reference/map-to-image-fill.traps.argb32.ref.png \
+	reference/map-to-image-fill.traps.rgb24.ref.png \
 	reference/mask-alpha.argb32.ref.png \
 	reference/mask-alpha.base.argb32.ref.png \
 	reference/mask-alpha.base.rgb24.ref.png \
@@ -1171,12 +1568,16 @@ REFERENCE_IMAGES = \
 	reference/mask-alpha.quartz.argb32.ref.png \
 	reference/mask-alpha.rgb24.ref.png \
 	reference/mask-alpha.svg.rgb24.xfail.png \
+	reference/mask-alpha.traps.argb32.ref.png \
+	reference/mask-alpha.traps.rgb24.ref.png \
 	reference/mask-alpha.xlib.ref.png \
 	reference/mask-alpha.xlib.rgb24.ref.png \
 	reference/mask-ctm.base.argb32.ref.png \
 	reference/mask-ctm.base.rgb24.ref.png \
 	reference/mask-ctm.ref.png \
 	reference/mask-ctm.rgb24.ref.png \
+	reference/mask-ctm.traps.argb32.ref.png \
+	reference/mask-ctm.traps.rgb24.ref.png \
 	reference/mask-glyphs.gl.ref.png \
 	reference/mask-glyphs.image16.ref.png \
 	reference/mask-glyphs.pdf.ref.png \
@@ -1186,12 +1587,16 @@ REFERENCE_IMAGES = \
 	reference/mask-surface-ctm.base.rgb24.ref.png \
 	reference/mask-surface-ctm.ref.png \
 	reference/mask-surface-ctm.rgb24.ref.png \
+	reference/mask-surface-ctm.traps.argb32.ref.png \
+	reference/mask-surface-ctm.traps.rgb24.ref.png \
 	reference/mask-transformed-image.base.argb32.ref.png \
 	reference/mask-transformed-image.base.rgb24.ref.png \
 	reference/mask-transformed-image.image16.ref.png \
 	reference/mask-transformed-image.pdf.ref.png \
 	reference/mask-transformed-image.quartz.ref.png \
 	reference/mask-transformed-image.ref.png \
+	reference/mask-transformed-image.traps.argb32.ref.png \
+	reference/mask-transformed-image.traps.rgb24.ref.png \
 	reference/mask-transformed-similar.base.argb32.ref.png \
 	reference/mask-transformed-similar.base.rgb24.ref.png \
 	reference/mask-transformed-similar.image16.ref.png \
@@ -1199,6 +1604,8 @@ REFERENCE_IMAGES = \
 	reference/mask-transformed-similar.quartz.ref.png \
 	reference/mask-transformed-similar.ref.png \
 	reference/mask-transformed-similar.svg.ref.png \
+	reference/mask-transformed-similar.traps.argb32.ref.png \
+	reference/mask-transformed-similar.traps.rgb24.ref.png \
 	reference/mask.argb32.ref.png \
 	reference/mask.base.argb32.ref.png \
 	reference/mask.base.rgb24.ref.png \
@@ -1210,36 +1617,52 @@ REFERENCE_IMAGES = \
 	reference/mask.rgb24.ref.png \
 	reference/mask.svg.argb32.xfail.png \
 	reference/mask.svg.rgb24.xfail.png \
+	reference/mask.traps.argb32.ref.png \
+	reference/mask.traps.rgb24.ref.png \
 	reference/mask.xlib.ref.png \
 	reference/mask.xlib.rgb24.ref.png \
 	reference/mesh-pattern-accuracy.base.argb32.ref.png \
 	reference/mesh-pattern-accuracy.base.rgb24.ref.png \
 	reference/mesh-pattern-accuracy.image16.ref.png \
 	reference/mesh-pattern-accuracy.ref.png \
+	reference/mesh-pattern-accuracy.traps.argb32.ref.png \
+	reference/mesh-pattern-accuracy.traps.rgb24.ref.png \
 	reference/mesh-pattern-conical.base.argb32.ref.png \
 	reference/mesh-pattern-conical.base.rgb24.ref.png \
 	reference/mesh-pattern-conical.image16.ref.png \
 	reference/mesh-pattern-conical.ref.png \
+	reference/mesh-pattern-conical.traps.argb32.ref.png \
+	reference/mesh-pattern-conical.traps.rgb24.ref.png \
 	reference/mesh-pattern-control-points.base.argb32.ref.png \
 	reference/mesh-pattern-control-points.base.rgb24.ref.png \
 	reference/mesh-pattern-control-points.image16.ref.png \
 	reference/mesh-pattern-control-points.ref.png \
+	reference/mesh-pattern-control-points.traps.argb32.ref.png \
+	reference/mesh-pattern-control-points.traps.rgb24.ref.png \
 	reference/mesh-pattern-fold.base.argb32.ref.png \
 	reference/mesh-pattern-fold.base.rgb24.ref.png \
 	reference/mesh-pattern-fold.image16.ref.png \
 	reference/mesh-pattern-fold.ref.png \
+	reference/mesh-pattern-fold.traps.argb32.ref.png \
+	reference/mesh-pattern-fold.traps.rgb24.ref.png \
 	reference/mesh-pattern-overlap.base.argb32.ref.png \
 	reference/mesh-pattern-overlap.base.rgb24.ref.png \
 	reference/mesh-pattern-overlap.image16.ref.png \
 	reference/mesh-pattern-overlap.ref.png \
+	reference/mesh-pattern-overlap.traps.argb32.ref.png \
+	reference/mesh-pattern-overlap.traps.rgb24.ref.png \
 	reference/mesh-pattern-transformed.base.argb32.ref.png \
 	reference/mesh-pattern-transformed.base.rgb24.ref.png \
 	reference/mesh-pattern-transformed.image16.ref.png \
 	reference/mesh-pattern-transformed.ref.png \
+	reference/mesh-pattern-transformed.traps.argb32.ref.png \
+	reference/mesh-pattern-transformed.traps.rgb24.ref.png \
 	reference/mesh-pattern.base.argb32.ref.png \
 	reference/mesh-pattern.base.rgb24.ref.png \
 	reference/mesh-pattern.image16.ref.png \
 	reference/mesh-pattern.ref.png \
+	reference/mesh-pattern.traps.argb32.ref.png \
+	reference/mesh-pattern.traps.rgb24.ref.png \
 	reference/mime-data.base.argb32.ref.png \
 	reference/mime-data.base.rgb24.ref.png \
 	reference/mime-data.pdf.ref.png \
@@ -1247,17 +1670,25 @@ REFERENCE_IMAGES = \
 	reference/mime-data.ref.png \
 	reference/mime-data.script.ref.png \
 	reference/mime-data.svg.ref.png \
+	reference/mime-data.traps.argb32.ref.png \
+	reference/mime-data.traps.rgb24.ref.png \
 	reference/mime-surface.base.argb32.ref.png \
 	reference/mime-surface.base.rgb24.ref.png \
 	reference/mime-surface.ref.png \
+	reference/mime-surface.traps.argb32.ref.png \
+	reference/mime-surface.traps.rgb24.ref.png \
 	reference/miter-precision.base.argb32.ref.png \
 	reference/miter-precision.base.rgb24.ref.png \
 	reference/miter-precision.ps2.ref.png \
 	reference/miter-precision.ps3.ref.png \
 	reference/miter-precision.ref.png \
+	reference/miter-precision.traps.argb32.ref.png \
+	reference/miter-precision.traps.rgb24.ref.png \
 	reference/move-to-show-surface.base.argb32.ref.png \
 	reference/move-to-show-surface.base.rgb24.ref.png \
 	reference/move-to-show-surface.ref.png \
+	reference/move-to-show-surface.traps.argb32.ref.png \
+	reference/move-to-show-surface.traps.rgb24.ref.png \
 	reference/new-sub-path.argb32.ref.png \
 	reference/new-sub-path.base.argb32.ref.png \
 	reference/new-sub-path.base.rgb24.ref.png \
@@ -1268,10 +1699,14 @@ REFERENCE_IMAGES = \
 	reference/new-sub-path.ps3.rgb24.ref.png \
 	reference/new-sub-path.quartz.ref.png \
 	reference/new-sub-path.rgb24.ref.png \
+	reference/new-sub-path.traps.argb32.ref.png \
+	reference/new-sub-path.traps.rgb24.ref.png \
 	reference/nil-surface.base.argb32.ref.png \
 	reference/nil-surface.base.rgb24.ref.png \
 	reference/nil-surface.ref.png \
 	reference/nil-surface.rgb24.ref.png \
+	reference/nil-surface.traps.argb32.ref.png \
+	reference/nil-surface.traps.rgb24.ref.png \
 	reference/operator-alpha-alpha.base.argb32.ref.png \
 	reference/operator-alpha-alpha.base.rgb24.ref.png \
 	reference/operator-alpha-alpha.image16.ref.png \
@@ -1279,12 +1714,16 @@ REFERENCE_IMAGES = \
 	reference/operator-alpha-alpha.ps.xfail.png \
 	reference/operator-alpha-alpha.ref.png \
 	reference/operator-alpha-alpha.svg.xfail.png \
+	reference/operator-alpha-alpha.traps.argb32.ref.png \
+	reference/operator-alpha-alpha.traps.rgb24.ref.png \
 	reference/operator-alpha.base.argb32.ref.png \
 	reference/operator-alpha.base.rgb24.ref.png \
 	reference/operator-alpha.ref.png \
 	reference/operator-alpha.rgb24.ref.png \
 	reference/operator-alpha.svg12.argb32.xfail.png \
 	reference/operator-alpha.svg12.rgb24.xfail.png \
+	reference/operator-alpha.traps.argb32.ref.png \
+	reference/operator-alpha.traps.rgb24.ref.png \
 	reference/operator-clear.argb32.ref.png \
 	reference/operator-clear.base.argb32.ref.png \
 	reference/operator-clear.base.rgb24.ref.png \
@@ -1295,6 +1734,8 @@ REFERENCE_IMAGES = \
 	reference/operator-clear.rgb24.ref.png \
 	reference/operator-clear.svg12.argb32.xfail.png \
 	reference/operator-clear.svg12.rgb24.xfail.png \
+	reference/operator-clear.traps.argb32.ref.png \
+	reference/operator-clear.traps.rgb24.ref.png \
 	reference/operator-clear.xlib.argb32.ref.png \
 	reference/operator-clear.xlib.rgb24.ref.png \
 	reference/operator-source.base.argb32.ref.png \
@@ -1302,6 +1743,8 @@ REFERENCE_IMAGES = \
 	reference/operator-source.image16.ref.png \
 	reference/operator-source.ref.png \
 	reference/operator-source.rgb24.ref.png \
+	reference/operator-source.traps.argb32.ref.png \
+	reference/operator-source.traps.rgb24.ref.png \
 	reference/operator-source.xlib-fallback.ref.png \
 	reference/operator-source.xlib.ref.png \
 	reference/operator-source.xlib.rgb24.ref.png \
@@ -1311,6 +1754,8 @@ REFERENCE_IMAGES = \
 	reference/operator.rgb24.ref.png \
 	reference/operator.svg12.argb32.xfail.png \
 	reference/operator.svg12.rgb24.xfail.png \
+	reference/operator.traps.argb32.ref.png \
+	reference/operator.traps.rgb24.ref.png \
 	reference/over-above-source.base.argb32.ref.png \
 	reference/over-above-source.base.rgb24.ref.png \
 	reference/over-above-source.ps2.argb32.ref.png \
@@ -1320,6 +1765,8 @@ REFERENCE_IMAGES = \
 	reference/over-above-source.ref.png \
 	reference/over-above-source.rgb24.ref.png \
 	reference/over-above-source.svg12.rgb24.xfail.png \
+	reference/over-above-source.traps.argb32.ref.png \
+	reference/over-above-source.traps.rgb24.ref.png \
 	reference/over-above-source.xlib.ref.png \
 	reference/over-above-source.xlib.rgb24.ref.png \
 	reference/over-around-source.base.argb32.ref.png \
@@ -1335,6 +1782,8 @@ REFERENCE_IMAGES = \
 	reference/over-around-source.rgb24.ref.png \
 	reference/over-around-source.svg12.argb32.xfail.png \
 	reference/over-around-source.svg12.rgb24.xfail.png \
+	reference/over-around-source.traps.argb32.ref.png \
+	reference/over-around-source.traps.rgb24.ref.png \
 	reference/over-around-source.xlib.ref.png \
 	reference/over-around-source.xlib.rgb24.ref.png \
 	reference/over-below-source.base.argb32.ref.png \
@@ -1348,6 +1797,8 @@ REFERENCE_IMAGES = \
 	reference/over-below-source.rgb24.ref.png \
 	reference/over-below-source.svg12.argb32.xfail.png \
 	reference/over-below-source.svg12.rgb24.xfail.png \
+	reference/over-below-source.traps.argb32.ref.png \
+	reference/over-below-source.traps.rgb24.ref.png \
 	reference/over-between-source.base.argb32.ref.png \
 	reference/over-between-source.base.rgb24.ref.png \
 	reference/over-between-source.ps2.argb32.ref.png \
@@ -1357,15 +1808,21 @@ REFERENCE_IMAGES = \
 	reference/over-between-source.rgb24.ref.png \
 	reference/over-between-source.svg12.argb32.xfail.png \
 	reference/over-between-source.svg12.rgb24.xfail.png \
+	reference/over-between-source.traps.argb32.ref.png \
+	reference/over-between-source.traps.rgb24.ref.png \
 	reference/over-between-source.xlib.ref.png \
 	reference/over-between-source.xlib.rgb24.ref.png \
 	reference/overlapping-boxes.argb32.ref.png \
 	reference/overlapping-boxes.base.argb32.ref.png \
 	reference/overlapping-boxes.base.rgb24.ref.png \
 	reference/overlapping-boxes.rgb24.ref.png \
+	reference/overlapping-boxes.traps.argb32.ref.png \
+	reference/overlapping-boxes.traps.rgb24.ref.png \
 	reference/overlapping-dash-caps.base.argb32.ref.png \
 	reference/overlapping-dash-caps.base.rgb24.ref.png \
 	reference/overlapping-dash-caps.ref.png \
+	reference/overlapping-dash-caps.traps.argb32.ref.png \
+	reference/overlapping-dash-caps.traps.rgb24.ref.png \
 	reference/overlapping-glyphs.argb32.ref.png \
 	reference/overlapping-glyphs.base.argb32.ref.png \
 	reference/overlapping-glyphs.base.rgb24.ref.png \
@@ -1376,56 +1833,86 @@ REFERENCE_IMAGES = \
 	reference/overlapping-glyphs.rgb24.ref.png \
 	reference/overlapping-glyphs.svg.argb32.ref.png \
 	reference/overlapping-glyphs.svg.rgb24.ref.png \
+	reference/overlapping-glyphs.traps.argb32.ref.png \
+	reference/overlapping-glyphs.traps.rgb24.ref.png \
 	reference/paint-clip-fill-aa.base.argb32.ref.png \
 	reference/paint-clip-fill-aa.base.rgb24.ref.png \
 	reference/paint-clip-fill-aa.ref.png \
+	reference/paint-clip-fill-aa.traps.argb32.ref.png \
+	reference/paint-clip-fill-aa.traps.rgb24.ref.png \
 	reference/paint-clip-fill-mono.base.argb32.ref.png \
 	reference/paint-clip-fill-mono.base.rgb24.ref.png \
 	reference/paint-clip-fill-mono.ref.png \
+	reference/paint-clip-fill-mono.traps.argb32.ref.png \
+	reference/paint-clip-fill-mono.traps.rgb24.ref.png \
 	reference/paint-repeat.base.argb32.ref.png \
 	reference/paint-repeat.base.rgb24.ref.png \
 	reference/paint-repeat.ref.png \
+	reference/paint-repeat.traps.argb32.ref.png \
+	reference/paint-repeat.traps.rgb24.ref.png \
 	reference/paint-source-alpha.base.argb32.ref.png \
 	reference/paint-source-alpha.base.rgb24.ref.png \
 	reference/paint-source-alpha.image16.ref.png \
 	reference/paint-source-alpha.ref.png \
 	reference/paint-source-alpha.svg.ref.png \
+	reference/paint-source-alpha.traps.argb32.ref.png \
+	reference/paint-source-alpha.traps.rgb24.ref.png \
 	reference/paint-with-alpha-clip-mask.base.argb32.ref.png \
 	reference/paint-with-alpha-clip-mask.base.rgb24.ref.png \
 	reference/paint-with-alpha-clip-mask.ref.png \
+	reference/paint-with-alpha-clip-mask.traps.argb32.ref.png \
+	reference/paint-with-alpha-clip-mask.traps.rgb24.ref.png \
 	reference/paint-with-alpha-clip.base.argb32.ref.png \
 	reference/paint-with-alpha-clip.base.rgb24.ref.png \
 	reference/paint-with-alpha-clip.ref.png \
+	reference/paint-with-alpha-clip.traps.argb32.ref.png \
+	reference/paint-with-alpha-clip.traps.rgb24.ref.png \
 	reference/paint-with-alpha-clip.xlib.ref.png \
 	reference/paint-with-alpha-solid-clip.base.argb32.ref.png \
 	reference/paint-with-alpha-solid-clip.base.rgb24.ref.png \
 	reference/paint-with-alpha-solid-clip.ref.png \
+	reference/paint-with-alpha-solid-clip.traps.argb32.ref.png \
+	reference/paint-with-alpha-solid-clip.traps.rgb24.ref.png \
 	reference/paint-with-alpha.base.argb32.ref.png \
 	reference/paint-with-alpha.base.rgb24.ref.png \
 	reference/paint-with-alpha.image16.ref.png \
 	reference/paint-with-alpha.ref.png \
 	reference/paint-with-alpha.svg.ref.png \
+	reference/paint-with-alpha.traps.argb32.ref.png \
+	reference/paint-with-alpha.traps.rgb24.ref.png \
 	reference/paint.base.argb32.ref.png \
 	reference/paint.base.rgb24.ref.png \
 	reference/paint.ref.png \
+	reference/paint.traps.argb32.ref.png \
+	reference/paint.traps.rgb24.ref.png \
 	reference/partial-clip-text-bottom.base.argb32.ref.png \
 	reference/partial-clip-text-bottom.base.rgb24.ref.png \
 	reference/partial-clip-text-bottom.ref.png \
+	reference/partial-clip-text-bottom.traps.argb32.ref.png \
+	reference/partial-clip-text-bottom.traps.rgb24.ref.png \
 	reference/partial-clip-text-left.base.argb32.ref.png \
 	reference/partial-clip-text-left.base.rgb24.ref.png \
 	reference/partial-clip-text-left.ref.png \
+	reference/partial-clip-text-left.traps.argb32.ref.png \
+	reference/partial-clip-text-left.traps.rgb24.ref.png \
 	reference/partial-clip-text-right.base.argb32.ref.png \
 	reference/partial-clip-text-right.base.rgb24.ref.png \
 	reference/partial-clip-text-right.ref.png \
+	reference/partial-clip-text-right.traps.argb32.ref.png \
+	reference/partial-clip-text-right.traps.rgb24.ref.png \
 	reference/partial-clip-text-top.base.argb32.ref.png \
 	reference/partial-clip-text-top.base.rgb24.ref.png \
 	reference/partial-clip-text-top.ps.ref.png \
 	reference/partial-clip-text-top.quartz.ref.png \
 	reference/partial-clip-text-top.ref.png \
 	reference/partial-clip-text-top.svg.ref.png \
+	reference/partial-clip-text-top.traps.argb32.ref.png \
+	reference/partial-clip-text-top.traps.rgb24.ref.png \
 	reference/partial-coverage-half-reference.base.argb32.ref.png \
 	reference/partial-coverage-half-reference.base.rgb24.ref.png \
 	reference/partial-coverage-half-reference.ref.png \
+	reference/partial-coverage-half-reference.traps.argb32.ref.png \
+	reference/partial-coverage-half-reference.traps.rgb24.ref.png \
 	reference/partial-coverage-half-triangles.ref.png \
 	reference/partial-coverage-intersecting-quads.ref.png \
 	reference/partial-coverage-intersecting-quads.xfail.png \
@@ -1437,9 +1924,13 @@ REFERENCE_IMAGES = \
 	reference/partial-coverage-reference.base.argb32.ref.png \
 	reference/partial-coverage-reference.base.rgb24.ref.png \
 	reference/partial-coverage-reference.ref.png \
+	reference/partial-coverage-reference.traps.argb32.ref.png \
+	reference/partial-coverage-reference.traps.rgb24.ref.png \
 	reference/partial-coverage-three-quarter-reference.base.argb32.ref.png \
 	reference/partial-coverage-three-quarter-reference.base.rgb24.ref.png \
 	reference/partial-coverage-three-quarter-reference.ref.png \
+	reference/partial-coverage-three-quarter-reference.traps.argb32.ref.png \
+	reference/partial-coverage-three-quarter-reference.traps.rgb24.ref.png \
 	reference/partial-coverage-triangles.ref.png \
 	reference/pass-through.ref.png \
 	reference/pass-through.rgb24.ref.png \
@@ -1450,6 +1941,8 @@ REFERENCE_IMAGES = \
 	reference/path-append.quartz.ref.png \
 	reference/path-append.ref.png \
 	reference/path-append.test-fallback.ref.png \
+	reference/path-append.traps.argb32.ref.png \
+	reference/path-append.traps.rgb24.ref.png \
 	reference/path-append.xlib-fallback.ref.png \
 	reference/path-append.xlib.ref.png \
 	reference/path-stroke-twice.base.argb32.ref.png \
@@ -1457,9 +1950,13 @@ REFERENCE_IMAGES = \
 	reference/path-stroke-twice.image16.ref.png \
 	reference/path-stroke-twice.ps.ref.png \
 	reference/path-stroke-twice.ref.png \
+	reference/path-stroke-twice.traps.argb32.ref.png \
+	reference/path-stroke-twice.traps.rgb24.ref.png \
 	reference/pattern-getters.base.argb32.ref.png \
 	reference/pattern-getters.base.rgb24.ref.png \
 	reference/pattern-getters.ref.png \
+	reference/pattern-getters.traps.argb32.ref.png \
+	reference/pattern-getters.traps.rgb24.ref.png \
 	reference/pdf-surface-source.argb32.ref.png \
 	reference/pdf-surface-source.base.argb32.ref.png \
 	reference/pdf-surface-source.base.rgb24.ref.png \
@@ -1467,11 +1964,15 @@ REFERENCE_IMAGES = \
 	reference/pdf-surface-source.rgb24.ref.png \
 	reference/pdf-surface-source.svg12.argb32.xfail.png \
 	reference/pdf-surface-source.svg12.rgb24.xfail.png \
+	reference/pdf-surface-source.traps.argb32.ref.png \
+	reference/pdf-surface-source.traps.rgb24.ref.png \
 	reference/pixman-rotate.base.argb32.ref.png \
 	reference/pixman-rotate.base.rgb24.ref.png \
 	reference/pixman-rotate.ps.argb32.ref.png \
 	reference/pixman-rotate.ref.png \
 	reference/pixman-rotate.rgb24.ref.png \
+	reference/pixman-rotate.traps.argb32.ref.png \
+	reference/pixman-rotate.traps.rgb24.ref.png \
 	reference/ps-eps.ref.png \
 	reference/ps-surface-source.argb32.ref.png \
 	reference/ps-surface-source.base.argb32.ref.png \
@@ -1480,11 +1981,15 @@ REFERENCE_IMAGES = \
 	reference/ps-surface-source.rgb24.ref.png \
 	reference/ps-surface-source.svg12.argb32.xfail.png \
 	reference/ps-surface-source.svg12.rgb24.xfail.png \
+	reference/ps-surface-source.traps.argb32.ref.png \
+	reference/ps-surface-source.traps.rgb24.ref.png \
 	reference/pthread-same-source.base.argb32.ref.png \
 	reference/pthread-same-source.base.rgb24.ref.png \
 	reference/pthread-same-source.image16.ref.png \
 	reference/pthread-same-source.quartz.xfail.png \
 	reference/pthread-same-source.ref.png \
+	reference/pthread-same-source.traps.argb32.ref.png \
+	reference/pthread-same-source.traps.rgb24.ref.png \
 	reference/pthread-show-text.base.argb32.ref.png \
 	reference/pthread-show-text.base.rgb24.ref.png \
 	reference/pthread-show-text.image16.ref.png \
@@ -1492,10 +1997,14 @@ REFERENCE_IMAGES = \
 	reference/pthread-show-text.ps.ref.png \
 	reference/pthread-show-text.quartz.ref.png \
 	reference/pthread-show-text.ref.png \
+	reference/pthread-show-text.traps.argb32.ref.png \
+	reference/pthread-show-text.traps.rgb24.ref.png \
 	reference/pthread-show-text.xlib-fallback.ref.png \
 	reference/pthread-similar.base.argb32.ref.png \
 	reference/pthread-similar.base.rgb24.ref.png \
 	reference/pthread-similar.ref.png \
+	reference/pthread-similar.traps.argb32.ref.png \
+	reference/pthread-similar.traps.rgb24.ref.png \
 	reference/push-group-color.base.argb32.ref.png \
 	reference/push-group-color.base.rgb24.ref.png \
 	reference/push-group-color.image16.ref.png \
@@ -1503,10 +2012,14 @@ REFERENCE_IMAGES = \
 	reference/push-group-color.ps3.ref.png \
 	reference/push-group-color.quartz.ref.png \
 	reference/push-group-color.ref.png \
+	reference/push-group-color.traps.argb32.ref.png \
+	reference/push-group-color.traps.rgb24.ref.png \
 	reference/push-group-color.xlib.ref.png \
 	reference/push-group-path-offset.base.argb32.ref.png \
 	reference/push-group-path-offset.base.rgb24.ref.png \
 	reference/push-group-path-offset.ref.png \
+	reference/push-group-path-offset.traps.argb32.ref.png \
+	reference/push-group-path-offset.traps.rgb24.ref.png \
 	reference/push-group.base.argb32.ref.png \
 	reference/push-group.base.rgb24.ref.png \
 	reference/push-group.image16.ref.png \
@@ -1514,6 +2027,8 @@ REFERENCE_IMAGES = \
 	reference/push-group.quartz.rgb24.ref.png \
 	reference/push-group.ref.png \
 	reference/push-group.rgb24.ref.png \
+	reference/push-group.traps.argb32.ref.png \
+	reference/push-group.traps.rgb24.ref.png \
 	reference/push-group.xlib.ref.png \
 	reference/push-group.xlib.rgb24.ref.png \
 	reference/quartz-surface-source.argb32.ref.png \
@@ -1524,13 +2039,16 @@ REFERENCE_IMAGES = \
 	reference/radial-gradient-extend.base.rgb24.ref.png \
 	reference/radial-gradient-extend.ps3.ref.png \
 	reference/radial-gradient-extend.ref.png \
+	reference/radial-gradient-extend.traps.argb32.ref.png \
+	reference/radial-gradient-extend.traps.rgb24.ref.png \
 	reference/radial-gradient-mask-source.argb32.ref.png \
 	reference/radial-gradient-mask-source.base.argb32.ref.png \
 	reference/radial-gradient-mask-source.base.rgb24.ref.png \
 	reference/radial-gradient-mask-source.image16.ref.png \
 	reference/radial-gradient-mask-source.quartz.argb32.ref.png \
 	reference/radial-gradient-mask-source.quartz.rgb24.ref.png \
-	reference/radial-gradient-mask-source.rgb24.ref.png \
+	reference/radial-gradient-mask-source.traps.argb32.ref.png \
+	reference/radial-gradient-mask-source.traps.rgb24.ref.png \
 	reference/radial-gradient-mask-source.xlib.argb32.ref.png \
 	reference/radial-gradient-mask-source.xlib.rgb24.ref.png \
 	reference/radial-gradient-mask.base.argb32.ref.png \
@@ -1538,10 +2056,14 @@ REFERENCE_IMAGES = \
 	reference/radial-gradient-mask.image16.ref.png \
 	reference/radial-gradient-mask.quartz.ref.png \
 	reference/radial-gradient-mask.ref.png \
+	reference/radial-gradient-mask.traps.argb32.ref.png \
+	reference/radial-gradient-mask.traps.rgb24.ref.png \
 	reference/radial-gradient-one-stop.base.argb32.ref.png \
 	reference/radial-gradient-one-stop.base.rgb24.ref.png \
 	reference/radial-gradient-one-stop.quartz.ref.png \
 	reference/radial-gradient-one-stop.ref.png \
+	reference/radial-gradient-one-stop.traps.argb32.ref.png \
+	reference/radial-gradient-one-stop.traps.rgb24.ref.png \
 	reference/radial-gradient-source.argb32.ref.png \
 	reference/radial-gradient-source.base.argb32.ref.png \
 	reference/radial-gradient-source.base.rgb24.ref.png \
@@ -1549,14 +2071,20 @@ REFERENCE_IMAGES = \
 	reference/radial-gradient-source.quartz.argb32.ref.png \
 	reference/radial-gradient-source.quartz.rgb24.ref.png \
 	reference/radial-gradient-source.rgb24.ref.png \
+	reference/radial-gradient-source.traps.argb32.ref.png \
+	reference/radial-gradient-source.traps.rgb24.ref.png \
 	reference/radial-gradient.base.argb32.ref.png \
 	reference/radial-gradient.base.rgb24.ref.png \
 	reference/radial-gradient.image16.ref.png \
 	reference/radial-gradient.quartz.ref.png \
 	reference/radial-gradient.ref.png \
+	reference/radial-gradient.traps.argb32.ref.png \
+	reference/radial-gradient.traps.rgb24.ref.png \
 	reference/random-clip.base.argb32.ref.png \
 	reference/random-clip.base.rgb24.ref.png \
 	reference/random-clip.ref.png \
+	reference/random-clip.traps.argb32.ref.png \
+	reference/random-clip.traps.rgb24.ref.png \
 	reference/random-intersections-curves-eo.base.argb32.ref.png \
 	reference/random-intersections-curves-eo.base.rgb24.ref.png \
 	reference/random-intersections-curves-eo.image16.ref.png \
@@ -1564,6 +2092,8 @@ REFERENCE_IMAGES = \
 	reference/random-intersections-curves-eo.ps.ref.png \
 	reference/random-intersections-curves-eo.quartz.ref.png \
 	reference/random-intersections-curves-eo.ref.png \
+	reference/random-intersections-curves-eo.traps.argb32.ref.png \
+	reference/random-intersections-curves-eo.traps.rgb24.ref.png \
 	reference/random-intersections-curves-eo.xlib-fallback.ref.png \
 	reference/random-intersections-curves-eo.xlib.ref.png \
 	reference/random-intersections-curves-nz.base.argb32.ref.png \
@@ -1573,6 +2103,8 @@ REFERENCE_IMAGES = \
 	reference/random-intersections-curves-nz.ps.ref.png \
 	reference/random-intersections-curves-nz.quartz.ref.png \
 	reference/random-intersections-curves-nz.ref.png \
+	reference/random-intersections-curves-nz.traps.argb32.ref.png \
+	reference/random-intersections-curves-nz.traps.rgb24.ref.png \
 	reference/random-intersections-curves-nz.xlib-fallback.ref.png \
 	reference/random-intersections-curves-nz.xlib.ref.png \
 	reference/random-intersections-eo.base.argb32.ref.png \
@@ -1581,6 +2113,8 @@ REFERENCE_IMAGES = \
 	reference/random-intersections-eo.ps.ref.png \
 	reference/random-intersections-eo.quartz.ref.png \
 	reference/random-intersections-eo.ref.png \
+	reference/random-intersections-eo.traps.argb32.ref.png \
+	reference/random-intersections-eo.traps.rgb24.ref.png \
 	reference/random-intersections-eo.xlib.ref.png \
 	reference/random-intersections-nonzero.base.argb32.ref.png \
 	reference/random-intersections-nonzero.base.rgb24.ref.png \
@@ -1588,22 +2122,54 @@ REFERENCE_IMAGES = \
 	reference/random-intersections-nonzero.ps.ref.png \
 	reference/random-intersections-nonzero.quartz.ref.png \
 	reference/random-intersections-nonzero.ref.png \
+	reference/random-intersections-nonzero.traps.argb32.ref.png \
+	reference/random-intersections-nonzero.traps.rgb24.ref.png \
 	reference/random-intersections-nonzero.xlib.ref.png \
 	reference/record-extend-none-similar.ref.png \
+	reference/record-extend-none-similar.traps.argb32.ref.png \
+	reference/record-extend-none-similar.traps.rgb24.ref.png \
 	reference/record-extend-none.ref.png \
+	reference/record-extend-none.traps.argb32.ref.png \
+	reference/record-extend-none.traps.rgb24.ref.png \
 	reference/record-extend-pad-similar.ref.png \
+	reference/record-extend-pad-similar.traps.argb32.ref.png \
+	reference/record-extend-pad-similar.traps.rgb24.ref.png \
 	reference/record-extend-pad.ref.png \
+	reference/record-extend-pad.traps.argb32.ref.png \
+	reference/record-extend-pad.traps.rgb24.ref.png \
 	reference/record-extend-reflect-similar.ref.png \
+	reference/record-extend-reflect-similar.traps.argb32.ref.png \
+	reference/record-extend-reflect-similar.traps.rgb24.ref.png \
 	reference/record-extend-reflect.ref.png \
+	reference/record-extend-reflect.traps.argb32.ref.png \
+	reference/record-extend-reflect.traps.rgb24.ref.png \
 	reference/record-extend-repeat-similar.ref.png \
+	reference/record-extend-repeat-similar.traps.argb32.ref.png \
+	reference/record-extend-repeat-similar.traps.rgb24.ref.png \
 	reference/record-extend-repeat.ref.png \
+	reference/record-extend-repeat.traps.argb32.ref.png \
+	reference/record-extend-repeat.traps.rgb24.ref.png \
 	reference/record-fill-alpha.ref.png \
+	reference/record-fill-alpha.traps.argb32.ref.png \
+	reference/record-fill-alpha.traps.rgb24.ref.png \
 	reference/record-mesh.ref.png \
+	reference/record-mesh.traps.argb32.ref.png \
+	reference/record-mesh.traps.rgb24.ref.png \
 	reference/record-paint-alpha-clip-mask.ref.png \
+	reference/record-paint-alpha-clip-mask.traps.argb32.ref.png \
+	reference/record-paint-alpha-clip-mask.traps.rgb24.ref.png \
 	reference/record-paint-alpha-clip.ref.png \
+	reference/record-paint-alpha-clip.traps.argb32.ref.png \
+	reference/record-paint-alpha-clip.traps.rgb24.ref.png \
 	reference/record-paint-alpha-solid-clip.ref.png \
+	reference/record-paint-alpha-solid-clip.traps.argb32.ref.png \
+	reference/record-paint-alpha-solid-clip.traps.rgb24.ref.png \
 	reference/record-paint-alpha.ref.png \
+	reference/record-paint-alpha.traps.argb32.ref.png \
+	reference/record-paint-alpha.traps.rgb24.ref.png \
 	reference/record-paint.ref.png \
+	reference/record-paint.traps.argb32.ref.png \
+	reference/record-paint.traps.rgb24.ref.png \
 	reference/record-select-font-face.ref.png \
 	reference/record-self-intersecting.ref.png \
 	reference/record-text-transform.ref.png \
@@ -1611,18 +2177,26 @@ REFERENCE_IMAGES = \
 	reference/recording-surface-extend-none.base.argb32.ref.png \
 	reference/recording-surface-extend-none.base.rgb24.ref.png \
 	reference/recording-surface-extend-none.rgb24.ref.png \
+	reference/recording-surface-extend-none.traps.argb32.ref.png \
+	reference/recording-surface-extend-none.traps.rgb24.ref.png \
 	reference/recording-surface-extend-pad.argb32.ref.png \
 	reference/recording-surface-extend-pad.base.argb32.ref.png \
 	reference/recording-surface-extend-pad.base.rgb24.ref.png \
 	reference/recording-surface-extend-pad.rgb24.ref.png \
+	reference/recording-surface-extend-pad.traps.argb32.ref.png \
+	reference/recording-surface-extend-pad.traps.rgb24.ref.png \
 	reference/recording-surface-extend-reflect.argb32.ref.png \
 	reference/recording-surface-extend-reflect.base.argb32.ref.png \
 	reference/recording-surface-extend-reflect.base.rgb24.ref.png \
 	reference/recording-surface-extend-reflect.rgb24.ref.png \
+	reference/recording-surface-extend-reflect.traps.argb32.ref.png \
+	reference/recording-surface-extend-reflect.traps.rgb24.ref.png \
 	reference/recording-surface-extend-repeat.argb32.ref.png \
 	reference/recording-surface-extend-repeat.base.argb32.ref.png \
 	reference/recording-surface-extend-repeat.base.rgb24.ref.png \
 	reference/recording-surface-extend-repeat.rgb24.ref.png \
+	reference/recording-surface-extend-repeat.traps.argb32.ref.png \
+	reference/recording-surface-extend-repeat.traps.rgb24.ref.png \
 	reference/recording-surface-over.base.argb32.ref.png \
 	reference/recording-surface-over.base.rgb24.ref.png \
 	reference/recording-surface-over.gl.argb32.ref.png \
@@ -1637,52 +2211,76 @@ REFERENCE_IMAGES = \
 	reference/recording-surface-over.rgb24.ref.png \
 	reference/recording-surface-over.svg.argb32.ref.png \
 	reference/recording-surface-over.svg.rgb24.ref.png \
+	reference/recording-surface-over.traps.argb32.ref.png \
+	reference/recording-surface-over.traps.rgb24.ref.png \
 	reference/recording-surface-over.xlib.argb32.ref.png \
 	reference/recording-surface-over.xlib.rgb24.ref.png \
 	reference/recording-surface-source.argb32.ref.png \
 	reference/recording-surface-source.base.argb32.ref.png \
 	reference/recording-surface-source.base.rgb24.ref.png \
 	reference/recording-surface-source.rgb24.ref.png \
+	reference/recording-surface-source.traps.argb32.ref.png \
+	reference/recording-surface-source.traps.rgb24.ref.png \
 	reference/rectangle-rounding-error.base.argb32.ref.png \
 	reference/rectangle-rounding-error.base.rgb24.ref.png \
 	reference/rectangle-rounding-error.ref.png \
+	reference/rectangle-rounding-error.traps.argb32.ref.png \
+	reference/rectangle-rounding-error.traps.rgb24.ref.png \
 	reference/rectilinear-dash.base.argb32.ref.png \
 	reference/rectilinear-dash.base.rgb24.ref.png \
 	reference/rectilinear-dash.quartz.xfail.png \
 	reference/rectilinear-dash.ref.png \
+	reference/rectilinear-dash.traps.argb32.ref.png \
+	reference/rectilinear-dash.traps.rgb24.ref.png \
 	reference/rectilinear-fill.base.argb32.ref.png \
 	reference/rectilinear-fill.base.rgb24.ref.png \
 	reference/rectilinear-fill.ref.png \
+	reference/rectilinear-fill.traps.argb32.ref.png \
+	reference/rectilinear-fill.traps.rgb24.ref.png \
 	reference/rectilinear-grid.base.argb32.ref.png \
 	reference/rectilinear-grid.base.rgb24.ref.png \
 	reference/rectilinear-grid.image16.ref.png \
 	reference/rectilinear-grid.ref.png \
+	reference/rectilinear-grid.traps.argb32.ref.png \
+	reference/rectilinear-grid.traps.rgb24.ref.png \
 	reference/rectilinear-miter-limit.base.argb32.ref.png \
 	reference/rectilinear-miter-limit.base.rgb24.ref.png \
 	reference/rectilinear-miter-limit.ps2.ref.png \
 	reference/rectilinear-miter-limit.ps3.ref.png \
 	reference/rectilinear-miter-limit.ref.png \
+	reference/rectilinear-miter-limit.traps.argb32.ref.png \
+	reference/rectilinear-miter-limit.traps.rgb24.ref.png \
 	reference/rectilinear-stroke.base.argb32.ref.png \
 	reference/rectilinear-stroke.base.rgb24.ref.png \
 	reference/rectilinear-stroke.quartz.xfail.png \
 	reference/rectilinear-stroke.ref.png \
+	reference/rectilinear-stroke.traps.argb32.ref.png \
+	reference/rectilinear-stroke.traps.rgb24.ref.png \
 	reference/reflected-stroke.base.argb32.ref.png \
 	reference/reflected-stroke.base.rgb24.ref.png \
 	reference/reflected-stroke.image16.ref.png \
 	reference/reflected-stroke.ps.ref.png \
 	reference/reflected-stroke.ref.png \
+	reference/reflected-stroke.traps.argb32.ref.png \
+	reference/reflected-stroke.traps.rgb24.ref.png \
 	reference/rel-path.base.argb32.ref.png \
 	reference/rel-path.base.rgb24.ref.png \
 	reference/rel-path.ps2.rgb24.ref.png \
 	reference/rel-path.ps3.rgb24.ref.png \
 	reference/rel-path.ref.png \
 	reference/rel-path.rgb24.ref.png \
+	reference/rel-path.traps.argb32.ref.png \
+	reference/rel-path.traps.rgb24.ref.png \
 	reference/rgb24-ignore-alpha.base.argb32.ref.png \
 	reference/rgb24-ignore-alpha.base.rgb24.ref.png \
 	reference/rgb24-ignore-alpha.ref.png \
+	reference/rgb24-ignore-alpha.traps.argb32.ref.png \
+	reference/rgb24-ignore-alpha.traps.rgb24.ref.png \
 	reference/rotate-clip-image-surface-paint.base.argb32.ref.png \
 	reference/rotate-clip-image-surface-paint.base.rgb24.ref.png \
 	reference/rotate-clip-image-surface-paint.ref.png \
+	reference/rotate-clip-image-surface-paint.traps.argb32.ref.png \
+	reference/rotate-clip-image-surface-paint.traps.rgb24.ref.png \
 	reference/rotate-image-surface-paint.base.argb32.ref.png \
 	reference/rotate-image-surface-paint.base.rgb24.ref.png \
 	reference/rotate-image-surface-paint.pdf.xfail.png \
@@ -1691,12 +2289,16 @@ REFERENCE_IMAGES = \
 	reference/rotate-image-surface-paint.ref.png \
 	reference/rotate-image-surface-paint.svg.ref.png \
 	reference/rotate-image-surface-paint.svg.xfail.png \
+	reference/rotate-image-surface-paint.traps.argb32.ref.png \
+	reference/rotate-image-surface-paint.traps.rgb24.ref.png \
 	reference/rotated-clip.base.argb32.ref.png \
 	reference/rotated-clip.base.rgb24.ref.png \
 	reference/rotated-clip.image16.ref.png \
 	reference/rotated-clip.ps.ref.png \
 	reference/rotated-clip.quartz.ref.png \
 	reference/rotated-clip.ref.png \
+	reference/rotated-clip.traps.argb32.ref.png \
+	reference/rotated-clip.traps.rgb24.ref.png \
 	reference/rotated-clip.xlib.ref.png \
 	reference/rounded-rectangle-fill.base.argb32.ref.png \
 	reference/rounded-rectangle-fill.base.rgb24.ref.png \
@@ -1704,16 +2306,22 @@ REFERENCE_IMAGES = \
 	reference/rounded-rectangle-fill.ps.ref.png \
 	reference/rounded-rectangle-fill.quartz.ref.png \
 	reference/rounded-rectangle-fill.ref.png \
+	reference/rounded-rectangle-fill.traps.argb32.ref.png \
+	reference/rounded-rectangle-fill.traps.rgb24.ref.png \
 	reference/rounded-rectangle-fill.xlib.ref.png \
 	reference/rounded-rectangle-stroke.base.argb32.ref.png \
 	reference/rounded-rectangle-stroke.base.rgb24.ref.png \
 	reference/rounded-rectangle-stroke.image16.ref.png \
 	reference/rounded-rectangle-stroke.ps.ref.png \
 	reference/rounded-rectangle-stroke.ref.png \
+	reference/rounded-rectangle-stroke.traps.argb32.ref.png \
+	reference/rounded-rectangle-stroke.traps.rgb24.ref.png \
 	reference/rounded-rectangle-stroke.xlib.ref.png \
 	reference/scale-down-source-surface-paint.base.argb32.ref.png \
 	reference/scale-down-source-surface-paint.base.rgb24.ref.png \
 	reference/scale-down-source-surface-paint.ref.png \
+	reference/scale-down-source-surface-paint.traps.argb32.ref.png \
+	reference/scale-down-source-surface-paint.traps.rgb24.ref.png \
 	reference/scale-offset-image.base.argb32.ref.png \
 	reference/scale-offset-image.base.rgb24.ref.png \
 	reference/scale-offset-image.gl.ref.png \
@@ -1724,6 +2332,8 @@ REFERENCE_IMAGES = \
 	reference/scale-offset-image.quartz.ref.png \
 	reference/scale-offset-image.ref.png \
 	reference/scale-offset-image.script.xfail.png \
+	reference/scale-offset-image.traps.argb32.ref.png \
+	reference/scale-offset-image.traps.rgb24.ref.png \
 	reference/scale-offset-image.xfail.png \
 	reference/scale-offset-image.xlib-fallback.xfail.png \
 	reference/scale-offset-image.xlib.ref.png \
@@ -1738,6 +2348,8 @@ REFERENCE_IMAGES = \
 	reference/scale-offset-similar.recording.xfail.png \
 	reference/scale-offset-similar.ref.png \
 	reference/scale-offset-similar.script.xfail.png \
+	reference/scale-offset-similar.traps.argb32.ref.png \
+	reference/scale-offset-similar.traps.rgb24.ref.png \
 	reference/scale-offset-similar.xfail.png \
 	reference/scale-offset-similar.xlib-fallback.xfail.png \
 	reference/scale-offset-similar.xlib.xfail.png \
@@ -1749,6 +2361,8 @@ REFERENCE_IMAGES = \
 	reference/scale-source-surface-paint.rgb24.ref.png \
 	reference/scale-source-surface-paint.svg.argb32.xfail.png \
 	reference/scale-source-surface-paint.svg.rgb24.xfail.png \
+	reference/scale-source-surface-paint.traps.argb32.ref.png \
+	reference/scale-source-surface-paint.traps.rgb24.ref.png \
 	reference/select-font-face.base.argb32.ref.png \
 	reference/select-font-face.base.rgb24.ref.png \
 	reference/select-font-face.image16.ref.png \
@@ -1756,29 +2370,43 @@ REFERENCE_IMAGES = \
 	reference/select-font-face.ps3.ref.png \
 	reference/select-font-face.quartz.ref.png \
 	reference/select-font-face.ref.png \
+	reference/select-font-face.traps.argb32.ref.png \
+	reference/select-font-face.traps.rgb24.ref.png \
 	reference/self-copy-overlap.base.argb32.ref.png \
 	reference/self-copy-overlap.base.rgb24.ref.png \
+	reference/self-copy-overlap.traps.argb32.ref.png \
+	reference/self-copy-overlap.traps.rgb24.ref.png \
 	reference/self-copy.base.argb32.ref.png \
 	reference/self-copy.base.rgb24.ref.png \
 	reference/self-copy.ps2.ref.png \
 	reference/self-copy.ps3.ref.png \
 	reference/self-copy.ref.png \
+	reference/self-copy.traps.argb32.ref.png \
+	reference/self-copy.traps.rgb24.ref.png \
 	reference/self-intersecting.base.argb32.ref.png \
 	reference/self-intersecting.base.rgb24.ref.png \
 	reference/self-intersecting.ps.ref.png \
 	reference/self-intersecting.quartz.xfail.png \
 	reference/self-intersecting.ref.png \
+	reference/self-intersecting.traps.argb32.ref.png \
+	reference/self-intersecting.traps.rgb24.ref.png \
 	reference/self-intersecting.xlib.ref.png \
 	reference/set-source.base.argb32.ref.png \
 	reference/set-source.base.rgb24.ref.png \
 	reference/set-source.ref.png \
 	reference/set-source.rgb24.ref.png \
+	reference/set-source.traps.argb32.ref.png \
+	reference/set-source.traps.rgb24.ref.png \
 	reference/shape-general-convex.base.argb32.ref.png \
 	reference/shape-general-convex.base.rgb24.ref.png \
 	reference/shape-general-convex.ref.png \
+	reference/shape-general-convex.traps.argb32.ref.png \
+	reference/shape-general-convex.traps.rgb24.ref.png \
 	reference/shape-sierpinski.base.argb32.ref.png \
 	reference/shape-sierpinski.base.rgb24.ref.png \
 	reference/shape-sierpinski.ref.png \
+	reference/shape-sierpinski.traps.argb32.ref.png \
+	reference/shape-sierpinski.traps.rgb24.ref.png \
 	reference/show-glyphs-advance.base.argb32.ref.png \
 	reference/show-glyphs-advance.base.rgb24.ref.png \
 	reference/show-glyphs-advance.image16.ref.png \
@@ -1786,9 +2414,13 @@ REFERENCE_IMAGES = \
 	reference/show-glyphs-advance.quartz.ref.png \
 	reference/show-glyphs-advance.ref.png \
 	reference/show-glyphs-advance.svg.ref.png \
+	reference/show-glyphs-advance.traps.argb32.ref.png \
+	reference/show-glyphs-advance.traps.rgb24.ref.png \
 	reference/show-glyphs-many.base.argb32.ref.png \
 	reference/show-glyphs-many.base.rgb24.ref.png \
 	reference/show-glyphs-many.ref.png \
+	reference/show-glyphs-many.traps.argb32.ref.png \
+	reference/show-glyphs-many.traps.rgb24.ref.png \
 	reference/show-text-current-point.base.argb32.ref.png \
 	reference/show-text-current-point.base.rgb24.ref.png \
 	reference/show-text-current-point.image16.ref.png \
@@ -1796,21 +2428,29 @@ REFERENCE_IMAGES = \
 	reference/show-text-current-point.ps3.ref.png \
 	reference/show-text-current-point.quartz.ref.png \
 	reference/show-text-current-point.ref.png \
+	reference/show-text-current-point.traps.argb32.ref.png \
+	reference/show-text-current-point.traps.rgb24.ref.png \
 	reference/skew-extreme.base.argb32.ref.png \
 	reference/skew-extreme.base.rgb24.ref.png \
 	reference/skew-extreme.ps2.ref.png \
 	reference/skew-extreme.ps3.ref.png \
 	reference/skew-extreme.ref.png \
+	reference/skew-extreme.traps.argb32.ref.png \
+	reference/skew-extreme.traps.rgb24.ref.png \
 	reference/smask-fill.base.argb32.ref.png \
 	reference/smask-fill.base.rgb24.ref.png \
 	reference/smask-fill.image16.ref.png \
 	reference/smask-fill.quartz.ref.png \
 	reference/smask-fill.ref.png \
 	reference/smask-fill.svg.ref.png \
+	reference/smask-fill.traps.argb32.ref.png \
+	reference/smask-fill.traps.rgb24.ref.png \
 	reference/smask-fill.xlib.ref.png \
 	reference/smask-image-mask.base.argb32.ref.png \
 	reference/smask-image-mask.base.rgb24.ref.png \
 	reference/smask-image-mask.ref.png \
+	reference/smask-image-mask.traps.argb32.ref.png \
+	reference/smask-image-mask.traps.rgb24.ref.png \
 	reference/smask-mask.base.argb32.ref.png \
 	reference/smask-mask.base.rgb24.ref.png \
 	reference/smask-mask.image16.ref.png \
@@ -1818,6 +2458,8 @@ REFERENCE_IMAGES = \
 	reference/smask-mask.quartz.ref.png \
 	reference/smask-mask.ref.png \
 	reference/smask-mask.svg.ref.png \
+	reference/smask-mask.traps.argb32.ref.png \
+	reference/smask-mask.traps.rgb24.ref.png \
 	reference/smask-paint.base.argb32.ref.png \
 	reference/smask-paint.base.rgb24.ref.png \
 	reference/smask-paint.image16.ref.png \
@@ -1825,12 +2467,16 @@ REFERENCE_IMAGES = \
 	reference/smask-paint.quartz.ref.png \
 	reference/smask-paint.ref.png \
 	reference/smask-paint.svg.ref.png \
+	reference/smask-paint.traps.argb32.ref.png \
+	reference/smask-paint.traps.rgb24.ref.png \
 	reference/smask-stroke.base.argb32.ref.png \
 	reference/smask-stroke.base.rgb24.ref.png \
 	reference/smask-stroke.image16.ref.png \
 	reference/smask-stroke.pdf.xfail.png \
 	reference/smask-stroke.quartz.ref.png \
 	reference/smask-stroke.ref.png \
+	reference/smask-stroke.traps.argb32.ref.png \
+	reference/smask-stroke.traps.rgb24.ref.png \
 	reference/smask-stroke.xlib.ref.png \
 	reference/smask-text.base.argb32.ref.png \
 	reference/smask-text.base.rgb24.ref.png \
@@ -1842,6 +2488,8 @@ REFERENCE_IMAGES = \
 	reference/smask-text.ref.png \
 	reference/smask-text.script.ref.png \
 	reference/smask-text.svg.ref.png \
+	reference/smask-text.traps.argb32.ref.png \
+	reference/smask-text.traps.rgb24.ref.png \
 	reference/smask-text.xlib-fallback.ref.png \
 	reference/smask-text.xlib.ref.png \
 	reference/smask.base.argb32.ref.png \
@@ -1853,11 +2501,15 @@ REFERENCE_IMAGES = \
 	reference/smask.ref.png \
 	reference/smask.script.ref.png \
 	reference/smask.svg.ref.png \
+	reference/smask.traps.argb32.ref.png \
+	reference/smask.traps.rgb24.ref.png \
 	reference/smask.xlib-fallback.ref.png \
 	reference/smask.xlib.ref.png \
 	reference/solid-pattern-cache-stress.base.argb32.ref.png \
 	reference/solid-pattern-cache-stress.base.rgb24.ref.png \
 	reference/solid-pattern-cache-stress.ref.png \
+	reference/solid-pattern-cache-stress.traps.argb32.ref.png \
+	reference/solid-pattern-cache-stress.traps.rgb24.ref.png \
 	reference/source-clip-scale.base.argb32.ref.png \
 	reference/source-clip-scale.base.rgb24.ref.png \
 	reference/source-clip-scale.gl.ref.png \
@@ -1869,13 +2521,19 @@ REFERENCE_IMAGES = \
 	reference/source-clip-scale.quartz.ref.png \
 	reference/source-clip-scale.ref.png \
 	reference/source-clip-scale.svg.ref.png \
+	reference/source-clip-scale.traps.argb32.ref.png \
+	reference/source-clip-scale.traps.rgb24.ref.png \
 	reference/source-clip.base.argb32.ref.png \
 	reference/source-clip.base.rgb24.ref.png \
 	reference/source-clip.ref.png \
+	reference/source-clip.traps.argb32.ref.png \
+	reference/source-clip.traps.rgb24.ref.png \
 	reference/source-surface-scale-paint.base.argb32.ref.png \
 	reference/source-surface-scale-paint.base.rgb24.ref.png \
 	reference/source-surface-scale-paint.ref.png \
 	reference/source-surface-scale-paint.rgb24.ref.png \
+	reference/source-surface-scale-paint.traps.argb32.ref.png \
+	reference/source-surface-scale-paint.traps.rgb24.ref.png \
 	reference/spline-decomposition.base.argb32.ref.png \
 	reference/spline-decomposition.base.rgb24.ref.png \
 	reference/spline-decomposition.image16.ref.png \
@@ -1884,6 +2542,8 @@ REFERENCE_IMAGES = \
 	reference/spline-decomposition.quartz.xfail.png \
 	reference/spline-decomposition.ref.png \
 	reference/spline-decomposition.svg.ref.png \
+	reference/spline-decomposition.traps.argb32.ref.png \
+	reference/spline-decomposition.traps.rgb24.ref.png \
 	reference/spline-decomposition.xlib.ref.png \
 	reference/stroke-ctm-caps.base.argb32.ref.png \
 	reference/stroke-ctm-caps.base.rgb24.ref.png \
@@ -1892,6 +2552,8 @@ REFERENCE_IMAGES = \
 	reference/stroke-ctm-caps.ps3.ref.png \
 	reference/stroke-ctm-caps.quartz.ref.png \
 	reference/stroke-ctm-caps.ref.png \
+	reference/stroke-ctm-caps.traps.argb32.ref.png \
+	reference/stroke-ctm-caps.traps.rgb24.ref.png \
 	reference/stroke-image.base.argb32.ref.png \
 	reference/stroke-image.base.rgb24.ref.png \
 	reference/stroke-image.image16.ref.png \
@@ -1899,20 +2561,30 @@ REFERENCE_IMAGES = \
 	reference/stroke-image.ps.ref.png \
 	reference/stroke-image.quartz.ref.png \
 	reference/stroke-image.ref.png \
+	reference/stroke-image.traps.argb32.ref.png \
+	reference/stroke-image.traps.rgb24.ref.png \
 	reference/stroke-image.xlib.ref.png \
 	reference/stroke-open-box.base.argb32.ref.png \
 	reference/stroke-open-box.base.rgb24.ref.png \
 	reference/stroke-open-box.ref.png \
+	reference/stroke-open-box.traps.argb32.ref.png \
+	reference/stroke-open-box.traps.rgb24.ref.png \
 	reference/subsurface-image-repeat.base.argb32.ref.png \
 	reference/subsurface-image-repeat.base.rgb24.ref.png \
 	reference/subsurface-image-repeat.image16.ref.png \
 	reference/subsurface-image-repeat.ref.png \
+	reference/subsurface-image-repeat.traps.argb32.ref.png \
+	reference/subsurface-image-repeat.traps.rgb24.ref.png \
 	reference/subsurface-modify-child.base.argb32.ref.png \
 	reference/subsurface-modify-child.base.rgb24.ref.png \
 	reference/subsurface-modify-child.ref.png \
+	reference/subsurface-modify-child.traps.argb32.ref.png \
+	reference/subsurface-modify-child.traps.rgb24.ref.png \
 	reference/subsurface-modify-parent.base.argb32.ref.png \
 	reference/subsurface-modify-parent.base.rgb24.ref.png \
 	reference/subsurface-modify-parent.ref.png \
+	reference/subsurface-modify-parent.traps.argb32.ref.png \
+	reference/subsurface-modify-parent.traps.rgb24.ref.png \
 	reference/subsurface-outside-target.argb32.ref.png \
 	reference/subsurface-outside-target.base.argb32.ref.png \
 	reference/subsurface-outside-target.base.rgb24.ref.png \
@@ -1921,26 +2593,38 @@ REFERENCE_IMAGES = \
 	reference/subsurface-pad.base.rgb24.ref.png \
 	reference/subsurface-pad.quartz.xfail.png \
 	reference/subsurface-pad.ref.png \
+	reference/subsurface-pad.traps.argb32.ref.png \
+	reference/subsurface-pad.traps.rgb24.ref.png \
 	reference/subsurface-reflect.base.argb32.ref.png \
 	reference/subsurface-reflect.base.rgb24.ref.png \
 	reference/subsurface-reflect.ref.png \
+	reference/subsurface-reflect.traps.argb32.ref.png \
+	reference/subsurface-reflect.traps.rgb24.ref.png \
 	reference/subsurface-repeat.base.argb32.ref.png \
 	reference/subsurface-repeat.base.rgb24.ref.png \
 	reference/subsurface-repeat.ref.png \
+	reference/subsurface-repeat.traps.argb32.ref.png \
+	reference/subsurface-repeat.traps.rgb24.ref.png \
 	reference/subsurface-similar-repeat.base.argb32.ref.png \
 	reference/subsurface-similar-repeat.base.rgb24.ref.png \
 	reference/subsurface-similar-repeat.ref.png \
+	reference/subsurface-similar-repeat.traps.argb32.ref.png \
+	reference/subsurface-similar-repeat.traps.rgb24.ref.png \
 	reference/subsurface.base.argb32.ref.png \
 	reference/subsurface.base.rgb24.ref.png \
 	reference/subsurface.image16.ref.png \
 	reference/subsurface.ps.ref.png \
 	reference/subsurface.ref.png \
+	reference/subsurface.traps.argb32.ref.png \
+	reference/subsurface.traps.rgb24.ref.png \
 	reference/subsurface.xlib.ref.png \
 	reference/surface-pattern-big-scale-down.base.argb32.ref.png \
 	reference/surface-pattern-big-scale-down.base.rgb24.ref.png \
 	reference/surface-pattern-big-scale-down.ps.ref.png \
 	reference/surface-pattern-big-scale-down.quartz.ref.png \
 	reference/surface-pattern-big-scale-down.ref.png \
+	reference/surface-pattern-big-scale-down.traps.argb32.ref.png \
+	reference/surface-pattern-big-scale-down.traps.rgb24.ref.png \
 	reference/surface-pattern-operator.argb32.ref.png \
 	reference/surface-pattern-operator.base.argb32.ref.png \
 	reference/surface-pattern-operator.base.rgb24.ref.png \
@@ -1950,24 +2634,34 @@ REFERENCE_IMAGES = \
 	reference/surface-pattern-operator.quartz.argb32.ref.png \
 	reference/surface-pattern-operator.quartz.rgb24.ref.png \
 	reference/surface-pattern-operator.rgb24.ref.png \
+	reference/surface-pattern-operator.traps.argb32.ref.png \
+	reference/surface-pattern-operator.traps.rgb24.ref.png \
 	reference/surface-pattern-operator.xlib.argb32.ref.png \
 	reference/surface-pattern-operator.xlib.rgb24.ref.png \
 	reference/surface-pattern-scale-down-extend-none.base.argb32.ref.png \
 	reference/surface-pattern-scale-down-extend-none.base.rgb24.ref.png \
 	reference/surface-pattern-scale-down-extend-none.quartz.ref.png \
 	reference/surface-pattern-scale-down-extend-none.ref.png \
+	reference/surface-pattern-scale-down-extend-none.traps.argb32.ref.png \
+	reference/surface-pattern-scale-down-extend-none.traps.rgb24.ref.png \
 	reference/surface-pattern-scale-down-extend-pad.base.argb32.ref.png \
 	reference/surface-pattern-scale-down-extend-pad.base.rgb24.ref.png \
 	reference/surface-pattern-scale-down-extend-pad.quartz.xfail.png \
 	reference/surface-pattern-scale-down-extend-pad.ref.png \
+	reference/surface-pattern-scale-down-extend-pad.traps.argb32.ref.png \
+	reference/surface-pattern-scale-down-extend-pad.traps.rgb24.ref.png \
 	reference/surface-pattern-scale-down-extend-reflect.base.argb32.ref.png \
 	reference/surface-pattern-scale-down-extend-reflect.base.rgb24.ref.png \
 	reference/surface-pattern-scale-down-extend-reflect.quartz.ref.png \
 	reference/surface-pattern-scale-down-extend-reflect.ref.png \
+	reference/surface-pattern-scale-down-extend-reflect.traps.argb32.ref.png \
+	reference/surface-pattern-scale-down-extend-reflect.traps.rgb24.ref.png \
 	reference/surface-pattern-scale-down-extend-repeat.base.argb32.ref.png \
 	reference/surface-pattern-scale-down-extend-repeat.base.rgb24.ref.png \
 	reference/surface-pattern-scale-down-extend-repeat.quartz.ref.png \
 	reference/surface-pattern-scale-down-extend-repeat.ref.png \
+	reference/surface-pattern-scale-down-extend-repeat.traps.argb32.ref.png \
+	reference/surface-pattern-scale-down-extend-repeat.traps.rgb24.ref.png \
 	reference/surface-pattern-scale-down.base.argb32.ref.png \
 	reference/surface-pattern-scale-down.base.rgb24.ref.png \
 	reference/surface-pattern-scale-down.image16.ref.png \
@@ -1976,6 +2670,8 @@ REFERENCE_IMAGES = \
 	reference/surface-pattern-scale-down.ps3.ref.png \
 	reference/surface-pattern-scale-down.quartz.ref.png \
 	reference/surface-pattern-scale-down.ref.png \
+	reference/surface-pattern-scale-down.traps.argb32.ref.png \
+	reference/surface-pattern-scale-down.traps.rgb24.ref.png \
 	reference/surface-pattern-scale-up.base.argb32.ref.png \
 	reference/surface-pattern-scale-up.base.rgb24.ref.png \
 	reference/surface-pattern-scale-up.image16.ref.png \
@@ -1984,6 +2680,8 @@ REFERENCE_IMAGES = \
 	reference/surface-pattern-scale-up.ps3.ref.png \
 	reference/surface-pattern-scale-up.quartz.xfail.png \
 	reference/surface-pattern-scale-up.ref.png \
+	reference/surface-pattern-scale-up.traps.argb32.ref.png \
+	reference/surface-pattern-scale-up.traps.rgb24.ref.png \
 	reference/surface-pattern.base.argb32.ref.png \
 	reference/surface-pattern.base.rgb24.ref.png \
 	reference/surface-pattern.image16.ref.png \
@@ -1992,6 +2690,8 @@ REFERENCE_IMAGES = \
 	reference/surface-pattern.quartz.xfail.png \
 	reference/surface-pattern.ref.png \
 	reference/surface-pattern.svg.xfail.png \
+	reference/surface-pattern.traps.argb32.ref.png \
+	reference/surface-pattern.traps.rgb24.ref.png \
 	reference/svg-surface-source.argb32.ref.png \
 	reference/svg-surface-source.base.argb32.ref.png \
 	reference/svg-surface-source.base.rgb24.ref.png \
@@ -1999,26 +2699,36 @@ REFERENCE_IMAGES = \
 	reference/svg-surface-source.rgb24.ref.png \
 	reference/svg-surface-source.svg12.argb32.xfail.png \
 	reference/svg-surface-source.svg12.rgb24.xfail.png \
+	reference/svg-surface-source.traps.argb32.ref.png \
+	reference/svg-surface-source.traps.rgb24.ref.png \
 	reference/text-antialias-gray.base.argb32.ref.png \
 	reference/text-antialias-gray.base.rgb24.ref.png \
 	reference/text-antialias-gray.image16.ref.png \
 	reference/text-antialias-gray.quartz.ref.png \
 	reference/text-antialias-gray.ref.png \
+	reference/text-antialias-gray.traps.argb32.ref.png \
+	reference/text-antialias-gray.traps.rgb24.ref.png \
 	reference/text-antialias-none.base.argb32.ref.png \
 	reference/text-antialias-none.base.rgb24.ref.png \
 	reference/text-antialias-none.quartz.ref.png \
 	reference/text-antialias-none.ref.png \
+	reference/text-antialias-none.traps.argb32.ref.png \
+	reference/text-antialias-none.traps.rgb24.ref.png \
 	reference/text-antialias-subpixel.base.argb32.xfail.png \
 	reference/text-antialias-subpixel.base.rgb24.xfail.png \
 	reference/text-antialias-subpixel.image16.ref.png \
 	reference/text-antialias-subpixel.quartz.ref.png \
 	reference/text-antialias-subpixel.ref.png \
+	reference/text-antialias-subpixel.traps.argb32.ref.png \
+	reference/text-antialias-subpixel.traps.rgb24.ref.png \
 	reference/text-glyph-range.base.argb32.ref.png \
 	reference/text-glyph-range.base.rgb24.ref.png \
 	reference/text-glyph-range.image16.ref.png \
 	reference/text-glyph-range.ps.ref.png \
 	reference/text-glyph-range.quartz.ref.png \
 	reference/text-glyph-range.ref.png \
+	reference/text-glyph-range.traps.argb32.ref.png \
+	reference/text-glyph-range.traps.rgb24.ref.png \
 	reference/text-pattern.base.argb32.ref.png \
 	reference/text-pattern.base.rgb24.ref.png \
 	reference/text-pattern.pdf.argb32.ref.png \
@@ -2033,6 +2743,8 @@ REFERENCE_IMAGES = \
 	reference/text-pattern.rgb24.ref.png \
 	reference/text-pattern.svg.argb32.ref.png \
 	reference/text-pattern.svg.rgb24.ref.png \
+	reference/text-pattern.traps.argb32.ref.png \
+	reference/text-pattern.traps.rgb24.ref.png \
 	reference/text-rotate.base.argb32.ref.png \
 	reference/text-rotate.base.rgb24.ref.png \
 	reference/text-rotate.image16.ref.png \
@@ -2041,6 +2753,8 @@ REFERENCE_IMAGES = \
 	reference/text-rotate.quartz.ref.png \
 	reference/text-rotate.ref.png \
 	reference/text-rotate.svg.ref.png \
+	reference/text-rotate.traps.argb32.ref.png \
+	reference/text-rotate.traps.rgb24.ref.png \
 	reference/text-rotate.xlib-fallback.ref.png \
 	reference/text-rotate.xlib.ref.png \
 	reference/text-transform.base.argb32.ref.png \
@@ -2052,21 +2766,30 @@ REFERENCE_IMAGES = \
 	reference/text-transform.ps3.ref.png \
 	reference/text-transform.ref.png \
 	reference/text-transform.svg.ref.png \
+	reference/text-transform.traps.argb32.ref.png \
+	reference/text-transform.traps.rgb24.ref.png \
 	reference/tiger.base.argb32.ref.png \
 	reference/tiger.base.rgb24.ref.png \
 	reference/tiger.ref.png \
+	reference/tiger.traps.argb32.ref.png \
+	reference/tiger.traps.rgb24.ref.png \
 	reference/tighten-bounds.base.argb32.ref.png \
 	reference/tighten-bounds.base.rgb24.ref.png \
 	reference/tighten-bounds.ref.png \
+	reference/tighten-bounds.traps.argb32.ref.png \
 	reference/transforms.base.argb32.ref.png \
 	reference/transforms.base.rgb24.ref.png \
 	reference/transforms.image16.ref.png \
 	reference/transforms.ps2.ref.png \
 	reference/transforms.ps3.ref.png \
 	reference/transforms.ref.png \
+	reference/transforms.traps.argb32.ref.png \
+	reference/transforms.traps.rgb24.ref.png \
 	reference/translate-show-surface.base.argb32.ref.png \
 	reference/translate-show-surface.base.rgb24.ref.png \
 	reference/translate-show-surface.ref.png \
+	reference/translate-show-surface.traps.argb32.ref.png \
+	reference/translate-show-surface.traps.rgb24.ref.png \
 	reference/trap-clip.base.argb32.ref.png \
 	reference/trap-clip.base.rgb24.ref.png \
 	reference/trap-clip.image16.ref.png \
@@ -2079,26 +2802,36 @@ REFERENCE_IMAGES = \
 	reference/trap-clip.ref.png \
 	reference/trap-clip.rgb24.ref.png \
 	reference/trap-clip.test-paginated.argb32.ref.png \
+	reference/trap-clip.traps.argb32.ref.png \
+	reference/trap-clip.traps.rgb24.ref.png \
 	reference/trap-clip.xlib.ref.png \
 	reference/trap-clip.xlib.rgb24.ref.png \
 	reference/twin-antialias-gray.base.argb32.ref.png \
 	reference/twin-antialias-gray.base.rgb24.ref.png \
 	reference/twin-antialias-gray.image16.ref.png \
 	reference/twin-antialias-gray.ref.png \
+	reference/twin-antialias-gray.traps.argb32.ref.png \
+	reference/twin-antialias-gray.traps.rgb24.ref.png \
 	reference/twin-antialias-gray.xlib.ref.png \
 	reference/twin-antialias-mixed.base.argb32.ref.png \
 	reference/twin-antialias-mixed.base.rgb24.ref.png \
 	reference/twin-antialias-mixed.image16.ref.png \
 	reference/twin-antialias-mixed.ref.png \
+	reference/twin-antialias-mixed.traps.argb32.ref.png \
+	reference/twin-antialias-mixed.traps.rgb24.ref.png \
 	reference/twin-antialias-mixed.xlib.ref.png \
 	reference/twin-antialias-none.base.argb32.ref.png \
 	reference/twin-antialias-none.base.rgb24.ref.png \
 	reference/twin-antialias-none.ref.png \
+	reference/twin-antialias-none.traps.argb32.ref.png \
+	reference/twin-antialias-none.traps.rgb24.ref.png \
 	reference/twin-antialias-none.xlib.ref.png \
 	reference/twin-antialias-subpixel.base.argb32.ref.png \
 	reference/twin-antialias-subpixel.base.rgb24.ref.png \
 	reference/twin-antialias-subpixel.image16.ref.png \
 	reference/twin-antialias-subpixel.ref.png \
+	reference/twin-antialias-subpixel.traps.argb32.ref.png \
+	reference/twin-antialias-subpixel.traps.rgb24.ref.png \
 	reference/twin-antialias-subpixel.xlib.ref.png \
 	reference/twin.base.argb32.ref.png \
 	reference/twin.base.rgb24.ref.png \
@@ -2106,14 +2839,20 @@ REFERENCE_IMAGES = \
 	reference/twin.ps.ref.png \
 	reference/twin.ref.png \
 	reference/twin.svg.ref.png \
+	reference/twin.traps.argb32.ref.png \
+	reference/twin.traps.rgb24.ref.png \
 	reference/twin.xlib.ref.png \
 	reference/unaligned-box.base.argb32.ref.png \
 	reference/unaligned-box.base.rgb24.ref.png \
 	reference/unaligned-box.ref.png \
+	reference/unaligned-box.traps.argb32.ref.png \
+	reference/unaligned-box.traps.rgb24.ref.png \
 	reference/unantialiased-shapes.base.argb32.ref.png \
 	reference/unantialiased-shapes.base.rgb24.ref.png \
 	reference/unantialiased-shapes.quartz.ref.png \
 	reference/unantialiased-shapes.ref.png \
+	reference/unantialiased-shapes.traps.argb32.ref.png \
+	reference/unantialiased-shapes.traps.rgb24.ref.png \
 	reference/unbounded-operator.argb32.ref.png \
 	reference/unbounded-operator.base.argb32.ref.png \
 	reference/unbounded-operator.base.rgb24.ref.png \
@@ -2128,10 +2867,14 @@ REFERENCE_IMAGES = \
 	reference/unbounded-operator.rgb24.ref.png \
 	reference/unbounded-operator.svg12.argb32.ref.png \
 	reference/unbounded-operator.svg12.rgb24.xfail.png \
+	reference/unbounded-operator.traps.argb32.ref.png \
+	reference/unbounded-operator.traps.rgb24.ref.png \
 	reference/unbounded-operator.xlib.rgb24.ref.png \
 	reference/unclosed-strokes.base.argb32.ref.png \
 	reference/unclosed-strokes.base.rgb24.ref.png \
 	reference/unclosed-strokes.ref.png \
+	reference/unclosed-strokes.traps.argb32.ref.png \
+	reference/unclosed-strokes.traps.rgb24.ref.png \
 	reference/user-font-mask.base.argb32.ref.png \
 	reference/user-font-mask.base.rgb24.ref.png \
 	reference/user-font-mask.image16.ref.png \
@@ -2140,6 +2883,8 @@ REFERENCE_IMAGES = \
 	reference/user-font-mask.ps3.ref.png \
 	reference/user-font-mask.ref.png \
 	reference/user-font-mask.svg.ref.png \
+	reference/user-font-mask.traps.argb32.ref.png \
+	reference/user-font-mask.traps.rgb24.ref.png \
 	reference/user-font-proxy.base.argb32.ref.png \
 	reference/user-font-proxy.base.rgb24.ref.png \
 	reference/user-font-proxy.image16.ref.png \
@@ -2150,6 +2895,8 @@ REFERENCE_IMAGES = \
 	reference/user-font-proxy.quartz.ref.png \
 	reference/user-font-proxy.ref.png \
 	reference/user-font-proxy.svg.ref.png \
+	reference/user-font-proxy.traps.argb32.ref.png \
+	reference/user-font-proxy.traps.rgb24.ref.png \
 	reference/user-font-proxy.xlib.ref.png \
 	reference/user-font-rescale.base.argb32.ref.png \
 	reference/user-font-rescale.base.rgb24.ref.png \
@@ -2158,6 +2905,8 @@ REFERENCE_IMAGES = \
 	reference/user-font-rescale.quartz.ref.png \
 	reference/user-font-rescale.ref.png \
 	reference/user-font-rescale.svg.ref.png \
+	reference/user-font-rescale.traps.argb32.ref.png \
+	reference/user-font-rescale.traps.rgb24.ref.png \
 	reference/user-font.base.argb32.ref.png \
 	reference/user-font.base.rgb24.ref.png \
 	reference/user-font.image16.ref.png \
@@ -2166,31 +2915,47 @@ REFERENCE_IMAGES = \
 	reference/user-font.quartz.ref.png \
 	reference/user-font.ref.png \
 	reference/user-font.svg.ref.png \
+	reference/user-font.traps.argb32.ref.png \
+	reference/user-font.traps.rgb24.ref.png \
 	reference/user-font.xlib.ref.png \
 	reference/white-in-noop.base.argb32.ref.png \
 	reference/white-in-noop.base.rgb24.ref.png \
 	reference/white-in-noop.ref.png \
+	reference/white-in-noop.traps.argb32.ref.png \
+	reference/white-in-noop.traps.rgb24.ref.png \
 	reference/world-map-fill.base.argb32.ref.png \
 	reference/world-map-fill.base.rgb24.ref.png \
 	reference/world-map-fill.image16.ref.png \
 	reference/world-map-fill.ref.png \
+	reference/world-map-fill.traps.argb32.ref.png \
+	reference/world-map-fill.traps.rgb24.ref.png \
 	reference/world-map-stroke.base.argb32.ref.png \
 	reference/world-map-stroke.base.rgb24.ref.png \
 	reference/world-map-stroke.image16.ref.png \
 	reference/world-map-stroke.ref.png \
+	reference/world-map-stroke.traps.argb32.ref.png \
+	reference/world-map-stroke.traps.rgb24.ref.png \
 	reference/world-map.base.argb32.ref.png \
 	reference/world-map.base.rgb24.ref.png \
 	reference/world-map.image16.ref.png \
 	reference/world-map.ref.png \
+	reference/world-map.traps.argb32.ref.png \
+	reference/world-map.traps.rgb24.ref.png \
 	reference/xcb-huge-image-shm.base.argb32.ref.png \
 	reference/xcb-huge-image-shm.base.rgb24.ref.png \
 	reference/xcb-huge-image-shm.ref.png \
+	reference/xcb-huge-image-shm.traps.argb32.ref.png \
+	reference/xcb-huge-image-shm.traps.rgb24.ref.png \
 	reference/xcb-snapshot-assert.base.argb32.ref.png \
 	reference/xcb-snapshot-assert.base.rgb24.ref.png \
 	reference/xcb-snapshot-assert.ref.png \
+	reference/xcb-snapshot-assert.traps.argb32.ref.png \
+	reference/xcb-snapshot-assert.traps.rgb24.ref.png \
 	reference/xcb-stress-cache.base.argb32.ref.png \
 	reference/xcb-stress-cache.base.rgb24.ref.png \
 	reference/xcb-stress-cache.ref.png \
+	reference/xcb-stress-cache.traps.argb32.ref.png \
+	reference/xcb-stress-cache.traps.rgb24.ref.png \
 	reference/xcb-surface-source.argb32.ref.png \
 	reference/xcb-surface-source.base.argb32.ref.png \
 	reference/xcb-surface-source.base.rgb24.ref.png \
@@ -2198,16 +2963,22 @@ REFERENCE_IMAGES = \
 	reference/xcb-surface-source.ps.argb32.ref.png \
 	reference/xcb-surface-source.ps.rgb24.ref.png \
 	reference/xcb-surface-source.rgb24.ref.png \
+	reference/xcb-surface-source.traps.argb32.ref.png \
+	reference/xcb-surface-source.traps.rgb24.ref.png \
 	reference/xcomposite-projection.base.argb32.ref.png \
 	reference/xcomposite-projection.base.rgb24.ref.png \
 	reference/xcomposite-projection.image16.ref.png \
 	reference/xcomposite-projection.quartz.ref.png \
 	reference/xcomposite-projection.ref.png \
+	reference/xcomposite-projection.traps.argb32.ref.png \
+	reference/xcomposite-projection.traps.rgb24.ref.png \
 	reference/xlib-expose-event.base.argb32.ref.png \
 	reference/xlib-expose-event.base.rgb24.ref.png \
 	reference/xlib-expose-event.image16.ref.png \
 	reference/xlib-expose-event.ps.ref.png \
 	reference/xlib-expose-event.ref.png \
+	reference/xlib-expose-event.traps.argb32.ref.png \
+	reference/xlib-expose-event.traps.rgb24.ref.png \
 	reference/xlib-surface-source.argb32.ref.png \
 	reference/xlib-surface-source.base.argb32.ref.png \
 	reference/xlib-surface-source.base.rgb24.ref.png \
@@ -2217,11 +2988,17 @@ REFERENCE_IMAGES = \
 	reference/xlib-surface-source.rgb24.ref.png \
 	reference/xlib-surface-source.svg12.argb32.xfail.png \
 	reference/xlib-surface-source.svg12.rgb24.xfail.png \
+	reference/xlib-surface-source.traps.argb32.ref.png \
+	reference/xlib-surface-source.traps.rgb24.ref.png \
 	reference/zero-alpha.base.argb32.ref.png \
 	reference/zero-alpha.base.rgb24.ref.png \
 	reference/zero-alpha.ref.png \
+	reference/zero-alpha.traps.argb32.ref.png \
+	reference/zero-alpha.traps.rgb24.ref.png \
 	reference/zero-mask.base.argb32.ref.png \
 	reference/zero-mask.base.rgb24.ref.png \
 	reference/zero-mask.ref.png \
 	reference/zero-mask.rgb24.ref.png \
+	reference/zero-mask.traps.argb32.ref.png \
+	reference/zero-mask.traps.rgb24.ref.png \
 	$(NULL)