remove obsolete DM test configs
ViaSingletonPictures simulates a load pattern that Blink no longer produces.
I don't even remember what Via2ndPic and ViaTwice are meant to test,
but I imagine they're quite obsolete.
There was a lingering reference to ViaMojo, which otherwise doesn't exist.
Bug: skia:7544
Change-Id: I033fd344314054ad66c363e5dbd0a373be188069
Reviewed-on: https://skia-review.googlesource.com/88780
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 8e22c7e..4f0dcd6 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -929,14 +929,11 @@
VIA("gbr", ViaCSXform, wrapped, rgb_to_gbr(), true);
VIA("lite", ViaLite, wrapped);
VIA("pipe", ViaPipe, wrapped);
- VIA("twice", ViaTwice, wrapped);
#ifdef TEST_VIA_SVG
VIA("svg", ViaSVG, wrapped);
#endif
VIA("serialize", ViaSerialization, wrapped);
VIA("pic", ViaPicture, wrapped);
- VIA("2ndpic", ViaSecondPicture, wrapped);
- VIA("sp", ViaSingletonPictures, wrapped);
VIA("tiles", ViaTiles, 256, 256, nullptr, wrapped);
VIA("tiles_rt", ViaTiles, 256, 256, new SkRTreeFactory, wrapped);
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index 506d3fb5..618064e 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -2070,46 +2070,6 @@
/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-// Draw the Src into two pictures, then draw the second picture into the wrapped Sink.
-// This tests that any shortcuts we may take while recording that second picture are legal.
-Error ViaSecondPicture::draw(
- const Src& src, SkBitmap* bitmap, SkWStream* stream, SkString* log) const {
- auto size = src.size();
- return draw_to_canvas(fSink.get(), bitmap, stream, log, size, [&](SkCanvas* canvas) -> Error {
- SkPictureRecorder recorder;
- sk_sp<SkPicture> pic;
- for (int i = 0; i < 2; i++) {
- Error err = src.draw(recorder.beginRecording(SkIntToScalar(size.width()),
- SkIntToScalar(size.height())));
- if (!err.isEmpty()) {
- return err;
- }
- pic = recorder.finishRecordingAsPicture();
- }
- canvas->drawPicture(pic);
- return check_against_reference(bitmap, src, fSink.get());
- });
-}
-
-/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-
-// Draw the Src twice. This can help exercise caching.
-Error ViaTwice::draw(const Src& src, SkBitmap* bitmap, SkWStream* stream, SkString* log) const {
- return draw_to_canvas(fSink.get(), bitmap, stream, log, src.size(), [&](SkCanvas* canvas) -> Error {
- for (int i = 0; i < 2; i++) {
- SkAutoCanvasRestore acr(canvas, true/*save now*/);
- canvas->clear(SK_ColorTRANSPARENT);
- Error err = src.draw(canvas);
- if (err.isEmpty()) {
- return err;
- }
- }
- return check_against_reference(bitmap, src, fSink.get());
- });
-}
-
-/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-
#ifdef TEST_VIA_SVG
#include "SkXMLWriter.h"
#include "SkSVGCanvas.h"
@@ -2137,78 +2097,6 @@
/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-// This is like SkRecords::Draw, in that it plays back SkRecords ops into a Canvas.
-// Unlike SkRecords::Draw, it builds a single-op sub-picture out of each Draw-type op.
-// This is an only-slightly-exaggerated simluation of Blink's Slimming Paint pictures.
-struct DrawsAsSingletonPictures {
- SkCanvas* fCanvas;
- const SkDrawableList& fDrawables;
- SkRect fBounds;
-
- template <typename T>
- void draw(const T& op, SkCanvas* canvas) {
- // We must pass SkMatrix::I() as our initial matrix.
- // By default SkRecords::Draw() uses the canvas' matrix as its initial matrix,
- // which would have the funky effect of applying transforms over and over.
- SkRecords::Draw d(canvas, nullptr, fDrawables.begin(), fDrawables.count(), &SkMatrix::I());
- d(op);
- }
-
- // Draws get their own picture.
- template <typename T>
- SK_WHEN(T::kTags & SkRecords::kDraw_Tag, void) operator()(const T& op) {
- SkPictureRecorder rec;
- this->draw(op, rec.beginRecording(fBounds));
- sk_sp<SkPicture> pic(rec.finishRecordingAsPicture());
- fCanvas->drawPicture(pic);
- }
-
- // We'll just issue non-draws directly.
- template <typename T>
- skstd::enable_if_t<!(T::kTags & SkRecords::kDraw_Tag), void> operator()(const T& op) {
- this->draw(op, fCanvas);
- }
-};
-
-// Record Src into a picture, then record it into a macro picture with a sub-picture for each draw.
-// Then play back that macro picture into our wrapped sink.
-Error ViaSingletonPictures::draw(
- const Src& src, SkBitmap* bitmap, SkWStream* stream, SkString* log) const {
- auto size = src.size();
- return draw_to_canvas(fSink.get(), bitmap, stream, log, size, [&](SkCanvas* canvas) -> Error {
- // Use low-level (Skia-private) recording APIs so we can read the SkRecord.
- SkRecord skr;
- SkRecorder recorder(&skr, size.width(), size.height());
- Error err = src.draw(&recorder);
- if (!err.isEmpty()) {
- return err;
- }
-
- // Record our macro-picture, with each draw op as its own sub-picture.
- SkPictureRecorder macroRec;
- SkCanvas* macroCanvas = macroRec.beginRecording(SkIntToScalar(size.width()),
- SkIntToScalar(size.height()));
-
- std::unique_ptr<SkDrawableList> drawables(recorder.detachDrawableList());
- const SkDrawableList empty;
-
- DrawsAsSingletonPictures drawsAsSingletonPictures = {
- macroCanvas,
- drawables ? *drawables : empty,
- SkRect::MakeWH((SkScalar)size.width(), (SkScalar)size.height()),
- };
- for (int i = 0; i < skr.count(); i++) {
- skr.visit(i, drawsAsSingletonPictures);
- }
- sk_sp<SkPicture> macroPic(macroRec.finishRecordingAsPicture());
-
- canvas->drawPicture(macroPic);
- return check_against_reference(bitmap, src, fSink.get());
- });
-}
-
-/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-
Error ViaLite::draw(const Src& src, SkBitmap* bitmap, SkWStream* stream, SkString* log) const {
auto size = src.size();
SkIRect bounds = {0,0, size.width(), size.height()};
diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h
index d44655a..db1e064 100644
--- a/dm/DMSrcSink.h
+++ b/dm/DMSrcSink.h
@@ -514,36 +514,12 @@
std::unique_ptr<SkBBHFactory> fFactory;
};
-class ViaSecondPicture : public Via {
-public:
- explicit ViaSecondPicture(Sink* sink) : Via(sink) {}
- Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override;
-};
-
-class ViaSingletonPictures : public Via {
-public:
- explicit ViaSingletonPictures(Sink* sink) : Via(sink) {}
- Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override;
-};
-
-class ViaTwice : public Via {
-public:
- explicit ViaTwice(Sink* sink) : Via(sink) {}
- Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override;
-};
-
class ViaSVG : public Via {
public:
explicit ViaSVG(Sink* sink) : Via(sink) {}
Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override;
};
-class ViaMojo : public Via {
-public:
- explicit ViaMojo(Sink* sink) : Via(sink) {}
- Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override;
-};
-
class ViaLite : public Via {
public:
explicit ViaLite(Sink* sink) : Via(sink) {}
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json
index 345527c..105dad7 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json
@@ -168,8 +168,6 @@
"g8",
"565",
"f16",
- "sp-8888",
- "2ndpic-8888",
"lite-8888",
"gbr-8888",
"serialize-8888",
@@ -346,74 +344,38 @@
"gm",
"_",
"bleed_alpha_image_shader",
- "sp-8888",
- "gm",
- "_",
- "drawfilter",
"pic-8888",
"gm",
"_",
"drawfilter",
- "2ndpic-8888",
- "gm",
- "_",
- "drawfilter",
"lite-8888",
"gm",
"_",
"drawfilter",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
"pic-8888",
"gm",
"_",
"image-cacherator-from-picture",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-picture",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
"pic-8888",
"gm",
"_",
"image-cacherator-from-raster",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-raster",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable",
"pic-8888",
"gm",
"_",
"image-cacherator-from-ctable",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-ctable",
- "sp-8888",
- "gm",
- "_",
- "gamut",
"pic-8888",
"gm",
"_",
@@ -422,18 +384,10 @@
"gm",
"_",
"gamut",
- "2ndpic-8888",
- "gm",
- "_",
- "gamut",
"serialize-8888",
"gm",
"_",
"gamut",
- "sp-8888",
- "gm",
- "_",
- "complexclip4_bw",
"pic-8888",
"gm",
"_",
@@ -442,18 +396,10 @@
"gm",
"_",
"complexclip4_bw",
- "2ndpic-8888",
- "gm",
- "_",
- "complexclip4_bw",
"serialize-8888",
"gm",
"_",
"complexclip4_bw",
- "sp-8888",
- "gm",
- "_",
- "complexclip4_aa",
"pic-8888",
"gm",
"_",
@@ -462,10 +408,6 @@
"gm",
"_",
"complexclip4_aa",
- "2ndpic-8888",
- "gm",
- "_",
- "complexclip4_aa",
"serialize-8888",
"gm",
"_",
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json
index 6f673f1..9d472b5 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json
@@ -167,8 +167,6 @@
"g8",
"565",
"f16",
- "sp-8888",
- "2ndpic-8888",
"lite-8888",
"gbr-8888",
"serialize-8888",
@@ -340,74 +338,38 @@
"gm",
"_",
"bleed_alpha_image_shader",
- "sp-8888",
- "gm",
- "_",
- "drawfilter",
"pic-8888",
"gm",
"_",
"drawfilter",
- "2ndpic-8888",
- "gm",
- "_",
- "drawfilter",
"lite-8888",
"gm",
"_",
"drawfilter",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
"pic-8888",
"gm",
"_",
"image-cacherator-from-picture",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-picture",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
"pic-8888",
"gm",
"_",
"image-cacherator-from-raster",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-raster",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable",
"pic-8888",
"gm",
"_",
"image-cacherator-from-ctable",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-ctable",
- "sp-8888",
- "gm",
- "_",
- "gamut",
"pic-8888",
"gm",
"_",
@@ -416,18 +378,10 @@
"gm",
"_",
"gamut",
- "2ndpic-8888",
- "gm",
- "_",
- "gamut",
"serialize-8888",
"gm",
"_",
"gamut",
- "sp-8888",
- "gm",
- "_",
- "complexclip4_bw",
"pic-8888",
"gm",
"_",
@@ -436,18 +390,10 @@
"gm",
"_",
"complexclip4_bw",
- "2ndpic-8888",
- "gm",
- "_",
- "complexclip4_bw",
"serialize-8888",
"gm",
"_",
"complexclip4_bw",
- "sp-8888",
- "gm",
- "_",
- "complexclip4_aa",
"pic-8888",
"gm",
"_",
@@ -456,10 +402,6 @@
"gm",
"_",
"complexclip4_aa",
- "2ndpic-8888",
- "gm",
- "_",
- "complexclip4_aa",
"serialize-8888",
"gm",
"_",
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
index 8410e0e..f57e713 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
@@ -239,8 +239,6 @@
"g8",
"565",
"f16",
- "sp-8888",
- "2ndpic-8888",
"lite-8888",
"gbr-8888",
"serialize-8888",
@@ -412,74 +410,38 @@
"gm",
"_",
"bleed_alpha_image_shader",
- "sp-8888",
- "gm",
- "_",
- "drawfilter",
"pic-8888",
"gm",
"_",
"drawfilter",
- "2ndpic-8888",
- "gm",
- "_",
- "drawfilter",
"lite-8888",
"gm",
"_",
"drawfilter",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
"pic-8888",
"gm",
"_",
"image-cacherator-from-picture",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-picture",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
"pic-8888",
"gm",
"_",
"image-cacherator-from-raster",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-raster",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable",
"pic-8888",
"gm",
"_",
"image-cacherator-from-ctable",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-ctable",
- "sp-8888",
- "gm",
- "_",
- "gamut",
"pic-8888",
"gm",
"_",
@@ -488,18 +450,10 @@
"gm",
"_",
"gamut",
- "2ndpic-8888",
- "gm",
- "_",
- "gamut",
"serialize-8888",
"gm",
"_",
"gamut",
- "sp-8888",
- "gm",
- "_",
- "complexclip4_bw",
"pic-8888",
"gm",
"_",
@@ -508,18 +462,10 @@
"gm",
"_",
"complexclip4_bw",
- "2ndpic-8888",
- "gm",
- "_",
- "complexclip4_bw",
"serialize-8888",
"gm",
"_",
"complexclip4_bw",
- "sp-8888",
- "gm",
- "_",
- "complexclip4_aa",
"pic-8888",
"gm",
"_",
@@ -528,10 +474,6 @@
"gm",
"_",
"complexclip4_aa",
- "2ndpic-8888",
- "gm",
- "_",
- "complexclip4_aa",
"serialize-8888",
"gm",
"_",
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json
index bce495b..5a23ad7 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json
@@ -173,8 +173,6 @@
"g8",
"565",
"f16",
- "sp-8888",
- "2ndpic-8888",
"lite-8888",
"gbr-8888",
"serialize-8888",
@@ -346,74 +344,38 @@
"gm",
"_",
"bleed_alpha_image_shader",
- "sp-8888",
- "gm",
- "_",
- "drawfilter",
"pic-8888",
"gm",
"_",
"drawfilter",
- "2ndpic-8888",
- "gm",
- "_",
- "drawfilter",
"lite-8888",
"gm",
"_",
"drawfilter",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
"pic-8888",
"gm",
"_",
"image-cacherator-from-picture",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-picture",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
"pic-8888",
"gm",
"_",
"image-cacherator-from-raster",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-raster",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable",
"pic-8888",
"gm",
"_",
"image-cacherator-from-ctable",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-ctable",
- "sp-8888",
- "gm",
- "_",
- "gamut",
"pic-8888",
"gm",
"_",
@@ -422,18 +384,10 @@
"gm",
"_",
"gamut",
- "2ndpic-8888",
- "gm",
- "_",
- "gamut",
"serialize-8888",
"gm",
"_",
"gamut",
- "sp-8888",
- "gm",
- "_",
- "complexclip4_bw",
"pic-8888",
"gm",
"_",
@@ -442,18 +396,10 @@
"gm",
"_",
"complexclip4_bw",
- "2ndpic-8888",
- "gm",
- "_",
- "complexclip4_bw",
"serialize-8888",
"gm",
"_",
"complexclip4_bw",
- "sp-8888",
- "gm",
- "_",
- "complexclip4_aa",
"pic-8888",
"gm",
"_",
@@ -462,10 +408,6 @@
"gm",
"_",
"complexclip4_aa",
- "2ndpic-8888",
- "gm",
- "_",
- "complexclip4_aa",
"serialize-8888",
"gm",
"_",
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json
index ca76df8..20dd305 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json
@@ -168,8 +168,6 @@
"g8",
"565",
"f16",
- "sp-8888",
- "2ndpic-8888",
"lite-8888",
"gbr-8888",
"serialize-8888",
@@ -341,74 +339,38 @@
"gm",
"_",
"bleed_alpha_image_shader",
- "sp-8888",
- "gm",
- "_",
- "drawfilter",
"pic-8888",
"gm",
"_",
"drawfilter",
- "2ndpic-8888",
- "gm",
- "_",
- "drawfilter",
"lite-8888",
"gm",
"_",
"drawfilter",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
"pic-8888",
"gm",
"_",
"image-cacherator-from-picture",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-picture",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
"pic-8888",
"gm",
"_",
"image-cacherator-from-raster",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-raster",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable",
"pic-8888",
"gm",
"_",
"image-cacherator-from-ctable",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-ctable",
- "sp-8888",
- "gm",
- "_",
- "gamut",
"pic-8888",
"gm",
"_",
@@ -417,18 +379,10 @@
"gm",
"_",
"gamut",
- "2ndpic-8888",
- "gm",
- "_",
- "gamut",
"serialize-8888",
"gm",
"_",
"gamut",
- "sp-8888",
- "gm",
- "_",
- "complexclip4_bw",
"pic-8888",
"gm",
"_",
@@ -437,18 +391,10 @@
"gm",
"_",
"complexclip4_bw",
- "2ndpic-8888",
- "gm",
- "_",
- "complexclip4_bw",
"serialize-8888",
"gm",
"_",
"complexclip4_bw",
- "sp-8888",
- "gm",
- "_",
- "complexclip4_aa",
"pic-8888",
"gm",
"_",
@@ -457,10 +403,6 @@
"gm",
"_",
"complexclip4_aa",
- "2ndpic-8888",
- "gm",
- "_",
- "complexclip4_aa",
"serialize-8888",
"gm",
"_",
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All.json b/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All.json
index 69191ba..463d8f8 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All.json
@@ -237,8 +237,6 @@
"g8",
"565",
"f16",
- "sp-8888",
- "2ndpic-8888",
"lite-8888",
"gbr-8888",
"serialize-8888",
@@ -410,74 +408,38 @@
"gm",
"_",
"bleed_alpha_image_shader",
- "sp-8888",
- "gm",
- "_",
- "drawfilter",
"pic-8888",
"gm",
"_",
"drawfilter",
- "2ndpic-8888",
- "gm",
- "_",
- "drawfilter",
"lite-8888",
"gm",
"_",
"drawfilter",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
"pic-8888",
"gm",
"_",
"image-cacherator-from-picture",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-picture",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
"pic-8888",
"gm",
"_",
"image-cacherator-from-raster",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-raster",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable",
"pic-8888",
"gm",
"_",
"image-cacherator-from-ctable",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-ctable",
- "sp-8888",
- "gm",
- "_",
- "gamut",
"pic-8888",
"gm",
"_",
@@ -486,18 +448,10 @@
"gm",
"_",
"gamut",
- "2ndpic-8888",
- "gm",
- "_",
- "gamut",
"serialize-8888",
"gm",
"_",
"gamut",
- "sp-8888",
- "gm",
- "_",
- "complexclip4_bw",
"pic-8888",
"gm",
"_",
@@ -506,18 +460,10 @@
"gm",
"_",
"complexclip4_bw",
- "2ndpic-8888",
- "gm",
- "_",
- "complexclip4_bw",
"serialize-8888",
"gm",
"_",
"complexclip4_bw",
- "sp-8888",
- "gm",
- "_",
- "complexclip4_aa",
"pic-8888",
"gm",
"_",
@@ -526,10 +472,6 @@
"gm",
"_",
"complexclip4_aa",
- "2ndpic-8888",
- "gm",
- "_",
- "complexclip4_aa",
"serialize-8888",
"gm",
"_",
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All.json b/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All.json
index 360a9a2..77622bd 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All.json
@@ -235,8 +235,6 @@
"g8",
"565",
"f16",
- "sp-8888",
- "2ndpic-8888",
"lite-8888",
"gbr-8888",
"serialize-8888",
@@ -408,74 +406,38 @@
"gm",
"_",
"bleed_alpha_image_shader",
- "sp-8888",
- "gm",
- "_",
- "drawfilter",
"pic-8888",
"gm",
"_",
"drawfilter",
- "2ndpic-8888",
- "gm",
- "_",
- "drawfilter",
"lite-8888",
"gm",
"_",
"drawfilter",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
"pic-8888",
"gm",
"_",
"image-cacherator-from-picture",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-picture",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
"pic-8888",
"gm",
"_",
"image-cacherator-from-raster",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-raster",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable",
"pic-8888",
"gm",
"_",
"image-cacherator-from-ctable",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-ctable",
- "sp-8888",
- "gm",
- "_",
- "gamut",
"pic-8888",
"gm",
"_",
@@ -484,18 +446,10 @@
"gm",
"_",
"gamut",
- "2ndpic-8888",
- "gm",
- "_",
- "gamut",
"serialize-8888",
"gm",
"_",
"gamut",
- "sp-8888",
- "gm",
- "_",
- "complexclip4_bw",
"pic-8888",
"gm",
"_",
@@ -504,18 +458,10 @@
"gm",
"_",
"complexclip4_bw",
- "2ndpic-8888",
- "gm",
- "_",
- "complexclip4_bw",
"serialize-8888",
"gm",
"_",
"complexclip4_bw",
- "sp-8888",
- "gm",
- "_",
- "complexclip4_aa",
"pic-8888",
"gm",
"_",
@@ -524,10 +470,6 @@
"gm",
"_",
"complexclip4_aa",
- "2ndpic-8888",
- "gm",
- "_",
- "complexclip4_aa",
"serialize-8888",
"gm",
"_",
diff --git a/infra/bots/recipes/test.expected/failed_dm.json b/infra/bots/recipes/test.expected/failed_dm.json
index a1c44c9..c4ccceb 100644
--- a/infra/bots/recipes/test.expected/failed_dm.json
+++ b/infra/bots/recipes/test.expected/failed_dm.json
@@ -235,8 +235,6 @@
"g8",
"565",
"f16",
- "sp-8888",
- "2ndpic-8888",
"lite-8888",
"gbr-8888",
"serialize-8888",
@@ -408,74 +406,38 @@
"gm",
"_",
"bleed_alpha_image_shader",
- "sp-8888",
- "gm",
- "_",
- "drawfilter",
"pic-8888",
"gm",
"_",
"drawfilter",
- "2ndpic-8888",
- "gm",
- "_",
- "drawfilter",
"lite-8888",
"gm",
"_",
"drawfilter",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
"pic-8888",
"gm",
"_",
"image-cacherator-from-picture",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-picture",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
"pic-8888",
"gm",
"_",
"image-cacherator-from-raster",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-raster",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable",
"pic-8888",
"gm",
"_",
"image-cacherator-from-ctable",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-ctable",
- "sp-8888",
- "gm",
- "_",
- "gamut",
"pic-8888",
"gm",
"_",
@@ -484,18 +446,10 @@
"gm",
"_",
"gamut",
- "2ndpic-8888",
- "gm",
- "_",
- "gamut",
"serialize-8888",
"gm",
"_",
"gamut",
- "sp-8888",
- "gm",
- "_",
- "complexclip4_bw",
"pic-8888",
"gm",
"_",
@@ -504,18 +458,10 @@
"gm",
"_",
"complexclip4_bw",
- "2ndpic-8888",
- "gm",
- "_",
- "complexclip4_bw",
"serialize-8888",
"gm",
"_",
"complexclip4_bw",
- "sp-8888",
- "gm",
- "_",
- "complexclip4_aa",
"pic-8888",
"gm",
"_",
@@ -524,10 +470,6 @@
"gm",
"_",
"complexclip4_aa",
- "2ndpic-8888",
- "gm",
- "_",
- "complexclip4_aa",
"serialize-8888",
"gm",
"_",
diff --git a/infra/bots/recipes/test.expected/trybot.json b/infra/bots/recipes/test.expected/trybot.json
index 0b19027..080fe1c 100644
--- a/infra/bots/recipes/test.expected/trybot.json
+++ b/infra/bots/recipes/test.expected/trybot.json
@@ -236,8 +236,6 @@
"g8",
"565",
"f16",
- "sp-8888",
- "2ndpic-8888",
"lite-8888",
"gbr-8888",
"serialize-8888",
@@ -469,74 +467,38 @@
"gm",
"_",
"verylarge_picture_image",
- "sp-8888",
- "gm",
- "_",
- "drawfilter",
"pic-8888",
"gm",
"_",
"drawfilter",
- "2ndpic-8888",
- "gm",
- "_",
- "drawfilter",
"lite-8888",
"gm",
"_",
"drawfilter",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
"pic-8888",
"gm",
"_",
"image-cacherator-from-picture",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-picture",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-picture",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
"pic-8888",
"gm",
"_",
"image-cacherator-from-raster",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-raster",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-raster",
- "sp-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable",
"pic-8888",
"gm",
"_",
"image-cacherator-from-ctable",
- "2ndpic-8888",
- "gm",
- "_",
- "image-cacherator-from-ctable",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-ctable",
- "sp-8888",
- "gm",
- "_",
- "gamut",
"pic-8888",
"gm",
"_",
@@ -545,18 +507,10 @@
"gm",
"_",
"gamut",
- "2ndpic-8888",
- "gm",
- "_",
- "gamut",
"serialize-8888",
"gm",
"_",
"gamut",
- "sp-8888",
- "gm",
- "_",
- "complexclip4_bw",
"pic-8888",
"gm",
"_",
@@ -565,18 +519,10 @@
"gm",
"_",
"complexclip4_bw",
- "2ndpic-8888",
- "gm",
- "_",
- "complexclip4_bw",
"serialize-8888",
"gm",
"_",
"complexclip4_bw",
- "sp-8888",
- "gm",
- "_",
- "complexclip4_aa",
"pic-8888",
"gm",
"_",
@@ -585,10 +531,6 @@
"gm",
"_",
"complexclip4_aa",
- "2ndpic-8888",
- "gm",
- "_",
- "complexclip4_aa",
"serialize-8888",
"gm",
"_",
diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index 3e8dcdb..76f50a6 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -98,7 +98,6 @@
configs.extend(['g8'])
configs.extend(['565'])
configs.extend(['f16'])
- configs.extend(['sp-8888', '2ndpic-8888']) # Test niche uses of SkPicture.
configs.extend(['lite-8888']) # Experimental display list.
configs.extend(['gbr-8888'])
@@ -435,25 +434,19 @@
# skia:4769
for test in ['drawfilter']:
- blacklist([ 'sp-8888', 'gm', '_', test])
blacklist([ 'pic-8888', 'gm', '_', test])
- blacklist(['2ndpic-8888', 'gm', '_', test])
blacklist([ 'lite-8888', 'gm', '_', test])
# skia:4703
for test in ['image-cacherator-from-picture',
'image-cacherator-from-raster',
'image-cacherator-from-ctable']:
- blacklist([ 'sp-8888', 'gm', '_', test])
blacklist([ 'pic-8888', 'gm', '_', test])
- blacklist([ '2ndpic-8888', 'gm', '_', test])
blacklist(['serialize-8888', 'gm', '_', test])
# GM that requires raster-backed canvas
for test in ['gamut', 'complexclip4_bw', 'complexclip4_aa']:
- blacklist([ 'sp-8888', 'gm', '_', test])
blacklist([ 'pic-8888', 'gm', '_', test])
blacklist([ 'lite-8888', 'gm', '_', test])
- blacklist([ '2ndpic-8888', 'gm', '_', test])
blacklist(['serialize-8888', 'gm', '_', test])
# GM that not support tiles_rt