diff --git a/boilerplate/cairo-boilerplate-ps-private.h b/boilerplate/cairo-boilerplate-ps-private.h index 6f1bad6be..a6a19500c 100644 --- a/boilerplate/cairo-boilerplate-ps-private.h +++ b/boilerplate/cairo-boilerplate-ps-private.h @@ -28,15 +28,26 @@ #define _CAIRO_BOILERPLATE_PS_PRIVATE_H_ cairo_surface_t * -_cairo_boilerplate_ps_create_surface (const char *name, - cairo_content_t content, - int width, - int height, - int max_width, - int max_height, - cairo_boilerplate_mode_t mode, - int id, - void **closure); +_cairo_boilerplate_ps2_create_surface (const char *name, + cairo_content_t content, + int width, + int height, + int max_width, + int max_height, + cairo_boilerplate_mode_t mode, + int id, + void **closure); + +cairo_surface_t * +_cairo_boilerplate_ps3_create_surface (const char *name, + cairo_content_t content, + int width, + int height, + int max_width, + int max_height, + cairo_boilerplate_mode_t mode, + int id, + void **closure); void _cairo_boilerplate_ps_cleanup (void *closure); diff --git a/boilerplate/cairo-boilerplate-ps.c b/boilerplate/cairo-boilerplate-ps.c index 6df9776d9..7c6ebe9ce 100644 --- a/boilerplate/cairo-boilerplate-ps.c +++ b/boilerplate/cairo-boilerplate-ps.c @@ -37,14 +37,14 @@ #include #endif -cairo_user_data_key_t ps_closure_key; +static const cairo_user_data_key_t ps_closure_key; -typedef struct _ps_target_closure -{ +typedef struct _ps_target_closure { char *filename; int width; int height; cairo_surface_t *target; + cairo_ps_level_t level; } ps_target_closure_t; static cairo_status_t @@ -65,9 +65,10 @@ _cairo_boilerplate_ps_surface_set_creation_date (cairo_surface_t *abstract_surfa return CAIRO_STATUS_SUCCESS; } -cairo_surface_t * +static cairo_surface_t * _cairo_boilerplate_ps_create_surface (const char *name, cairo_content_t content, + cairo_ps_level_t level, int width, int height, int max_width, @@ -89,6 +90,7 @@ _cairo_boilerplate_ps_create_surface (const char *name, xasprintf (&ptc->filename, "%s-out.ps", name); xunlink (ptc->filename); + ptc->level = level; ptc->width = width; ptc->height = height; @@ -96,6 +98,7 @@ _cairo_boilerplate_ps_create_surface (const char *name, if (cairo_surface_status (surface)) goto CLEANUP_FILENAME; + cairo_ps_surface_restrict_to_level (surface, level); _cairo_boilerplate_ps_surface_set_creation_date (surface, 0); cairo_surface_set_fallback_resolution (surface, 72., 72.); @@ -125,6 +128,44 @@ _cairo_boilerplate_ps_create_surface (const char *name, return surface; } +cairo_surface_t * +_cairo_boilerplate_ps2_create_surface (const char *name, + cairo_content_t content, + int width, + int height, + int max_width, + int max_height, + cairo_boilerplate_mode_t mode, + int id, + void **closure) +{ + return _cairo_boilerplate_ps_create_surface (name, content, + CAIRO_PS_LEVEL_2, + width, height, + max_width, max_height, + mode, id, + closure); +} + +cairo_surface_t * +_cairo_boilerplate_ps3_create_surface (const char *name, + cairo_content_t content, + int width, + int height, + int max_width, + int max_height, + cairo_boilerplate_mode_t mode, + int id, + void **closure) +{ + return _cairo_boilerplate_ps_create_surface (name, content, + CAIRO_PS_LEVEL_3, + width, height, + max_width, max_height, + mode, id, + closure); +} + cairo_status_t _cairo_boilerplate_ps_finish_surface (cairo_surface_t *surface) { @@ -177,8 +218,10 @@ _cairo_boilerplate_ps_surface_write_to_png (cairo_surface_t *surface, const char char command[4096]; int exitstatus; - sprintf (command, "gs -q -r72 -g%dx%d -dSAFER -dBATCH -dNOPAUSE -sDEVICE=pngalpha -sOutputFile=%s %s", - ptc->width, ptc->height, filename, ptc->filename); + sprintf (command, "gs -q -r72 -g%dx%d -dSAFER -dBATCH -dNOPAUSE -sDEVICE=pngalpha -sOutputFile=%s %s %s", + ptc->width, ptc->height, filename, + ptc->level == CAIRO_PS_LEVEL_2 ? "-c 2 .setlanguagelevel -f" : "", + ptc->filename); exitstatus = system (command); #if _XOPEN_SOURCE && HAVE_SIGNAL_H if (WIFSIGNALED (exitstatus)) diff --git a/boilerplate/cairo-boilerplate.c b/boilerplate/cairo-boilerplate.c index 7c9890f3f..f88d983c1 100644 --- a/boilerplate/cairo-boilerplate.c +++ b/boilerplate/cairo-boilerplate.c @@ -445,16 +445,31 @@ static cairo_boilerplate_target_t targets[] = _cairo_boilerplate_xlib_synchronize}, #endif #if CAIRO_HAS_PS_SURFACE && CAIRO_CAN_TEST_PS_SURFACE - { "ps", ".ps", CAIRO_SURFACE_TYPE_PS, + { "ps2", ".ps", CAIRO_SURFACE_TYPE_PS, CAIRO_TEST_CONTENT_COLOR_ALPHA_FLATTENED, 0, - _cairo_boilerplate_ps_create_surface, + _cairo_boilerplate_ps2_create_surface, _cairo_boilerplate_ps_finish_surface, _cairo_boilerplate_ps_get_image_surface, _cairo_boilerplate_ps_surface_write_to_png, _cairo_boilerplate_ps_cleanup, NULL, TRUE }, - { "ps", ".ps", CAIRO_INTERNAL_SURFACE_TYPE_META, CAIRO_CONTENT_COLOR, 0, - _cairo_boilerplate_ps_create_surface, + { "ps2", ".ps", CAIRO_INTERNAL_SURFACE_TYPE_META, CAIRO_CONTENT_COLOR, 0, + _cairo_boilerplate_ps2_create_surface, + _cairo_boilerplate_ps_finish_surface, + _cairo_boilerplate_ps_get_image_surface, + _cairo_boilerplate_ps_surface_write_to_png, + _cairo_boilerplate_ps_cleanup, + NULL, TRUE }, + { "ps3", ".ps", CAIRO_SURFACE_TYPE_PS, + CAIRO_TEST_CONTENT_COLOR_ALPHA_FLATTENED, 0, + _cairo_boilerplate_ps3_create_surface, + _cairo_boilerplate_ps_finish_surface, + _cairo_boilerplate_ps_get_image_surface, + _cairo_boilerplate_ps_surface_write_to_png, + _cairo_boilerplate_ps_cleanup, + NULL, TRUE }, + { "ps3", ".ps", CAIRO_INTERNAL_SURFACE_TYPE_META, CAIRO_CONTENT_COLOR, 0, + _cairo_boilerplate_ps3_create_surface, _cairo_boilerplate_ps_finish_surface, _cairo_boilerplate_ps_get_image_surface, _cairo_boilerplate_ps_surface_write_to_png, diff --git a/test/Makefile.am b/test/Makefile.am index 0a0d499b0..9f3c0f13b 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -297,8 +297,10 @@ REFERENCE_IMAGES = \ alpha-similar-rgb24-ref.png \ big-line-ref.png \ big-line-rgb24-ref.png \ - big-line-ps-ref.png \ - big-line-ps-rgb24-ref.png \ + big-line-ps2-ref.png \ + big-line-ps3-ref.png \ + big-line-ps2-rgb24-ref.png \ + big-line-ps3-rgb24-ref.png \ big-line-quartz-ref.png \ big-line-quartz-rgb24-ref.png \ bilevel-image-ref.png \ @@ -310,18 +312,23 @@ REFERENCE_IMAGES = \ caps-joins-alpha-svg12-ref.png \ caps-joins-alpha-svg11-ref.png \ caps-joins-ref.png \ - caps-joins-ps-ref.png \ + caps-joins-ps2-ref.png \ + caps-joins-ps3-ref.png \ caps-sub-paths-ref.png \ clip-all-ref.png \ clip-empty-ref.png \ clip-fill-rule-pixel-aligned-ref.png \ clip-fill-rule-pixel-aligned-rgb24-ref.png \ - clip-fill-rule-ps-argb32-ref.png \ - clip-fill-rule-ps-rgb24-ref.png \ + clip-fill-rule-ps2-argb32-ref.png \ + clip-fill-rule-ps3-argb32-ref.png \ + clip-fill-rule-ps2-rgb24-ref.png \ + clip-fill-rule-ps3-rgb24-ref.png \ clip-fill-rule-ref.png \ clip-fill-rule-rgb24-ref.png \ - clip-nesting-ps-argb32-ref.png \ - clip-nesting-ps-rgb24-ref.png \ + clip-nesting-ps2-argb32-ref.png \ + clip-nesting-ps3-argb32-ref.png \ + clip-nesting-ps2-rgb24-ref.png \ + clip-nesting-ps3-rgb24-ref.png \ clip-nesting-quartz-ref.png \ clip-nesting-quartz-rgb24-ref.png \ clip-nesting-ref.png \ @@ -329,28 +336,36 @@ REFERENCE_IMAGES = \ clip-operator-ref.png \ clip-operator-pdf-argb32-ref.png \ clip-operator-pdf-rgb24-ref.png \ - clip-operator-ps-rgb24-ref.png \ + clip-operator-ps2-rgb24-ref.png \ + clip-operator-ps3-rgb24-ref.png \ clip-operator-rgb24-ref.png \ clip-operator-quartz-ref.png \ clip-operator-quartz-rgb24-ref.png \ - clip-push-group-ps-argb32-ref.png \ - clip-push-group-ps-rgb24-ref.png \ + clip-push-group-ps2-argb32-ref.png \ + clip-push-group-ps3-argb32-ref.png \ + clip-push-group-ps2-rgb24-ref.png \ + clip-push-group-ps3-rgb24-ref.png \ clip-push-group-quartz-ref.png \ clip-push-group-ref.png \ - clip-twice-ps-argb32-ref.png \ - clip-twice-ps-rgb24-ref.png \ + clip-twice-ps2-argb32-ref.png \ + clip-twice-ps3-argb32-ref.png \ + clip-twice-ps2-rgb24-ref.png \ + clip-twice-ps3-rgb24-ref.png \ clip-twice-quartz-ref.png \ clip-twice-quartz-rgb24-ref.png \ clip-twice-ref.png \ clip-twice-rgb24-ref.png \ clipped-group-ref.png \ - clipped-group-ps-ref.png \ + clipped-group-ps2-ref.png \ + clipped-group-ps3-ref.png \ close-path-ref.png \ - close-path-ps-ref.png \ + close-path-ps2-ref.png \ + close-path-ps3-ref.png \ composite-integer-translate-over-ref.png \ composite-integer-translate-over-repeat-ref.png \ composite-integer-translate-source-ref.png \ - copy-path-ps-ref.png \ + copy-path-ps2-ref.png \ + copy-path-ps3-ref.png \ copy-path-ref.png \ create-from-png-ref.png \ create-from-png-alpha-ref.png \ @@ -359,40 +374,53 @@ REFERENCE_IMAGES = \ create-from-png-indexed-ref.png \ create-from-png-indexed-alpha-ref.png \ create-from-png-stream-ref.png \ - dash-caps-joins-ps-argb32-ref.png \ - dash-caps-joins-ps-rgb24-ref.png \ + dash-caps-joins-ps2-argb32-ref.png \ + dash-caps-joins-ps3-argb32-ref.png \ + dash-caps-joins-ps2-rgb24-ref.png \ + dash-caps-joins-ps3-rgb24-ref.png \ dash-caps-joins-quartz-ref.png \ dash-caps-joins-ref.png \ dash-curve-ref.png \ - dash-curve-ps-ref.png \ + dash-curve-ps2-ref.png \ + dash-curve-ps3-ref.png \ dash-curve-quartz-ref.png \ dash-no-dash-ref.png \ dash-offset-negative-ref.png \ - dash-scale-ps-argb32-ref.png \ - dash-scale-ps-rgb24-ref.png \ + dash-scale-ps2-argb32-ref.png \ + dash-scale-ps3-argb32-ref.png \ + dash-scale-ps2-rgb24-ref.png \ + dash-scale-ps3-rgb24-ref.png \ dash-scale-quartz-ref.png \ dash-scale-ref.png \ - dash-state-ps-ref.png \ + dash-state-ps2-ref.png \ + dash-state-ps3-ref.png \ dash-state-ref.png \ dash-state-quartz-ref.png \ - dash-zero-length-ps-ref.png \ - dash-zero-length-ps-rgb24-ref.png \ + dash-zero-length-ps2-ref.png \ + dash-zero-length-ps3-ref.png \ + dash-zero-length-ps2-rgb24-ref.png \ + dash-zero-length-ps3-rgb24-ref.png \ dash-zero-length-ref.png \ dash-zero-length-rgb24-ref.png \ degenerate-arc-ref.png \ - degenerate-arc-ps-ref.png \ + degenerate-arc-ps2-ref.png \ + degenerate-arc-ps3-ref.png \ degenerate-pen-ref.png \ - degenerate-pen-ps-ref.png \ + degenerate-pen-ps2-ref.png \ + degenerate-pen-ps3-ref.png \ degenerate-pen-quartz-ref.png \ - degenerate-path-ps-argb32-ref.png \ - degenerate-path-ps-rgb24-ref.png \ + degenerate-path-ps2-argb32-ref.png \ + degenerate-path-ps3-argb32-ref.png \ + degenerate-path-ps2-rgb24-ref.png \ + degenerate-path-ps2-rgb24-ref.png \ degenerate-path-ref.png \ degenerate-path-rgb24-ref.png \ degenerate-path-quartz-ref.png \ degenerate-path-quartz-rgb24-ref.png \ device-offset-fractional-ref.png \ device-offset-fractional-pdf-ref.png \ - device-offset-fractional-ps-ref.png \ + device-offset-fractional-ps2-ref.png \ + device-offset-fractional-ps3-ref.png \ device-offset-positive-ref.png \ device-offset-positive-rgb24-ref.png \ device-offset-ref.png \ @@ -401,21 +429,25 @@ REFERENCE_IMAGES = \ extend-pad-ref.png \ extend-reflect-ref.png \ extend-reflect-similar-ref.png \ - extend-reflect-similar-ps-ref.png \ - extend-reflect-ps-ref.png \ + extend-reflect-similar-ps2-ref.png \ + extend-reflect-similar-ps3-ref.png \ + extend-reflect-ps2-ref.png \ + extend-reflect-ps3-ref.png \ extend-repeat-ref.png \ extend-repeat-similar-ref.png \ fill-alpha-ref.png \ fill-alpha-pattern-ref.png \ fill-alpha-pattern-pdf-argb32-ref.png \ fill-alpha-pattern-pdf-rgb24-ref.png \ - fill-alpha-pattern-ps-ref.png \ + fill-alpha-pattern-ps3-ref.png \ fill-and-stroke-alpha-add-quartz-ref.png \ fill-and-stroke-alpha-add-ref.png \ fill-and-stroke-alpha-quartz-ref.png \ fill-and-stroke-alpha-ref.png \ - fill-and-stroke-ps-argb32-ref.png \ - fill-and-stroke-ps-rgb24-ref.png \ + fill-and-stroke-ps2-argb32-ref.png \ + fill-and-stroke-ps3-argb32-ref.png \ + fill-and-stroke-ps2-rgb24-ref.png \ + fill-and-stroke-ps3-rgb24-ref.png \ fill-and-stroke-quartz-ref.png \ fill-and-stroke-quartz-rgb24-ref.png \ fill-and-stroke-ref.png \ @@ -424,62 +456,80 @@ REFERENCE_IMAGES = \ fill-degenerate-sort-order-quartz-rgb24-ref.png \ fill-degenerate-sort-order-ref.png \ fill-degenerate-sort-order-rgb24-ref.png \ - fill-missed-stop-ps-argb32-ref.png \ - fill-missed-stop-ps-rgb24-ref.png \ + fill-missed-stop-ps2-argb32-ref.png \ + fill-missed-stop-ps3-argb32-ref.png \ + fill-missed-stop-ps2-rgb24-ref.png \ + fill-missed-stop-ps3-rgb24-ref.png \ fill-missed-stop-ref.png \ fill-missed-stop-rgb24-ref.png \ - fill-rule-ps-argb32-ref.png \ + fill-rule-ps2-argb32-ref.png \ + fill-rule-ps3-argb32-ref.png \ + fill-rule-ps2-rgb24-ref.png \ + fill-rule-ps3-rgb24-ref.png \ fill-rule-quartz-ref.png \ fill-rule-quartz-rgb24-ref.png \ fill-rule-ref.png \ fill-rule-rgb24-ref.png \ - fill-rule-ps-rgb24-ref.png \ filter-bilinear-extents-ref.png \ filter-nearest-offset-ref.png \ finer-grained-fallbacks-ref.png \ finer-grained-fallbacks-rgb24-ref.png \ - finer-grained-fallbacks-ps-argb32-ref.png \ - finer-grained-fallbacks-ps-rgb24-ref.png \ - font-matrix-translation-ps-argb32-ref.png \ - font-matrix-translation-ps-rgb24-ref.png \ + finer-grained-fallbacks-ps2-argb32-ref.png \ + finer-grained-fallbacks-ps3-argb32-ref.png \ + finer-grained-fallbacks-ps2-rgb24-ref.png \ + finer-grained-fallbacks-ps3-rgb24-ref.png \ + font-matrix-translation-ps2-argb32-ref.png \ + font-matrix-translation-ps3-argb32-ref.png \ + font-matrix-translation-ps2-rgb24-ref.png \ + font-matrix-translation-ps3-rgb24-ref.png \ font-matrix-translation-ref.png \ font-matrix-translation-svg12-ref.png \ font-matrix-translation-svg11-ref.png \ font-matrix-translation-quartz-ref.png \ - ft-text-antialias-none-ps-argb32-ref.png \ + ft-text-antialias-none-ps2-argb32-ref.png \ + ft-text-antialias-none-ps3-argb32-ref.png \ ft-text-antialias-none-ref.png \ ft-show-glyphs-positioning-ref.png \ ft-show-glyphs-positioning-pdf-ref.png \ - ft-show-glyphs-positioning-ps-ref.png \ + ft-show-glyphs-positioning-ps2-ref.png \ + ft-show-glyphs-positioning-ps3-ref.png \ ft-show-glyphs-positioning-svg12-ref.png \ ft-show-glyphs-positioning-svg11-ref.png \ ft-show-glyphs-table-ref.png \ - ft-show-glyphs-table-ps-ref.png \ + ft-show-glyphs-table-ps2-ref.png \ + ft-show-glyphs-table-ps3-ref.png \ ft-text-vertical-layout-type1-pdf-ref.png \ - ft-text-vertical-layout-type1-ps-ref.png \ + ft-text-vertical-layout-type1-ps2-ref.png \ + ft-text-vertical-layout-type1-ps3-ref.png \ ft-text-vertical-layout-type1-ref.png \ ft-text-vertical-layout-type1-svg12-ref.png \ ft-text-vertical-layout-type1-svg11-ref.png \ ft-text-vertical-layout-type3-pdf-ref.png \ - ft-text-vertical-layout-type3-ps-ref.png \ + ft-text-vertical-layout-type3-ps2-ref.png \ + ft-text-vertical-layout-type3-ps3-ref.png \ ft-text-vertical-layout-type3-ref.png \ ft-text-vertical-layout-type3-svg12-ref.png \ ft-text-vertical-layout-type3-svg11-ref.png \ get-group-target-ref.png \ glitz-surface-source-ref.png \ glyph-cache-pressure-ref.png \ - glyph-cache-pressure-ps-ref.png \ + glyph-cache-pressure-ps2-ref.png \ + glyph-cache-pressure-ps3-ref.png \ glyph-cache-pressure-quartz-ref.png \ gradient-alpha-pdf-argb32-ref.png \ gradient-alpha-pdf-rgb24-ref.png \ - gradient-alpha-ps-argb32-ref.png \ - gradient-alpha-ps-rgb24-ref.png \ + gradient-alpha-ps2-argb32-ref.png \ + gradient-alpha-ps3-argb32-ref.png \ + gradient-alpha-ps2-rgb24-ref.png \ + gradient-alpha-ps3-rgb24-ref.png \ gradient-alpha-ref.png \ gradient-alpha-rgb24-ref.png \ gradient-constant-alpha-pdf-argb32-ref.png \ gradient-constant-alpha-pdf-rgb24-ref.png \ - gradient-constant-alpha-ps-ref.png \ - gradient-constant-alpha-ps-rgb24-ref.png \ + gradient-constant-alpha-ps2-ref.png \ + gradient-constant-alpha-ps3-ref.png \ + gradient-constant-alpha-ps2-rgb24-ref.png \ + gradient-constant-alpha-ps3-rgb24-ref.png \ gradient-constant-alpha-ref.png \ gradient-constant-alpha-rgb24-ref.png \ gradient-zero-stops-ref.png \ @@ -487,35 +537,42 @@ REFERENCE_IMAGES = \ group-paint-ref.png \ image-surface-source-ref.png \ infinite-join-ref.png \ - infinite-join-ps-ref.png \ + infinite-join-ps2-ref.png \ + infinite-join-ps3-ref.png \ large-clip-ref.png \ large-font-ref.png \ large-source-ref.png \ - leaky-dash-ps-argb32-ref.png \ - leaky-dash-ps-rgb24-ref.png \ + leaky-dash-ps2-argb32-ref.png \ + leaky-dash-ps3-argb32-ref.png \ + leaky-dash-ps2-rgb24-ref.png \ + leaky-dash-ps3-rgb24-ref.png \ leaky-dash-quartz-ref.png \ leaky-dash-ref.png \ leaky-dashed-rectangle-ref.png \ - leaky-dashed-rectangle-ps-ref.png \ + leaky-dashed-rectangle-ps2-ref.png \ + leaky-dashed-rectangle-ps3-ref.png \ leaky-polygon-ref.png \ - leaky-polygon-ps-ref.png \ + leaky-polygon-ps2-ref.png \ + leaky-polygon-ps3-ref.png \ linear-gradient-reflect-ref.png \ linear-gradient-reflect-pdf-argb32-ref.png \ linear-gradient-reflect-pdf-rgb24-ref.png \ - linear-gradient-reflect-ps-ref.png \ + linear-gradient-reflect-ps3-ref.png \ linear-gradient-reflect-quartz-ref.png \ linear-gradient-pdf-ref.png \ - linear-gradient-ps-ref.png \ + linear-gradient-ps3-ref.png \ linear-gradient-quartz-ref.png \ linear-gradient-ref.png \ linear-gradient-svg12-ref.png \ linear-gradient-svg11-ref.png \ line-width-ref.png \ - line-width-scale-ps-ref.png \ + line-width-scale-ps2-ref.png \ + line-width-scale-ps3-ref.png \ line-width-scale-quartz-ref.png \ line-width-scale-ref.png \ long-dashed-lines-ref.png \ - long-dashed-lines-ps-ref.png \ + long-dashed-lines-ps2-ref.png \ + long-dashed-lines-ps3-ref.png \ long-dashed-lines-quartz-ref.png \ long-lines-ref.png \ mask-alpha-ref.png \ @@ -545,16 +602,20 @@ REFERENCE_IMAGES = \ meta-surface-pattern-rgb24-ref.png \ meta-surface-pattern-pdf-ref.png \ meta-surface-pattern-pdf-rgb24-ref.png \ - meta-surface-pattern-ps-argb32-ref.png \ - meta-surface-pattern-ps-rgb24-ref.png \ + meta-surface-pattern-ps2-argb32-ref.png \ + meta-surface-pattern-ps3-rgb24-ref.png \ + meta-surface-pattern-ps2-argb32-ref.png \ + meta-surface-pattern-ps3-rgb24-ref.png \ meta-surface-pattern-quartz-ref.png \ meta-surface-pattern-quartz-rgb24-ref.png \ meta-surface-pattern-svg-argb32-ref.png \ meta-surface-pattern-svg-rgb24-ref.png \ miter-precision-ref.png \ move-to-show-surface-ref.png \ - new-sub-path-ps-argb32-ref.png \ - new-sub-path-ps-rgb24-ref.png \ + new-sub-path-ps2-argb32-ref.png \ + new-sub-path-ps3-argb32-ref.png \ + new-sub-path-ps2-rgb24-ref.png \ + new-sub-path-ps3-rgb24-ref.png \ new-sub-path-quartz-ref.png \ new-sub-path-quartz-rgb24-ref.png \ new-sub-path-ref.png \ @@ -577,21 +638,26 @@ REFERENCE_IMAGES = \ operator-source-rgb24-ref.png \ operator-source-quartz-ref.png \ operator-source-quartz-rgb24-ref.png \ - over-above-source-ps-argb32-ref.png \ + over-above-source-ps2-argb32-ref.png \ + over-above-source-ps3-argb32-ref.png \ over-above-source-quartz-ref.png \ over-above-source-quartz-rgb24-ref.png \ over-above-source-ref.png \ over-above-source-rgb24-ref.png \ - over-around-source-ps-argb32-ref.png \ - over-around-source-ps-rgb24-ref.png \ + over-around-source-ps2-argb32-ref.png \ + over-around-source-ps3-argb32-ref.png \ + over-around-source-ps2-rgb24-ref.png \ + over-around-source-ps3-rgb24-ref.png \ over-around-source-quartz-ref.png \ over-around-source-quartz-rgb24-ref.png \ over-around-source-ref.png \ over-around-source-rgb24-ref.png \ - over-below-source-ps-argb32-ref.png \ + over-below-source-ps2-argb32-ref.png \ + over-below-source-ps3-argb32-ref.png \ over-below-source-ref.png \ over-below-source-rgb24-ref.png \ - over-between-source-ps-argb32-ref.png \ + over-between-source-ps2-argb32-ref.png \ + over-between-source-ps3-argb32-ref.png \ over-between-source-quartz-ref.png \ over-between-source-quartz-rgb24-ref.png \ over-between-source-ref.png \ @@ -623,24 +689,29 @@ REFERENCE_IMAGES = \ radial-gradient-svg12-ref.png \ radial-gradient-svg11-ref.png \ random-intersections-ref.png \ - random-intersections-ps-ref.png \ + random-intersections-ps2-ref.png \ + random-intersections-ps3-ref.png \ random-intersections-quartz-ref.png \ rgb24-ignore-alpha-ref.png \ rectangle-rounding-error-ref.png \ rectilinear-fill-ref.png \ rectilinear-miter-limit-ref.png \ - rectilinear-miter-limit-ps-ref.png \ + rectilinear-miter-limit-ps2-ref.png \ + rectilinear-miter-limit-ps3-ref.png \ rectilinear-stroke-ref.png \ reflected-stroke-ref.png \ - reflected-stroke-ps-ref.png \ + reflected-stroke-ps2-ref.png \ + reflected-stroke-ps3-ref.png \ reflected-stroke-quartz-ref.png \ rel-path-quartz-ref.png \ rel-path-quartz-rgb24-ref.png \ - rel-path-ps-rgb24-ref.png \ + rel-path-ps2-rgb24-ref.png \ + rel-path-ps3-rgb24-ref.png \ rel-path-ref.png \ rel-path-rgb24-ref.png \ rotate-image-surface-paint-pdf-rgb24-ref.png \ - rotate-image-surface-paint-ps-ref.png \ + rotate-image-surface-paint-ps2-ref.png \ + rotate-image-surface-paint-ps3-ref.png \ rotate-image-surface-paint-pdf-argb32-ref.png \ rotate-image-surface-paint-quartz-ref.png \ rotate-image-surface-paint-ref.png \ @@ -656,10 +727,12 @@ REFERENCE_IMAGES = \ stroke-ctm-caps-ref.png \ stroke-ctm-caps-quartz-ref.png \ select-font-face-ref.png \ - select-font-face-ps-ref.png \ + select-font-face-ps2-ref.png \ + select-font-face-ps3-ref.png \ select-font-face-quartz-ref.png \ self-copy-ref.png \ - self-copy-ps-ref.png \ + self-copy-ps2-ref.png \ + self-copy-ps3-ref.png \ self-copy-overlap-ref.png \ self-copy-overlap-rgb24-ref.png \ self-intersecting-ref.png \ @@ -669,13 +742,16 @@ REFERENCE_IMAGES = \ set-source-svg-argb32-ref.png \ show-glyphs-many-ref.png \ show-text-current-point-ref.png \ - show-text-current-point-ps-ref.png \ + show-text-current-point-ps2-ref.png \ + show-text-current-point-ps3-ref.png \ show-text-current-point-quartz-ref.png \ skew-extreme-ref.png \ - skew-extreme-ps-ref.png \ + skew-extreme-ps2-ref.png \ + skew-extreme-ps3-ref.png \ smask-ref.png \ smask-pdf-ref.png \ - smask-ps-ref.png \ + smask-ps2-ref.png \ + smask-ps3-ref.png \ smask-svg12-ref.png \ smask-svg11-ref.png \ smask-fill-ref.png \ @@ -696,35 +772,43 @@ REFERENCE_IMAGES = \ smask-stroke-pdf-ref.png \ smask-text-ref.png \ smask-text-pdf-ref.png \ - smask-text-ps-ref.png \ + smask-text-ps2-ref.png \ + smask-text-ps3-ref.png \ smask-text-svg12-ref.png \ smask-text-svg11-ref.png \ stroke-image-ref.png \ stroke-image-pdf-ref.png \ - stroke-image-ps-ref.png \ + stroke-image-ps2-ref.png \ + stroke-image-ps3-ref.png \ stroke-image-quartz-ref.png \ solid-pattern-cache-stress-ref.png \ source-clip-ref.png \ source-clip-scale-quartz-ref.png \ - source-clip-scale-ps-argb32-ref.png \ - source-clip-scale-ps-rgb24-ref.png \ + source-clip-scale-ps2-argb32-ref.png \ + source-clip-scale-ps3-argb32-ref.png \ + source-clip-scale-ps2-rgb24-ref.png \ + source-clip-scale-ps3-rgb24-ref.png \ source-clip-scale-ref.png \ source-clip-scale-svg12-ref.png \ source-clip-scale-svg11-ref.png \ source-clip-scale-pdf-ref.png \ source-surface-scale-paint-ref.png \ source-surface-scale-paint-rgb24-ref.png \ - stroke-ctm-caps-ps-ref.png \ + stroke-ctm-caps-ps2-ref.png \ + stroke-ctm-caps-ps3-ref.png \ surface-pattern-big-scale-down-ref.png \ surface-pattern-pdf-argb32-ref.png \ - surface-pattern-ps-argb32-ref.png \ + surface-pattern-ps2-argb32-ref.png \ + surface-pattern-ps3-argb32-ref.png \ surface-pattern-ref.png \ surface-pattern-scale-down-pdf-argb32-ref.png \ - surface-pattern-scale-down-ps-argb32-ref.png \ + surface-pattern-scale-down-ps2-argb32-ref.png \ + surface-pattern-scale-down-ps3-argb32-ref.png \ surface-pattern-scale-down-ref.png \ surface-pattern-scale-down-quartz-ref.png \ surface-pattern-scale-up-pdf-argb32-ref.png \ - surface-pattern-scale-up-ps-argb32-ref.png \ + surface-pattern-scale-up-ps2-argb32-ref.png \ + surface-pattern-scale-up-ps3-argb32-ref.png \ surface-pattern-scale-up-ref.png \ surface-pattern-svg12-ref.png \ surface-pattern-svg11-ref.png \ @@ -737,8 +821,8 @@ REFERENCE_IMAGES = \ text-antialias-subpixel-quartz-ref.png \ text-glyph-range-ref.png \ text-glyph-range-rgb24-ref.png \ - text-pattern-ps-argb32-ref.png \ - text-pattern-ps-rgb24-ref.png \ + text-pattern-ps3-argb32-ref.png \ + text-pattern-ps3-rgb24-ref.png \ text-pattern-ref.png \ text-pattern-rgb24-ref.png \ text-pattern-svg-argb32-ref.png \ @@ -749,20 +833,25 @@ REFERENCE_IMAGES = \ text-pattern-quartz-rgb24-ref.png \ text-rotate-ref.png \ text-rotate-pdf-ref.png \ - text-rotate-ps-ref.png \ + text-rotate-ps2-ref.png \ + text-rotate-ps3-ref.png \ text-rotate-svg12-ref.png \ text-rotate-svg11-ref.png \ text-rotate-quartz-ref.png \ text-transform-ref.png \ text-transform-pdf-ref.png \ - text-transform-ps-ref.png \ + text-transform-ps2-ref.png \ + text-transform-ps3-ref.png \ transforms-ref.png \ - transforms-ps-ref.png \ + transforms-ps2-ref.png \ + transforms-ps3-ref.png \ translate-show-surface-ref.png \ trap-clip-quartz-ref.png \ trap-clip-quartz-rgb24-ref.png \ - trap-clip-ps-argb32-ref.png \ - trap-clip-ps-rgb24-ref.png \ + trap-clip-ps2-argb32-ref.png \ + trap-clip-ps3-argb32-ref.png \ + trap-clip-ps2-rgb24-ref.png \ + trap-clip-ps3-rgb24-ref.png \ trap-clip-ref.png \ trap-clip-rgb24-ref.png \ trap-clip-pdf-argb32-ref.png \ @@ -772,16 +861,19 @@ REFERENCE_IMAGES = \ unbounded-operator-ref.png \ unbounded-operator-rgb24-ref.png \ user-font-ref.png \ - user-font-ps-ref.png \ + user-font-ps2-ref.png \ + user-font-ps3-ref.png \ user-font-svg12-ref.png \ user-font-svg11-ref.png \ user-font-proxy-ref.png \ user-font-proxy-pdf-ref.png \ - user-font-proxy-ps-ref.png \ + user-font-proxy-ps2-ref.png \ + user-font-proxy-ps3-ref.png \ user-font-proxy-svg12-ref.png \ user-font-proxy-svg11-ref.png \ user-font-rescale-ref.png \ - user-font-rescale-ps-ref.png \ + user-font-rescale-ps2-ref.png \ + user-font-rescale-ps3-ref.png \ user-font-rescale-svg12-ref.png \ user-font-rescale-svg11-ref.png \ unbounded-operator-quartz-ref.png \ diff --git a/test/big-line-ps-ref.png b/test/big-line-ps2-ref.png similarity index 100% rename from test/big-line-ps-ref.png rename to test/big-line-ps2-ref.png diff --git a/test/big-line-ps-rgb24-ref.png b/test/big-line-ps2-rgb24-ref.png similarity index 100% rename from test/big-line-ps-rgb24-ref.png rename to test/big-line-ps2-rgb24-ref.png diff --git a/test/big-line-ps3-ref.png b/test/big-line-ps3-ref.png new file mode 100644 index 000000000..2a4f57c9d Binary files /dev/null and b/test/big-line-ps3-ref.png differ diff --git a/test/big-line-ps3-rgb24-ref.png b/test/big-line-ps3-rgb24-ref.png new file mode 100644 index 000000000..d3d2356ca Binary files /dev/null and b/test/big-line-ps3-rgb24-ref.png differ diff --git a/test/caps-joins-ps-ref.png b/test/caps-joins-ps2-ref.png similarity index 100% rename from test/caps-joins-ps-ref.png rename to test/caps-joins-ps2-ref.png diff --git a/test/caps-joins-ps3-ref.png b/test/caps-joins-ps3-ref.png new file mode 100644 index 000000000..1d473ac7d Binary files /dev/null and b/test/caps-joins-ps3-ref.png differ diff --git a/test/clip-fill-rule-ps-argb32-ref.png b/test/clip-fill-rule-ps2-argb32-ref.png similarity index 100% rename from test/clip-fill-rule-ps-argb32-ref.png rename to test/clip-fill-rule-ps2-argb32-ref.png diff --git a/test/clip-fill-rule-ps-rgb24-ref.png b/test/clip-fill-rule-ps2-rgb24-ref.png similarity index 100% rename from test/clip-fill-rule-ps-rgb24-ref.png rename to test/clip-fill-rule-ps2-rgb24-ref.png diff --git a/test/clip-fill-rule-ps3-argb32-ref.png b/test/clip-fill-rule-ps3-argb32-ref.png new file mode 100644 index 000000000..67a898892 Binary files /dev/null and b/test/clip-fill-rule-ps3-argb32-ref.png differ diff --git a/test/clip-fill-rule-ps3-rgb24-ref.png b/test/clip-fill-rule-ps3-rgb24-ref.png new file mode 100644 index 000000000..0697a42f4 Binary files /dev/null and b/test/clip-fill-rule-ps3-rgb24-ref.png differ diff --git a/test/clip-nesting-ps-argb32-ref.png b/test/clip-nesting-ps2-argb32-ref.png similarity index 100% rename from test/clip-nesting-ps-argb32-ref.png rename to test/clip-nesting-ps2-argb32-ref.png diff --git a/test/clip-nesting-ps-rgb24-ref.png b/test/clip-nesting-ps2-rgb24-ref.png similarity index 100% rename from test/clip-nesting-ps-rgb24-ref.png rename to test/clip-nesting-ps2-rgb24-ref.png diff --git a/test/clip-nesting-ps3-argb32-ref.png b/test/clip-nesting-ps3-argb32-ref.png new file mode 100644 index 000000000..41f7160c3 Binary files /dev/null and b/test/clip-nesting-ps3-argb32-ref.png differ diff --git a/test/clip-nesting-ps3-rgb24-ref.png b/test/clip-nesting-ps3-rgb24-ref.png new file mode 100644 index 000000000..8238deba8 Binary files /dev/null and b/test/clip-nesting-ps3-rgb24-ref.png differ diff --git a/test/clip-operator-ps-rgb24-ref.png b/test/clip-operator-ps2-rgb24-ref.png similarity index 100% rename from test/clip-operator-ps-rgb24-ref.png rename to test/clip-operator-ps2-rgb24-ref.png diff --git a/test/clip-operator-ps3-ref.png b/test/clip-operator-ps3-ref.png new file mode 100644 index 000000000..dee12ca8c Binary files /dev/null and b/test/clip-operator-ps3-ref.png differ diff --git a/test/clip-operator-ps3-rgb24-ref.png b/test/clip-operator-ps3-rgb24-ref.png new file mode 100644 index 000000000..6ed9fc456 Binary files /dev/null and b/test/clip-operator-ps3-rgb24-ref.png differ diff --git a/test/clip-push-group-ps-argb32-ref.png b/test/clip-push-group-ps2-argb32-ref.png similarity index 100% rename from test/clip-push-group-ps-argb32-ref.png rename to test/clip-push-group-ps2-argb32-ref.png diff --git a/test/clip-push-group-ps-rgb24-ref.png b/test/clip-push-group-ps2-rgb24-ref.png similarity index 100% rename from test/clip-push-group-ps-rgb24-ref.png rename to test/clip-push-group-ps2-rgb24-ref.png diff --git a/test/clip-push-group-ps3-argb32-ref.png b/test/clip-push-group-ps3-argb32-ref.png new file mode 100644 index 000000000..31b328425 Binary files /dev/null and b/test/clip-push-group-ps3-argb32-ref.png differ diff --git a/test/clip-push-group-ps3-rgb24-ref.png b/test/clip-push-group-ps3-rgb24-ref.png new file mode 100644 index 000000000..31b328425 Binary files /dev/null and b/test/clip-push-group-ps3-rgb24-ref.png differ diff --git a/test/clip-twice-ps-argb32-ref.png b/test/clip-twice-ps2-argb32-ref.png similarity index 100% rename from test/clip-twice-ps-argb32-ref.png rename to test/clip-twice-ps2-argb32-ref.png diff --git a/test/clip-twice-ps-rgb24-ref.png b/test/clip-twice-ps2-rgb24-ref.png similarity index 100% rename from test/clip-twice-ps-rgb24-ref.png rename to test/clip-twice-ps2-rgb24-ref.png diff --git a/test/clip-twice-ps3-argb32-ref.png b/test/clip-twice-ps3-argb32-ref.png new file mode 100644 index 000000000..0cb618622 Binary files /dev/null and b/test/clip-twice-ps3-argb32-ref.png differ diff --git a/test/clip-twice-ps3-rgb24-ref.png b/test/clip-twice-ps3-rgb24-ref.png new file mode 100644 index 000000000..8a121c408 Binary files /dev/null and b/test/clip-twice-ps3-rgb24-ref.png differ diff --git a/test/clipped-group-ps-ref.png b/test/clipped-group-ps2-ref.png similarity index 100% rename from test/clipped-group-ps-ref.png rename to test/clipped-group-ps2-ref.png diff --git a/test/clipped-group-ps3-ref.png b/test/clipped-group-ps3-ref.png new file mode 100644 index 000000000..6ce367090 Binary files /dev/null and b/test/clipped-group-ps3-ref.png differ diff --git a/test/close-path-ps-ref.png b/test/close-path-ps2-ref.png similarity index 100% rename from test/close-path-ps-ref.png rename to test/close-path-ps2-ref.png diff --git a/test/close-path-ps3-ref.png b/test/close-path-ps3-ref.png new file mode 100644 index 000000000..e43821c86 Binary files /dev/null and b/test/close-path-ps3-ref.png differ diff --git a/test/copy-path-ps-ref.png b/test/copy-path-ps2-ref.png similarity index 100% rename from test/copy-path-ps-ref.png rename to test/copy-path-ps2-ref.png diff --git a/test/copy-path-ps3-ref.png b/test/copy-path-ps3-ref.png new file mode 100644 index 000000000..f66015b2e Binary files /dev/null and b/test/copy-path-ps3-ref.png differ diff --git a/test/dash-caps-joins-ps-argb32-ref.png b/test/dash-caps-joins-ps2-argb32-ref.png similarity index 100% rename from test/dash-caps-joins-ps-argb32-ref.png rename to test/dash-caps-joins-ps2-argb32-ref.png diff --git a/test/dash-caps-joins-ps-rgb24-ref.png b/test/dash-caps-joins-ps2-rgb24-ref.png similarity index 100% rename from test/dash-caps-joins-ps-rgb24-ref.png rename to test/dash-caps-joins-ps2-rgb24-ref.png diff --git a/test/dash-caps-joins-ps3-argb32-ref.png b/test/dash-caps-joins-ps3-argb32-ref.png new file mode 100644 index 000000000..baadcb4ef Binary files /dev/null and b/test/dash-caps-joins-ps3-argb32-ref.png differ diff --git a/test/dash-caps-joins-ps3-rgb24-ref.png b/test/dash-caps-joins-ps3-rgb24-ref.png new file mode 100644 index 000000000..baadcb4ef Binary files /dev/null and b/test/dash-caps-joins-ps3-rgb24-ref.png differ diff --git a/test/dash-curve-ps-ref.png b/test/dash-curve-ps2-ref.png similarity index 100% rename from test/dash-curve-ps-ref.png rename to test/dash-curve-ps2-ref.png diff --git a/test/dash-curve-ps3-ref.png b/test/dash-curve-ps3-ref.png new file mode 100644 index 000000000..25a768be1 Binary files /dev/null and b/test/dash-curve-ps3-ref.png differ diff --git a/test/dash-scale-ps-argb32-ref.png b/test/dash-scale-ps2-argb32-ref.png similarity index 100% rename from test/dash-scale-ps-argb32-ref.png rename to test/dash-scale-ps2-argb32-ref.png diff --git a/test/dash-scale-ps-rgb24-ref.png b/test/dash-scale-ps2-rgb24-ref.png similarity index 100% rename from test/dash-scale-ps-rgb24-ref.png rename to test/dash-scale-ps2-rgb24-ref.png diff --git a/test/dash-scale-ps3-argb32-ref.png b/test/dash-scale-ps3-argb32-ref.png new file mode 100644 index 000000000..efe8b1191 Binary files /dev/null and b/test/dash-scale-ps3-argb32-ref.png differ diff --git a/test/dash-scale-ps3-rgb24-ref.png b/test/dash-scale-ps3-rgb24-ref.png new file mode 100644 index 000000000..5a92f55ca Binary files /dev/null and b/test/dash-scale-ps3-rgb24-ref.png differ diff --git a/test/dash-state-ps-ref.png b/test/dash-state-ps2-ref.png similarity index 100% rename from test/dash-state-ps-ref.png rename to test/dash-state-ps2-ref.png diff --git a/test/dash-state-ps3-ref.png b/test/dash-state-ps3-ref.png new file mode 100644 index 000000000..ec6904ea7 Binary files /dev/null and b/test/dash-state-ps3-ref.png differ diff --git a/test/dash-zero-length-ps-ref.png b/test/dash-zero-length-ps2-ref.png similarity index 100% rename from test/dash-zero-length-ps-ref.png rename to test/dash-zero-length-ps2-ref.png diff --git a/test/dash-zero-length-ps-rgb24-ref.png b/test/dash-zero-length-ps2-rgb24-ref.png similarity index 100% rename from test/dash-zero-length-ps-rgb24-ref.png rename to test/dash-zero-length-ps2-rgb24-ref.png diff --git a/test/dash-zero-length-ps3-ref.png b/test/dash-zero-length-ps3-ref.png new file mode 100644 index 000000000..68fd3fb2e Binary files /dev/null and b/test/dash-zero-length-ps3-ref.png differ diff --git a/test/dash-zero-length-ps3-rgb24-ref.png b/test/dash-zero-length-ps3-rgb24-ref.png new file mode 100644 index 000000000..8a4a40fd4 Binary files /dev/null and b/test/dash-zero-length-ps3-rgb24-ref.png differ diff --git a/test/degenerate-arc-ps-ref.png b/test/degenerate-arc-ps2-ref.png similarity index 100% rename from test/degenerate-arc-ps-ref.png rename to test/degenerate-arc-ps2-ref.png diff --git a/test/degenerate-arc-ps3-ref.png b/test/degenerate-arc-ps3-ref.png new file mode 100644 index 000000000..3cbf4dabf Binary files /dev/null and b/test/degenerate-arc-ps3-ref.png differ diff --git a/test/degenerate-path-ps-argb32-ref.png b/test/degenerate-path-ps2-argb32-ref.png similarity index 100% rename from test/degenerate-path-ps-argb32-ref.png rename to test/degenerate-path-ps2-argb32-ref.png diff --git a/test/degenerate-path-ps-rgb24-ref.png b/test/degenerate-path-ps2-rgb24-ref.png similarity index 100% rename from test/degenerate-path-ps-rgb24-ref.png rename to test/degenerate-path-ps2-rgb24-ref.png diff --git a/test/degenerate-path-ps3-argb32-ref.png b/test/degenerate-path-ps3-argb32-ref.png new file mode 100644 index 000000000..85b9d4ba9 Binary files /dev/null and b/test/degenerate-path-ps3-argb32-ref.png differ diff --git a/test/degenerate-path-ps3-rgb24-ref.png b/test/degenerate-path-ps3-rgb24-ref.png new file mode 100644 index 000000000..99e6c661d Binary files /dev/null and b/test/degenerate-path-ps3-rgb24-ref.png differ diff --git a/test/degenerate-pen-ps-ref.png b/test/degenerate-pen-ps2-ref.png similarity index 100% rename from test/degenerate-pen-ps-ref.png rename to test/degenerate-pen-ps2-ref.png diff --git a/test/degenerate-pen-ps3-ref.png b/test/degenerate-pen-ps3-ref.png new file mode 100644 index 000000000..2d0f07b70 Binary files /dev/null and b/test/degenerate-pen-ps3-ref.png differ diff --git a/test/device-offset-fractional-ps-ref.png b/test/device-offset-fractional-ps2-ref.png similarity index 100% rename from test/device-offset-fractional-ps-ref.png rename to test/device-offset-fractional-ps2-ref.png diff --git a/test/device-offset-fractional-ps3-ref.png b/test/device-offset-fractional-ps3-ref.png new file mode 100644 index 000000000..72b144c54 Binary files /dev/null and b/test/device-offset-fractional-ps3-ref.png differ diff --git a/test/extend-reflect-ps-ref.png b/test/extend-reflect-ps2-ref.png similarity index 100% rename from test/extend-reflect-ps-ref.png rename to test/extend-reflect-ps2-ref.png diff --git a/test/extend-reflect-similar-ps-ref.png b/test/extend-reflect-ps3-ref.png similarity index 100% rename from test/extend-reflect-similar-ps-ref.png rename to test/extend-reflect-ps3-ref.png diff --git a/test/extend-reflect-similar-ps2-ref.png b/test/extend-reflect-similar-ps2-ref.png new file mode 100644 index 000000000..b33b38d33 Binary files /dev/null and b/test/extend-reflect-similar-ps2-ref.png differ diff --git a/test/extend-reflect-similar-ps3-ref.png b/test/extend-reflect-similar-ps3-ref.png new file mode 100644 index 000000000..b33b38d33 Binary files /dev/null and b/test/extend-reflect-similar-ps3-ref.png differ diff --git a/test/fill-alpha-pattern-ps-ref.png b/test/fill-alpha-pattern-ps3-ref.png similarity index 100% rename from test/fill-alpha-pattern-ps-ref.png rename to test/fill-alpha-pattern-ps3-ref.png diff --git a/test/fill-and-stroke-ps-argb32-ref.png b/test/fill-and-stroke-ps2-argb32-ref.png similarity index 100% rename from test/fill-and-stroke-ps-argb32-ref.png rename to test/fill-and-stroke-ps2-argb32-ref.png diff --git a/test/fill-and-stroke-ps-rgb24-ref.png b/test/fill-and-stroke-ps2-rgb24-ref.png similarity index 100% rename from test/fill-and-stroke-ps-rgb24-ref.png rename to test/fill-and-stroke-ps2-rgb24-ref.png diff --git a/test/fill-and-stroke-ps3-argb32-ref.png b/test/fill-and-stroke-ps3-argb32-ref.png new file mode 100644 index 000000000..850f0cbba Binary files /dev/null and b/test/fill-and-stroke-ps3-argb32-ref.png differ diff --git a/test/fill-and-stroke-ps3-rgb24-ref.png b/test/fill-and-stroke-ps3-rgb24-ref.png new file mode 100644 index 000000000..41e399169 Binary files /dev/null and b/test/fill-and-stroke-ps3-rgb24-ref.png differ diff --git a/test/fill-missed-stop-ps-argb32-ref.png b/test/fill-missed-stop-ps2-argb32-ref.png similarity index 100% rename from test/fill-missed-stop-ps-argb32-ref.png rename to test/fill-missed-stop-ps2-argb32-ref.png diff --git a/test/fill-missed-stop-ps-rgb24-ref.png b/test/fill-missed-stop-ps2-rgb24-ref.png similarity index 100% rename from test/fill-missed-stop-ps-rgb24-ref.png rename to test/fill-missed-stop-ps2-rgb24-ref.png diff --git a/test/fill-missed-stop-ps3-argb32-ref.png b/test/fill-missed-stop-ps3-argb32-ref.png new file mode 100644 index 000000000..b94a70899 Binary files /dev/null and b/test/fill-missed-stop-ps3-argb32-ref.png differ diff --git a/test/fill-missed-stop-ps3-rgb24-ref.png b/test/fill-missed-stop-ps3-rgb24-ref.png new file mode 100644 index 000000000..fd54c7b1e Binary files /dev/null and b/test/fill-missed-stop-ps3-rgb24-ref.png differ diff --git a/test/fill-rule-ps-argb32-ref.png b/test/fill-rule-ps2-argb32-ref.png similarity index 100% rename from test/fill-rule-ps-argb32-ref.png rename to test/fill-rule-ps2-argb32-ref.png diff --git a/test/fill-rule-ps-rgb24-ref.png b/test/fill-rule-ps2-rgb24-ref.png similarity index 100% rename from test/fill-rule-ps-rgb24-ref.png rename to test/fill-rule-ps2-rgb24-ref.png diff --git a/test/fill-rule-ps3-argb32-ref.png b/test/fill-rule-ps3-argb32-ref.png new file mode 100644 index 000000000..971b5601a Binary files /dev/null and b/test/fill-rule-ps3-argb32-ref.png differ diff --git a/test/fill-rule-ps3-rgb24-ref.png b/test/fill-rule-ps3-rgb24-ref.png new file mode 100644 index 000000000..8e1efc242 Binary files /dev/null and b/test/fill-rule-ps3-rgb24-ref.png differ diff --git a/test/finer-grained-fallbacks-ps-argb32-ref.png b/test/finer-grained-fallbacks-ps2-argb32-ref.png similarity index 100% rename from test/finer-grained-fallbacks-ps-argb32-ref.png rename to test/finer-grained-fallbacks-ps2-argb32-ref.png diff --git a/test/finer-grained-fallbacks-ps-rgb24-ref.png b/test/finer-grained-fallbacks-ps2-rgb24-ref.png similarity index 100% rename from test/finer-grained-fallbacks-ps-rgb24-ref.png rename to test/finer-grained-fallbacks-ps2-rgb24-ref.png diff --git a/test/finer-grained-fallbacks-ps3-argb32-ref.png b/test/finer-grained-fallbacks-ps3-argb32-ref.png new file mode 100644 index 000000000..402f01b85 Binary files /dev/null and b/test/finer-grained-fallbacks-ps3-argb32-ref.png differ diff --git a/test/finer-grained-fallbacks-ps3-rgb24-ref.png b/test/finer-grained-fallbacks-ps3-rgb24-ref.png new file mode 100644 index 000000000..e821344f0 Binary files /dev/null and b/test/finer-grained-fallbacks-ps3-rgb24-ref.png differ diff --git a/test/font-matrix-translation-ps-argb32-ref.png b/test/font-matrix-translation-ps2-argb32-ref.png similarity index 100% rename from test/font-matrix-translation-ps-argb32-ref.png rename to test/font-matrix-translation-ps2-argb32-ref.png diff --git a/test/font-matrix-translation-ps-rgb24-ref.png b/test/font-matrix-translation-ps2-rgb24-ref.png similarity index 100% rename from test/font-matrix-translation-ps-rgb24-ref.png rename to test/font-matrix-translation-ps2-rgb24-ref.png diff --git a/test/font-matrix-translation-ps3-argb32-ref.png b/test/font-matrix-translation-ps3-argb32-ref.png new file mode 100644 index 000000000..41d05a07d Binary files /dev/null and b/test/font-matrix-translation-ps3-argb32-ref.png differ diff --git a/test/font-matrix-translation-ps3-rgb24-ref.png b/test/font-matrix-translation-ps3-rgb24-ref.png new file mode 100644 index 000000000..41d05a07d Binary files /dev/null and b/test/font-matrix-translation-ps3-rgb24-ref.png differ diff --git a/test/ft-show-glyphs-positioning-ps-ref.png b/test/ft-show-glyphs-positioning-ps2-ref.png similarity index 100% rename from test/ft-show-glyphs-positioning-ps-ref.png rename to test/ft-show-glyphs-positioning-ps2-ref.png diff --git a/test/ft-show-glyphs-positioning-ps3-ref.png b/test/ft-show-glyphs-positioning-ps3-ref.png new file mode 100644 index 000000000..c5fbf30b5 Binary files /dev/null and b/test/ft-show-glyphs-positioning-ps3-ref.png differ diff --git a/test/ft-show-glyphs-table-ps-ref.png b/test/ft-show-glyphs-table-ps2-ref.png similarity index 100% rename from test/ft-show-glyphs-table-ps-ref.png rename to test/ft-show-glyphs-table-ps2-ref.png diff --git a/test/ft-show-glyphs-table-ps3-ref.png b/test/ft-show-glyphs-table-ps3-ref.png new file mode 100644 index 000000000..5143663fc Binary files /dev/null and b/test/ft-show-glyphs-table-ps3-ref.png differ diff --git a/test/ft-text-antialias-none-ps-argb32-ref.png b/test/ft-text-antialias-none-ps2-argb32-ref.png similarity index 100% rename from test/ft-text-antialias-none-ps-argb32-ref.png rename to test/ft-text-antialias-none-ps2-argb32-ref.png diff --git a/test/ft-text-antialias-none-ps3-argb32-ref.png b/test/ft-text-antialias-none-ps3-argb32-ref.png new file mode 100644 index 000000000..4f7ee8324 Binary files /dev/null and b/test/ft-text-antialias-none-ps3-argb32-ref.png differ diff --git a/test/ft-text-vertical-layout-type1-ps-ref.png b/test/ft-text-vertical-layout-type1-ps2-ref.png similarity index 100% rename from test/ft-text-vertical-layout-type1-ps-ref.png rename to test/ft-text-vertical-layout-type1-ps2-ref.png diff --git a/test/ft-text-vertical-layout-type1-ps3-ref.png b/test/ft-text-vertical-layout-type1-ps3-ref.png new file mode 100644 index 000000000..4523495bb Binary files /dev/null and b/test/ft-text-vertical-layout-type1-ps3-ref.png differ diff --git a/test/ft-text-vertical-layout-type3-ps-ref.png b/test/ft-text-vertical-layout-type3-ps2-ref.png similarity index 100% rename from test/ft-text-vertical-layout-type3-ps-ref.png rename to test/ft-text-vertical-layout-type3-ps2-ref.png diff --git a/test/ft-text-vertical-layout-type3-ps3-ref.png b/test/ft-text-vertical-layout-type3-ps3-ref.png new file mode 100644 index 000000000..e6ad8fc0b Binary files /dev/null and b/test/ft-text-vertical-layout-type3-ps3-ref.png differ diff --git a/test/glyph-cache-pressure-ps-ref.png b/test/glyph-cache-pressure-ps2-ref.png similarity index 100% rename from test/glyph-cache-pressure-ps-ref.png rename to test/glyph-cache-pressure-ps2-ref.png diff --git a/test/glyph-cache-pressure-ps3-ref.png b/test/glyph-cache-pressure-ps3-ref.png new file mode 100644 index 000000000..88fa4478b Binary files /dev/null and b/test/glyph-cache-pressure-ps3-ref.png differ diff --git a/test/gradient-alpha-ps-argb32-ref.png b/test/gradient-alpha-ps2-argb32-ref.png similarity index 100% rename from test/gradient-alpha-ps-argb32-ref.png rename to test/gradient-alpha-ps2-argb32-ref.png diff --git a/test/gradient-alpha-ps-rgb24-ref.png b/test/gradient-alpha-ps2-rgb24-ref.png similarity index 100% rename from test/gradient-alpha-ps-rgb24-ref.png rename to test/gradient-alpha-ps2-rgb24-ref.png diff --git a/test/gradient-alpha-ps3-argb32-ref.png b/test/gradient-alpha-ps3-argb32-ref.png new file mode 100644 index 000000000..37eafba3c Binary files /dev/null and b/test/gradient-alpha-ps3-argb32-ref.png differ diff --git a/test/gradient-alpha-ps3-rgb24-ref.png b/test/gradient-alpha-ps3-rgb24-ref.png new file mode 100644 index 000000000..2432c2996 Binary files /dev/null and b/test/gradient-alpha-ps3-rgb24-ref.png differ diff --git a/test/gradient-constant-alpha-ps-ref.png b/test/gradient-constant-alpha-ps2-ref.png similarity index 100% rename from test/gradient-constant-alpha-ps-ref.png rename to test/gradient-constant-alpha-ps2-ref.png diff --git a/test/gradient-constant-alpha-ps-rgb24-ref.png b/test/gradient-constant-alpha-ps2-rgb24-ref.png similarity index 100% rename from test/gradient-constant-alpha-ps-rgb24-ref.png rename to test/gradient-constant-alpha-ps2-rgb24-ref.png diff --git a/test/gradient-constant-alpha-ps3-ref.png b/test/gradient-constant-alpha-ps3-ref.png new file mode 100644 index 000000000..7089f4fdc Binary files /dev/null and b/test/gradient-constant-alpha-ps3-ref.png differ diff --git a/test/gradient-constant-alpha-ps3-rgb24-ref.png b/test/gradient-constant-alpha-ps3-rgb24-ref.png new file mode 100644 index 000000000..5962925f2 Binary files /dev/null and b/test/gradient-constant-alpha-ps3-rgb24-ref.png differ diff --git a/test/infinite-join-ps-ref.png b/test/infinite-join-ps2-ref.png similarity index 100% rename from test/infinite-join-ps-ref.png rename to test/infinite-join-ps2-ref.png diff --git a/test/infinite-join-ps3-ref.png b/test/infinite-join-ps3-ref.png new file mode 100644 index 000000000..6fba8f4b1 Binary files /dev/null and b/test/infinite-join-ps3-ref.png differ diff --git a/test/leaky-dash-ps-argb32-ref.png b/test/leaky-dash-ps2-argb32-ref.png similarity index 100% rename from test/leaky-dash-ps-argb32-ref.png rename to test/leaky-dash-ps2-argb32-ref.png diff --git a/test/leaky-dash-ps-rgb24-ref.png b/test/leaky-dash-ps2-rgb24-ref.png similarity index 100% rename from test/leaky-dash-ps-rgb24-ref.png rename to test/leaky-dash-ps2-rgb24-ref.png diff --git a/test/leaky-dash-ps3-argb32-ref.png b/test/leaky-dash-ps3-argb32-ref.png new file mode 100644 index 000000000..93b8640a9 Binary files /dev/null and b/test/leaky-dash-ps3-argb32-ref.png differ diff --git a/test/leaky-dash-ps3-rgb24-ref.png b/test/leaky-dash-ps3-rgb24-ref.png new file mode 100644 index 000000000..c11eb4807 Binary files /dev/null and b/test/leaky-dash-ps3-rgb24-ref.png differ diff --git a/test/leaky-dashed-rectangle-ps-ref.png b/test/leaky-dashed-rectangle-ps2-ref.png similarity index 100% rename from test/leaky-dashed-rectangle-ps-ref.png rename to test/leaky-dashed-rectangle-ps2-ref.png diff --git a/test/leaky-dashed-rectangle-ps3-ref.png b/test/leaky-dashed-rectangle-ps3-ref.png new file mode 100644 index 000000000..e432de268 Binary files /dev/null and b/test/leaky-dashed-rectangle-ps3-ref.png differ diff --git a/test/leaky-polygon-ps-ref.png b/test/leaky-polygon-ps2-ref.png similarity index 100% rename from test/leaky-polygon-ps-ref.png rename to test/leaky-polygon-ps2-ref.png diff --git a/test/leaky-polygon-ps3-ref.png b/test/leaky-polygon-ps3-ref.png new file mode 100644 index 000000000..5e8808c46 Binary files /dev/null and b/test/leaky-polygon-ps3-ref.png differ diff --git a/test/line-width-scale-ps-ref.png b/test/line-width-scale-ps2-ref.png similarity index 100% rename from test/line-width-scale-ps-ref.png rename to test/line-width-scale-ps2-ref.png diff --git a/test/line-width-scale-ps3-ref.png b/test/line-width-scale-ps3-ref.png new file mode 100644 index 000000000..9d95aafaa Binary files /dev/null and b/test/line-width-scale-ps3-ref.png differ diff --git a/test/linear-gradient-ps-ref.png b/test/linear-gradient-ps3-ref.png similarity index 100% rename from test/linear-gradient-ps-ref.png rename to test/linear-gradient-ps3-ref.png diff --git a/test/linear-gradient-reflect-ps-ref.png b/test/linear-gradient-reflect-ps3-ref.png similarity index 100% rename from test/linear-gradient-reflect-ps-ref.png rename to test/linear-gradient-reflect-ps3-ref.png diff --git a/test/long-dashed-lines-ps-ref.png b/test/long-dashed-lines-ps2-ref.png similarity index 100% rename from test/long-dashed-lines-ps-ref.png rename to test/long-dashed-lines-ps2-ref.png diff --git a/test/long-dashed-lines-ps3-ref.png b/test/long-dashed-lines-ps3-ref.png new file mode 100644 index 000000000..82484f4f8 Binary files /dev/null and b/test/long-dashed-lines-ps3-ref.png differ diff --git a/test/meta-surface-pattern-ps-argb32-ref.png b/test/meta-surface-pattern-ps2-argb32-ref.png similarity index 100% rename from test/meta-surface-pattern-ps-argb32-ref.png rename to test/meta-surface-pattern-ps2-argb32-ref.png diff --git a/test/meta-surface-pattern-ps-rgb24-ref.png b/test/meta-surface-pattern-ps2-rgb24-ref.png similarity index 100% rename from test/meta-surface-pattern-ps-rgb24-ref.png rename to test/meta-surface-pattern-ps2-rgb24-ref.png diff --git a/test/meta-surface-pattern-ps3-argb32-ref.png b/test/meta-surface-pattern-ps3-argb32-ref.png new file mode 100644 index 000000000..fbd58ef7a Binary files /dev/null and b/test/meta-surface-pattern-ps3-argb32-ref.png differ diff --git a/test/meta-surface-pattern-ps3-rgb24-ref.png b/test/meta-surface-pattern-ps3-rgb24-ref.png new file mode 100644 index 000000000..84da8daf2 Binary files /dev/null and b/test/meta-surface-pattern-ps3-rgb24-ref.png differ diff --git a/test/new-sub-path-ps-argb32-ref.png b/test/new-sub-path-ps2-argb32-ref.png similarity index 100% rename from test/new-sub-path-ps-argb32-ref.png rename to test/new-sub-path-ps2-argb32-ref.png diff --git a/test/new-sub-path-ps-rgb24-ref.png b/test/new-sub-path-ps2-rgb24-ref.png similarity index 100% rename from test/new-sub-path-ps-rgb24-ref.png rename to test/new-sub-path-ps2-rgb24-ref.png diff --git a/test/new-sub-path-ps3-argb32-ref.png b/test/new-sub-path-ps3-argb32-ref.png new file mode 100644 index 000000000..69257d904 Binary files /dev/null and b/test/new-sub-path-ps3-argb32-ref.png differ diff --git a/test/new-sub-path-ps3-rgb24-ref.png b/test/new-sub-path-ps3-rgb24-ref.png new file mode 100644 index 000000000..bceb5b75a Binary files /dev/null and b/test/new-sub-path-ps3-rgb24-ref.png differ diff --git a/test/over-above-source-ps-argb32-ref.png b/test/over-above-source-ps2-argb32-ref.png similarity index 100% rename from test/over-above-source-ps-argb32-ref.png rename to test/over-above-source-ps2-argb32-ref.png diff --git a/test/over-above-source-ps3-argb32-ref.png b/test/over-above-source-ps3-argb32-ref.png new file mode 100644 index 000000000..886faad4c Binary files /dev/null and b/test/over-above-source-ps3-argb32-ref.png differ diff --git a/test/over-around-source-ps-argb32-ref.png b/test/over-around-source-ps2-argb32-ref.png similarity index 100% rename from test/over-around-source-ps-argb32-ref.png rename to test/over-around-source-ps2-argb32-ref.png diff --git a/test/over-around-source-ps-rgb24-ref.png b/test/over-around-source-ps2-rgb24-ref.png similarity index 100% rename from test/over-around-source-ps-rgb24-ref.png rename to test/over-around-source-ps2-rgb24-ref.png diff --git a/test/over-around-source-ps3-argb32-ref.png b/test/over-around-source-ps3-argb32-ref.png new file mode 100644 index 000000000..ea6de6964 Binary files /dev/null and b/test/over-around-source-ps3-argb32-ref.png differ diff --git a/test/over-around-source-ps3-rgb24-ref.png b/test/over-around-source-ps3-rgb24-ref.png new file mode 100644 index 000000000..ee325eab3 Binary files /dev/null and b/test/over-around-source-ps3-rgb24-ref.png differ diff --git a/test/over-below-source-ps-argb32-ref.png b/test/over-below-source-ps2-argb32-ref.png similarity index 100% rename from test/over-below-source-ps-argb32-ref.png rename to test/over-below-source-ps2-argb32-ref.png diff --git a/test/over-below-source-ps3-argb32-ref.png b/test/over-below-source-ps3-argb32-ref.png new file mode 100644 index 000000000..980ad5f95 Binary files /dev/null and b/test/over-below-source-ps3-argb32-ref.png differ diff --git a/test/over-between-source-ps-argb32-ref.png b/test/over-between-source-ps2-argb32-ref.png similarity index 100% rename from test/over-between-source-ps-argb32-ref.png rename to test/over-between-source-ps2-argb32-ref.png diff --git a/test/over-between-source-ps3-argb32-ref.png b/test/over-between-source-ps3-argb32-ref.png new file mode 100644 index 000000000..43e9424bd Binary files /dev/null and b/test/over-between-source-ps3-argb32-ref.png differ diff --git a/test/random-intersections-ps-ref.png b/test/random-intersections-ps2-ref.png similarity index 100% rename from test/random-intersections-ps-ref.png rename to test/random-intersections-ps2-ref.png diff --git a/test/random-intersections-ps3-ref.png b/test/random-intersections-ps3-ref.png new file mode 100644 index 000000000..590c83248 Binary files /dev/null and b/test/random-intersections-ps3-ref.png differ diff --git a/test/rectilinear-miter-limit-ps-ref.png b/test/rectilinear-miter-limit-ps2-ref.png similarity index 100% rename from test/rectilinear-miter-limit-ps-ref.png rename to test/rectilinear-miter-limit-ps2-ref.png diff --git a/test/rectilinear-miter-limit-ps3-ref.png b/test/rectilinear-miter-limit-ps3-ref.png new file mode 100644 index 000000000..821306067 Binary files /dev/null and b/test/rectilinear-miter-limit-ps3-ref.png differ diff --git a/test/reflected-stroke-ps-ref.png b/test/reflected-stroke-ps2-ref.png similarity index 100% rename from test/reflected-stroke-ps-ref.png rename to test/reflected-stroke-ps2-ref.png diff --git a/test/reflected-stroke-ps3-ref.png b/test/reflected-stroke-ps3-ref.png new file mode 100644 index 000000000..6290a176c Binary files /dev/null and b/test/reflected-stroke-ps3-ref.png differ diff --git a/test/rel-path-ps-rgb24-ref.png b/test/rel-path-ps2-rgb24-ref.png similarity index 100% rename from test/rel-path-ps-rgb24-ref.png rename to test/rel-path-ps2-rgb24-ref.png diff --git a/test/rel-path-ps3-rgb24-ref.png b/test/rel-path-ps3-rgb24-ref.png new file mode 100644 index 000000000..ccdcebbc6 Binary files /dev/null and b/test/rel-path-ps3-rgb24-ref.png differ diff --git a/test/rotate-image-surface-paint-ps-ref.png b/test/rotate-image-surface-paint-ps2-ref.png similarity index 100% rename from test/rotate-image-surface-paint-ps-ref.png rename to test/rotate-image-surface-paint-ps2-ref.png diff --git a/test/rotate-image-surface-paint-ps3-ref.png b/test/rotate-image-surface-paint-ps3-ref.png new file mode 100644 index 000000000..dd725064c Binary files /dev/null and b/test/rotate-image-surface-paint-ps3-ref.png differ diff --git a/test/select-font-face-ps-ref.png b/test/select-font-face-ps2-ref.png similarity index 100% rename from test/select-font-face-ps-ref.png rename to test/select-font-face-ps2-ref.png diff --git a/test/select-font-face-ps3-ref.png b/test/select-font-face-ps3-ref.png new file mode 100644 index 000000000..6c2f36115 Binary files /dev/null and b/test/select-font-face-ps3-ref.png differ diff --git a/test/self-copy-ps-ref.png b/test/self-copy-ps2-ref.png similarity index 100% rename from test/self-copy-ps-ref.png rename to test/self-copy-ps2-ref.png diff --git a/test/self-copy-ps3-ref.png b/test/self-copy-ps3-ref.png new file mode 100644 index 000000000..5c9dd5771 Binary files /dev/null and b/test/self-copy-ps3-ref.png differ diff --git a/test/show-text-current-point-ps-ref.png b/test/show-text-current-point-ps2-ref.png similarity index 100% rename from test/show-text-current-point-ps-ref.png rename to test/show-text-current-point-ps2-ref.png diff --git a/test/show-text-current-point-ps3-ref.png b/test/show-text-current-point-ps3-ref.png new file mode 100644 index 000000000..b42c48e7f Binary files /dev/null and b/test/show-text-current-point-ps3-ref.png differ diff --git a/test/skew-extreme-ps-ref.png b/test/skew-extreme-ps2-ref.png similarity index 100% rename from test/skew-extreme-ps-ref.png rename to test/skew-extreme-ps2-ref.png diff --git a/test/skew-extreme-ps3-ref.png b/test/skew-extreme-ps3-ref.png new file mode 100644 index 000000000..69f1d374f Binary files /dev/null and b/test/skew-extreme-ps3-ref.png differ diff --git a/test/smask-ps-ref.png b/test/smask-ps2-ref.png similarity index 100% rename from test/smask-ps-ref.png rename to test/smask-ps2-ref.png diff --git a/test/smask-ps3-ref.png b/test/smask-ps3-ref.png new file mode 100644 index 000000000..c006bbdaa Binary files /dev/null and b/test/smask-ps3-ref.png differ diff --git a/test/smask-text-ps-ref.png b/test/smask-text-ps2-ref.png similarity index 100% rename from test/smask-text-ps-ref.png rename to test/smask-text-ps2-ref.png diff --git a/test/smask-text-ps3-ref.png b/test/smask-text-ps3-ref.png new file mode 100644 index 000000000..ae61325cb Binary files /dev/null and b/test/smask-text-ps3-ref.png differ diff --git a/test/source-clip-scale-ps-argb32-ref.png b/test/source-clip-scale-ps2-argb32-ref.png similarity index 100% rename from test/source-clip-scale-ps-argb32-ref.png rename to test/source-clip-scale-ps2-argb32-ref.png diff --git a/test/source-clip-scale-ps-rgb24-ref.png b/test/source-clip-scale-ps2-rgb24-ref.png similarity index 100% rename from test/source-clip-scale-ps-rgb24-ref.png rename to test/source-clip-scale-ps2-rgb24-ref.png diff --git a/test/source-clip-scale-ps3-argb32-ref.png b/test/source-clip-scale-ps3-argb32-ref.png new file mode 100644 index 000000000..be57d7721 Binary files /dev/null and b/test/source-clip-scale-ps3-argb32-ref.png differ diff --git a/test/source-clip-scale-ps3-rgb24-ref.png b/test/source-clip-scale-ps3-rgb24-ref.png new file mode 100644 index 000000000..be57d7721 Binary files /dev/null and b/test/source-clip-scale-ps3-rgb24-ref.png differ diff --git a/test/stroke-ctm-caps-ps-ref.png b/test/stroke-ctm-caps-ps2-ref.png similarity index 100% rename from test/stroke-ctm-caps-ps-ref.png rename to test/stroke-ctm-caps-ps2-ref.png diff --git a/test/stroke-ctm-caps-ps3-ref.png b/test/stroke-ctm-caps-ps3-ref.png new file mode 100644 index 000000000..63c10645b Binary files /dev/null and b/test/stroke-ctm-caps-ps3-ref.png differ diff --git a/test/stroke-image-ps-ref.png b/test/stroke-image-ps2-ref.png similarity index 100% rename from test/stroke-image-ps-ref.png rename to test/stroke-image-ps2-ref.png diff --git a/test/stroke-image-ps3-ref.png b/test/stroke-image-ps3-ref.png new file mode 100644 index 000000000..f557c7504 Binary files /dev/null and b/test/stroke-image-ps3-ref.png differ diff --git a/test/surface-pattern-ps-argb32-ref.png b/test/surface-pattern-ps2-argb32-ref.png similarity index 100% rename from test/surface-pattern-ps-argb32-ref.png rename to test/surface-pattern-ps2-argb32-ref.png diff --git a/test/surface-pattern-ps3-argb32-ref.png b/test/surface-pattern-ps3-argb32-ref.png new file mode 100644 index 000000000..2ec3a53b9 Binary files /dev/null and b/test/surface-pattern-ps3-argb32-ref.png differ diff --git a/test/surface-pattern-scale-down-ps-argb32-ref.png b/test/surface-pattern-scale-down-ps2-argb32-ref.png similarity index 100% rename from test/surface-pattern-scale-down-ps-argb32-ref.png rename to test/surface-pattern-scale-down-ps2-argb32-ref.png diff --git a/test/surface-pattern-scale-down-ps3-argb32-ref.png b/test/surface-pattern-scale-down-ps3-argb32-ref.png new file mode 100644 index 000000000..1f0b3e057 Binary files /dev/null and b/test/surface-pattern-scale-down-ps3-argb32-ref.png differ diff --git a/test/surface-pattern-scale-up-ps-argb32-ref.png b/test/surface-pattern-scale-up-ps2-argb32-ref.png similarity index 100% rename from test/surface-pattern-scale-up-ps-argb32-ref.png rename to test/surface-pattern-scale-up-ps2-argb32-ref.png diff --git a/test/surface-pattern-scale-up-ps3-argb32-ref.png b/test/surface-pattern-scale-up-ps3-argb32-ref.png new file mode 100644 index 000000000..dc9f8d26a Binary files /dev/null and b/test/surface-pattern-scale-up-ps3-argb32-ref.png differ diff --git a/test/text-pattern-ps-argb32-ref.png b/test/text-pattern-ps3-argb32-ref.png similarity index 100% rename from test/text-pattern-ps-argb32-ref.png rename to test/text-pattern-ps3-argb32-ref.png diff --git a/test/text-pattern-ps-rgb24-ref.png b/test/text-pattern-ps3-rgb24-ref.png similarity index 100% rename from test/text-pattern-ps-rgb24-ref.png rename to test/text-pattern-ps3-rgb24-ref.png diff --git a/test/text-rotate-ps-ref.png b/test/text-rotate-ps2-ref.png similarity index 100% rename from test/text-rotate-ps-ref.png rename to test/text-rotate-ps2-ref.png diff --git a/test/text-rotate-ps3-ref.png b/test/text-rotate-ps3-ref.png new file mode 100644 index 000000000..125736bfc Binary files /dev/null and b/test/text-rotate-ps3-ref.png differ diff --git a/test/text-transform-ps-ref.png b/test/text-transform-ps2-ref.png similarity index 100% rename from test/text-transform-ps-ref.png rename to test/text-transform-ps2-ref.png diff --git a/test/text-transform-ps3-ref.png b/test/text-transform-ps3-ref.png new file mode 100644 index 000000000..6f33fb6cb Binary files /dev/null and b/test/text-transform-ps3-ref.png differ diff --git a/test/transforms-ps-ref.png b/test/transforms-ps2-ref.png similarity index 100% rename from test/transforms-ps-ref.png rename to test/transforms-ps2-ref.png diff --git a/test/transforms-ps3-ref.png b/test/transforms-ps3-ref.png new file mode 100644 index 000000000..6d195aaf3 Binary files /dev/null and b/test/transforms-ps3-ref.png differ diff --git a/test/trap-clip-ps-argb32-ref.png b/test/trap-clip-ps3-argb32-ref.png similarity index 100% rename from test/trap-clip-ps-argb32-ref.png rename to test/trap-clip-ps3-argb32-ref.png diff --git a/test/trap-clip-ps-rgb24-ref.png b/test/trap-clip-ps3-rgb24-ref.png similarity index 100% rename from test/trap-clip-ps-rgb24-ref.png rename to test/trap-clip-ps3-rgb24-ref.png diff --git a/test/user-font-proxy-ps-ref.png b/test/user-font-proxy-ps2-ref.png similarity index 100% rename from test/user-font-proxy-ps-ref.png rename to test/user-font-proxy-ps2-ref.png diff --git a/test/user-font-proxy-ps3-ref.png b/test/user-font-proxy-ps3-ref.png new file mode 100644 index 000000000..0d9024445 Binary files /dev/null and b/test/user-font-proxy-ps3-ref.png differ diff --git a/test/user-font-ps-ref.png b/test/user-font-ps2-ref.png similarity index 100% rename from test/user-font-ps-ref.png rename to test/user-font-ps2-ref.png diff --git a/test/user-font-ps3-ref.png b/test/user-font-ps3-ref.png new file mode 100644 index 000000000..e1dd00abf Binary files /dev/null and b/test/user-font-ps3-ref.png differ diff --git a/test/user-font-rescale-ps-ref.png b/test/user-font-rescale-ps2-ref.png similarity index 100% rename from test/user-font-rescale-ps-ref.png rename to test/user-font-rescale-ps2-ref.png diff --git a/test/user-font-rescale-ps3-ref.png b/test/user-font-rescale-ps3-ref.png new file mode 100644 index 000000000..7e112da88 Binary files /dev/null and b/test/user-font-rescale-ps3-ref.png differ