Bug 1387079 - only use SkRasterPipeline when SkJumper is accelerated. r=jrmuizel
authorLee Salzman <lsalzman@mozilla.com>
Tue, 10 Oct 2017 15:49:13 -0400
changeset 385366 32227656b09dfb5d7c5412c799c7081dbc49346c
parent 385365 f4946d9cb4180e809ccc5587d97caf318e67e818
child 385367 7b05d8b4e8843fec35be20d759e1ba1dd2fa47ab
push id95998
push userlsalzman@mozilla.com
push dateTue, 10 Oct 2017 19:49:32 +0000
treeherdermozilla-inbound@32227656b09d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel
bugs1387079
milestone58.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1387079 - only use SkRasterPipeline when SkJumper is accelerated. r=jrmuizel MozReview-Commit-ID: 13dd2Ap4sob
gfx/skia/skia/src/core/SkBlitter.cpp
testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/masking/mask-mode-d.html.ini
--- a/gfx/skia/skia/src/core/SkBlitter.cpp
+++ b/gfx/skia/skia/src/core/SkBlitter.cpp
@@ -842,19 +842,21 @@ SkBlitter* SkBlitter::Choose(const SkPix
     }
 
     if (kAlpha_8_SkColorType == device.colorType() && drawCoverage) {
         SkASSERT(nullptr == shader);
         SkASSERT(paint->isSrcOver());
         return alloc->make<SkA8_Coverage_Blitter>(device, *paint);
     }
 
+#if (!defined(SK_JUMPER_USE_ASSEMBLY) || SK_JUMPER_USE_ASSEMBLY) && (defined(__aarch64__) || defined(__arm__) || defined(__x86_64__) || defined(_M_X64))
     if (SkBlitter* blitter = SkCreateRasterPipelineBlitter(device, *paint, matrix, alloc)) {
         return blitter;
     }
+#endif
 
     if (nullptr == shader) {
         if (mode != SkBlendMode::kSrcOver) {
             // xfermodes (and filters) require shaders for our current blitters
             paint.writable()->setShader(SkShader::MakeColorShader(paint->getColor()));
             paint.writable()->setAlpha(0xFF);
             shader = paint->getShader();
         } else if (cf) {
--- a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/masking/mask-mode-d.html.ini
+++ b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/masking/mask-mode-d.html.ini
@@ -1,3 +1,5 @@
 [mask-mode-d.html]
   type: reftest
-  expected: FAIL
+  expected:
+    if (processor == "x86") and (bits == 32): PASS
+    FAIL