aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--bench/DecodingBench.cpp97
-rw-r--r--bench/DecodingBench.h40
-rw-r--r--bench/nanobench.cpp26
-rw-r--r--dm/DM.cpp20
-rw-r--r--dm/DMSrcSink.cpp50
-rw-r--r--dm/DMSrcSink.h12
-rw-r--r--tools/dm_flags.json1792
-rwxr-xr-xtools/dm_flags.py52
8 files changed, 0 insertions, 2089 deletions
diff --git a/bench/DecodingBench.cpp b/bench/DecodingBench.cpp
deleted file mode 100644
index 2feb7dd3ef..0000000000
--- a/bench/DecodingBench.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "CodecBenchPriv.h"
-#include "DecodingBench.h"
-#include "SkBitmap.h"
-#include "SkData.h"
-#include "SkImageDecoder.h"
-#include "SkMallocPixelRef.h"
-#include "SkOSFile.h"
-#include "SkStream.h"
-
-/*
- *
- * This benchmark is designed to test the performance of image decoding.
- * It is invoked from the nanobench.cpp file.
- *
- */
-DecodingBench::DecodingBench(SkString path, SkColorType colorType)
- : fColorType(colorType)
- , fData(SkData::NewFromFileName(path.c_str()))
-{
- // Parse filename and the color type to give the benchmark a useful name
- SkString baseName = SkOSPath::Basename(path.c_str());
- fName.printf("Decode_%s_%s", baseName.c_str(), color_type_to_str(colorType));
-
-#ifdef SK_DEBUG
- // Ensure that we can create a decoder.
- SkAutoTDelete<SkStreamRewindable> stream(new SkMemoryStream(fData));
- SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(stream));
- SkASSERT(decoder != nullptr);
-#endif
-}
-
-const char* DecodingBench::onGetName() {
- return fName.c_str();
-}
-
-bool DecodingBench::isSuitableFor(Backend backend) {
- return kNonRendering_Backend == backend;
-}
-
-void DecodingBench::onDelayedSetup() {
- // Allocate the pixels now, to remove it from the loop.
- SkAutoTDelete<SkStreamRewindable> stream(new SkMemoryStream(fData));
- SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(stream));
- SkBitmap bm;
-#ifdef SK_DEBUG
- SkImageDecoder::Result result =
-#endif
- decoder->decode(stream, &bm, fColorType, SkImageDecoder::kDecodeBounds_Mode);
- SkASSERT(SkImageDecoder::kFailure != result);
-
- const size_t rowBytes = bm.info().minRowBytes();
- fPixelStorage.reset(bm.info().getSafeSize(rowBytes));
-}
-
-// Allocator which just uses an existing block of memory.
-class TargetAllocator : public SkBitmap::Allocator {
-public:
- explicit TargetAllocator(void* storage)
- : fPixelStorage(storage) {}
-
- bool allocPixelRef(SkBitmap* bm, SkColorTable* ct) override {
- // We depend on the fact that this will only ever be used to
- // decode to a bitmap with the same settings used to create
- // fPixelStorage.
- bm->setPixelRef(SkMallocPixelRef::NewDirect(bm->info(),
- fPixelStorage, bm->rowBytes(), ct))->unref();
- return true;
- }
-
-private:
- void* fPixelStorage; // Unowned. DecodingBench owns this.
-};
-
-void DecodingBench::onDraw(int n, SkCanvas* canvas) {
- SkBitmap bitmap;
- // Declare the allocator before the decoder, so it will outlive the
- // decoder, which will unref it.
- TargetAllocator allocator(fPixelStorage.get());
- SkAutoTDelete<SkImageDecoder> decoder;
- SkAutoTDelete<SkStreamRewindable> stream;
- for (int i = 0; i < n; i++) {
- // create a new stream and a new decoder to mimic the behavior of
- // CodecBench.
- stream.reset(new SkMemoryStream(fData));
- decoder.reset(SkImageDecoder::Factory(stream));
- decoder->setAllocator(&allocator);
- decoder->decode(stream, &bitmap, fColorType,
- SkImageDecoder::kDecodePixels_Mode);
- }
-}
diff --git a/bench/DecodingBench.h b/bench/DecodingBench.h
deleted file mode 100644
index 196749dfba..0000000000
--- a/bench/DecodingBench.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef DecodingBench_DEFINED
-#define DecodingBench_DEFINED
-
-#include "Benchmark.h"
-#include "SkData.h"
-#include "SkImageDecoder.h"
-#include "SkRefCnt.h"
-#include "SkString.h"
-
-/*
- *
- * This benchmark is designed to test the performance of image decoding.
- * It is invoked from the nanobench.cpp file.
- *
- */
-class DecodingBench : public Benchmark {
-public:
- DecodingBench(SkString path, SkColorType colorType);
-
-protected:
- const char* onGetName() override;
- bool isSuitableFor(Backend backend) override;
- void onDraw(int n, SkCanvas* canvas) override;
- void onDelayedSetup() override;
-
-private:
- SkString fName;
- SkColorType fColorType;
- SkAutoTUnref<SkData> fData;
- SkAutoMalloc fPixelStorage;
- typedef Benchmark INHERITED;
-};
-#endif // DecodingBench_DEFINED
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index cfedc52379..d6c4c596c1 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -14,7 +14,6 @@
#include "CodecBench.h"
#include "CodecBenchPriv.h"
#include "CrashHandler.h"
-#include "DecodingBench.h"
#include "GMBench.h"
#include "ProcStats.h"
#include "ResultsWriter.h"
@@ -561,7 +560,6 @@ public:
, fCurrentSKP(0)
, fCurrentUseMPD(0)
, fCurrentCodec(0)
- , fCurrentImage(0)
, fCurrentBRDImage(0)
, fCurrentColorType(0)
, fCurrentAlphaType(0)
@@ -812,29 +810,6 @@ public:
fCurrentColorType = 0;
}
- // Run the DecodingBenches
- for (; fCurrentImage < fImages.count(); fCurrentImage++) {
- fSourceType = "image";
- fBenchType = "skimagedecoder";
- const SkString& path = fImages[fCurrentImage];
- if (SkCommandLineFlags::ShouldSkip(FLAGS_match, path.c_str())) {
- continue;
- }
- while (fCurrentColorType < fColorTypes.count()) {
- SkColorType colorType = fColorTypes[fCurrentColorType];
- fCurrentColorType++;
- // Check if the image decodes to the right color type
- // before creating the benchmark
- SkBitmap bitmap;
- if (SkImageDecoder::DecodeFile(path.c_str(), &bitmap,
- colorType, SkImageDecoder::kDecodePixels_Mode)
- && bitmap.colorType() == colorType) {
- return new DecodingBench(path, colorType);
- }
- }
- fCurrentColorType = 0;
- }
-
// Run the BRDBenches
// We will benchmark multiple BRD strategies.
static const struct {
@@ -993,7 +968,6 @@ private:
int fCurrentSKP;
int fCurrentUseMPD;
int fCurrentCodec;
- int fCurrentImage;
int fCurrentBRDImage;
int fCurrentColorType;
int fCurrentAlphaType;
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 9f2684cea9..d53402e723 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -519,20 +519,6 @@ static bool brd_supported(const char* ext) {
return false;
}
-static bool is_raw(const SkString& file) {
- static const char* const exts[] = {
- "arw", "cr2", "dng", "nef", "nrw", "orf", "raf", "rw2", "pef", "srw",
- "ARW", "CR2", "DNG", "NEF", "NRW", "ORF", "RAF", "RW2", "PEF", "SRW",
- };
-
- for (uint32_t i = 0; i < SK_ARRAY_COUNT(exts); i++) {
- if (file.endsWith(exts[i])) {
- return true;
- }
- }
- return false;
-}
-
static void gather_srcs() {
for (const skiagm::GMRegistry* r = skiagm::GMRegistry::Head(); r; r = r->next()) {
push_src("gm", "", new GMSrc(r->factory()));
@@ -561,9 +547,6 @@ static void gather_srcs() {
SkOSFile::Iter it(flag, exts[j]);
for (SkString file; it.next(&file); ) {
SkString path = SkOSPath::Join(flag, file.c_str());
- if (!is_raw(file)) {
- push_src("image", "decode", new ImageSrc(path)); // Decode entire image
- }
push_codec_srcs(path);
if (brd_supported(exts[j])) {
push_brd_srcs(path);
@@ -572,9 +555,6 @@ static void gather_srcs() {
}
} else if (sk_exists(flag)) {
// assume that FLAGS_images[i] is a valid image if it is a file.
- if (!is_raw(SkString(flag))) {
- push_src("image", "decode", new ImageSrc(flag)); // Decode entire image.
- }
push_codec_srcs(flag);
push_brd_srcs(flag);
}
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index 5b20e3959f..29886807a7 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -733,56 +733,6 @@ Name AndroidCodecSrc::name() const {
/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-ImageSrc::ImageSrc(Path path) : fPath(path) {}
-
-bool ImageSrc::veto(SinkFlags flags) const {
- // No need to test decoding to non-raster or indirect backend.
- // TODO: Instead, use lazy decoding to allow the GPU to handle cases like YUV.
- return flags.type != SinkFlags::kRaster
- || flags.approach != SinkFlags::kDirect;
-}
-
-Error ImageSrc::draw(SkCanvas* canvas) const {
- SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(fPath.c_str()));
- if (!encoded) {
- return SkStringPrintf("Couldn't read %s.", fPath.c_str());
- }
- const SkColorType dstColorType = canvas->imageInfo().colorType();
-
- // Decode the full image.
- SkBitmap bitmap;
- if (!SkImageDecoder::DecodeMemory(encoded->data(), encoded->size(), &bitmap,
- dstColorType, SkImageDecoder::kDecodePixels_Mode)) {
- return SkStringPrintf("Couldn't decode %s.", fPath.c_str());
- }
- if (kRGB_565_SkColorType == dstColorType && !bitmap.isOpaque()) {
- // Do not draw a bitmap with alpha to a destination without alpha.
- return Error::Nonfatal("Uninteresting to decode image with alpha into 565.");
- }
- encoded.reset((SkData*)nullptr); // Might as well drop this when we're done with it.
- canvas->drawBitmap(bitmap, 0,0);
- return "";
-}
-
-SkISize ImageSrc::size() const {
- SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(fPath.c_str()));
- SkBitmap bitmap;
- if (!encoded || !SkImageDecoder::DecodeMemory(encoded->data(),
- encoded->size(),
- &bitmap,
- kUnknown_SkColorType,
- SkImageDecoder::kDecodeBounds_Mode)) {
- return SkISize::Make(0,0);
- }
- return bitmap.dimensions();
-}
-
-Name ImageSrc::name() const {
- return SkOSPath::Basename(fPath.c_str());
-}
-
-/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-
static const SkRect kSKPViewport = {0,0, 1000,1000};
SKPSrc::SKPSrc(Path path) : fPath(path) {}
diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h
index 632744cd62..d02eeaf101 100644
--- a/dm/DMSrcSink.h
+++ b/dm/DMSrcSink.h
@@ -180,18 +180,6 @@ private:
uint32_t fSampleSize;
};
-class ImageSrc : public Src {
-public:
- explicit ImageSrc(Path path);
-
- Error draw(SkCanvas*) const override;
- SkISize size() const override;
- Name name() const override;
- bool veto(SinkFlags) const override;
-private:
- Path fPath;
-};
-
class SKPSrc : public Src {
public:
explicit SKPSrc(Path path);
diff --git a/tools/dm_flags.json b/tools/dm_flags.json
index bf88638fc7..7dcf5b78b0 100644
--- a/tools/dm_flags.json
+++ b/tools/dm_flags.json
@@ -22,154 +22,6 @@
"gm",
"image",
"--blacklist",
- "_",
- "image",
- "decode",
- "pal8os2v2.bmp",
- "_",
- "image",
- "decode",
- "pal8v4.bmp",
- "_",
- "image",
- "decode",
- "pal8v5.bmp",
- "_",
- "image",
- "decode",
- "rgb16-565.bmp",
- "_",
- "image",
- "decode",
- "rgb16-565pal.bmp",
- "_",
- "image",
- "decode",
- "rgb32-111110.bmp",
- "_",
- "image",
- "decode",
- "rgb32bf.bmp",
- "_",
- "image",
- "decode",
- "rgba32.bmp",
- "_",
- "image",
- "decode",
- "rgba32abf.bmp",
- "_",
- "image",
- "decode",
- "rgb24largepal.bmp",
- "_",
- "image",
- "decode",
- "pal8os2v2-16.bmp",
- "_",
- "image",
- "decode",
- "pal8oversizepal.bmp",
- "_",
- "image",
- "decode",
- "pal4rletrns.bmp",
- "_",
- "image",
- "decode",
- "pal8rletrns.bmp",
- "_",
- "image",
- "decode",
- "4bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "8bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "24bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "32bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "testcase7.bmp",
- "_",
- "image",
- "decode",
- "Hopstarter-Mac-Folders-Apple.ico",
- "_",
- "image",
- "decode",
- "inc0.gif",
- "_",
- "image",
- "decode",
- "inc1.gif",
- "_",
- "image",
- "decode",
- "incInterlaced.gif",
- "_",
- "image",
- "decode",
- "inc0.jpg",
- "_",
- "image",
- "decode",
- "incGray.jpg",
- "_",
- "image",
- "decode",
- "inc0.wbmp",
- "_",
- "image",
- "decode",
- "inc1.wbmp",
- "_",
- "image",
- "decode",
- "inc0.webp",
- "_",
- "image",
- "decode",
- "inc1.webp",
- "_",
- "image",
- "decode",
- "inc0.ico",
- "_",
- "image",
- "decode",
- "inc1.ico",
- "_",
- "image",
- "decode",
- "inc0.png",
- "_",
- "image",
- "decode",
- "inc1.png",
- "_",
- "image",
- "decode",
- "inc2.png",
- "_",
- "image",
- "decode",
- "inc12.png",
- "_",
- "image",
- "decode",
- "inc13.png",
- "_",
- "image",
- "decode",
- "inc14.png",
"gpu",
"skp",
"_",
@@ -178,14 +30,6 @@
"skp",
"_",
"_",
- "gpu",
- "image",
- "decode",
- "_",
- "msaa",
- "image",
- "decode",
- "_",
"msaa16",
"gm",
"_",
@@ -389,154 +233,6 @@
"tests",
"gm",
"--blacklist",
- "_",
- "image",
- "decode",
- "pal8os2v2.bmp",
- "_",
- "image",
- "decode",
- "pal8v4.bmp",
- "_",
- "image",
- "decode",
- "pal8v5.bmp",
- "_",
- "image",
- "decode",
- "rgb16-565.bmp",
- "_",
- "image",
- "decode",
- "rgb16-565pal.bmp",
- "_",
- "image",
- "decode",
- "rgb32-111110.bmp",
- "_",
- "image",
- "decode",
- "rgb32bf.bmp",
- "_",
- "image",
- "decode",
- "rgba32.bmp",
- "_",
- "image",
- "decode",
- "rgba32abf.bmp",
- "_",
- "image",
- "decode",
- "rgb24largepal.bmp",
- "_",
- "image",
- "decode",
- "pal8os2v2-16.bmp",
- "_",
- "image",
- "decode",
- "pal8oversizepal.bmp",
- "_",
- "image",
- "decode",
- "pal4rletrns.bmp",
- "_",
- "image",
- "decode",
- "pal8rletrns.bmp",
- "_",
- "image",
- "decode",
- "4bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "8bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "24bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "32bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "testcase7.bmp",
- "_",
- "image",
- "decode",
- "Hopstarter-Mac-Folders-Apple.ico",
- "_",
- "image",
- "decode",
- "inc0.gif",
- "_",
- "image",
- "decode",
- "inc1.gif",
- "_",
- "image",
- "decode",
- "incInterlaced.gif",
- "_",
- "image",
- "decode",
- "inc0.jpg",
- "_",
- "image",
- "decode",
- "incGray.jpg",
- "_",
- "image",
- "decode",
- "inc0.wbmp",
- "_",
- "image",
- "decode",
- "inc1.wbmp",
- "_",
- "image",
- "decode",
- "inc0.webp",
- "_",
- "image",
- "decode",
- "inc1.webp",
- "_",
- "image",
- "decode",
- "inc0.ico",
- "_",
- "image",
- "decode",
- "inc1.ico",
- "_",
- "image",
- "decode",
- "inc0.png",
- "_",
- "image",
- "decode",
- "inc1.png",
- "_",
- "image",
- "decode",
- "inc2.png",
- "_",
- "image",
- "decode",
- "inc12.png",
- "_",
- "image",
- "decode",
- "inc13.png",
- "_",
- "image",
- "decode",
- "inc14.png",
"serialize-8888",
"gm",
"_",
@@ -741,154 +437,6 @@
"--threads",
"0",
"--blacklist",
- "_",
- "image",
- "decode",
- "pal8os2v2.bmp",
- "_",
- "image",
- "decode",
- "pal8v4.bmp",
- "_",
- "image",
- "decode",
- "pal8v5.bmp",
- "_",
- "image",
- "decode",
- "rgb16-565.bmp",
- "_",
- "image",
- "decode",
- "rgb16-565pal.bmp",
- "_",
- "image",
- "decode",
- "rgb32-111110.bmp",
- "_",
- "image",
- "decode",
- "rgb32bf.bmp",
- "_",
- "image",
- "decode",
- "rgba32.bmp",
- "_",
- "image",
- "decode",
- "rgba32abf.bmp",
- "_",
- "image",
- "decode",
- "rgb24largepal.bmp",
- "_",
- "image",
- "decode",
- "pal8os2v2-16.bmp",
- "_",
- "image",
- "decode",
- "pal8oversizepal.bmp",
- "_",
- "image",
- "decode",
- "pal4rletrns.bmp",
- "_",
- "image",
- "decode",
- "pal8rletrns.bmp",
- "_",
- "image",
- "decode",
- "4bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "8bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "24bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "32bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "testcase7.bmp",
- "_",
- "image",
- "decode",
- "Hopstarter-Mac-Folders-Apple.ico",
- "_",
- "image",
- "decode",
- "inc0.gif",
- "_",
- "image",
- "decode",
- "inc1.gif",
- "_",
- "image",
- "decode",
- "incInterlaced.gif",
- "_",
- "image",
- "decode",
- "inc0.jpg",
- "_",
- "image",
- "decode",
- "incGray.jpg",
- "_",
- "image",
- "decode",
- "inc0.wbmp",
- "_",
- "image",
- "decode",
- "inc1.wbmp",
- "_",
- "image",
- "decode",
- "inc0.webp",
- "_",
- "image",
- "decode",
- "inc1.webp",
- "_",
- "image",
- "decode",
- "inc0.ico",
- "_",
- "image",
- "decode",
- "inc1.ico",
- "_",
- "image",
- "decode",
- "inc0.png",
- "_",
- "image",
- "decode",
- "inc1.png",
- "_",
- "image",
- "decode",
- "inc2.png",
- "_",
- "image",
- "decode",
- "inc12.png",
- "_",
- "image",
- "decode",
- "inc13.png",
- "_",
- "image",
- "decode",
- "inc14.png",
"serialize-8888",
"gm",
"_",
@@ -1091,154 +639,6 @@
"--threads",
"0",
"--blacklist",
- "_",
- "image",
- "decode",
- "pal8os2v2.bmp",
- "_",
- "image",
- "decode",
- "pal8v4.bmp",
- "_",
- "image",
- "decode",
- "pal8v5.bmp",
- "_",
- "image",
- "decode",
- "rgb16-565.bmp",
- "_",
- "image",
- "decode",
- "rgb16-565pal.bmp",
- "_",
- "image",
- "decode",
- "rgb32-111110.bmp",
- "_",
- "image",
- "decode",
- "rgb32bf.bmp",
- "_",
- "image",
- "decode",
- "rgba32.bmp",
- "_",
- "image",
- "decode",
- "rgba32abf.bmp",
- "_",
- "image",
- "decode",
- "rgb24largepal.bmp",
- "_",
- "image",
- "decode",
- "pal8os2v2-16.bmp",
- "_",
- "image",
- "decode",
- "pal8oversizepal.bmp",
- "_",
- "image",
- "decode",
- "pal4rletrns.bmp",
- "_",
- "image",
- "decode",
- "pal8rletrns.bmp",
- "_",
- "image",
- "decode",
- "4bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "8bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "24bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "32bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "testcase7.bmp",
- "_",
- "image",
- "decode",
- "Hopstarter-Mac-Folders-Apple.ico",
- "_",
- "image",
- "decode",
- "inc0.gif",
- "_",
- "image",
- "decode",
- "inc1.gif",
- "_",
- "image",
- "decode",
- "incInterlaced.gif",
- "_",
- "image",
- "decode",
- "inc0.jpg",
- "_",
- "image",
- "decode",
- "incGray.jpg",
- "_",
- "image",
- "decode",
- "inc0.wbmp",
- "_",
- "image",
- "decode",
- "inc1.wbmp",
- "_",
- "image",
- "decode",
- "inc0.webp",
- "_",
- "image",
- "decode",
- "inc1.webp",
- "_",
- "image",
- "decode",
- "inc0.ico",
- "_",
- "image",
- "decode",
- "inc1.ico",
- "_",
- "image",
- "decode",
- "inc0.png",
- "_",
- "image",
- "decode",
- "inc1.png",
- "_",
- "image",
- "decode",
- "inc2.png",
- "_",
- "image",
- "decode",
- "inc12.png",
- "_",
- "image",
- "decode",
- "inc13.png",
- "_",
- "image",
- "decode",
- "inc14.png",
"serialize-8888",
"gm",
"_",
@@ -1443,154 +843,6 @@
"tests",
"gm",
"--blacklist",
- "_",
- "image",
- "decode",
- "pal8os2v2.bmp",
- "_",
- "image",
- "decode",
- "pal8v4.bmp",
- "_",
- "image",
- "decode",
- "pal8v5.bmp",
- "_",
- "image",
- "decode",
- "rgb16-565.bmp",
- "_",
- "image",
- "decode",
- "rgb16-565pal.bmp",
- "_",
- "image",
- "decode",
- "rgb32-111110.bmp",
- "_",
- "image",
- "decode",
- "rgb32bf.bmp",
- "_",
- "image",
- "decode",
- "rgba32.bmp",
- "_",
- "image",
- "decode",
- "rgba32abf.bmp",
- "_",
- "image",
- "decode",
- "rgb24largepal.bmp",
- "_",
- "image",
- "decode",
- "pal8os2v2-16.bmp",
- "_",
- "image",
- "decode",
- "pal8oversizepal.bmp",
- "_",
- "image",
- "decode",
- "pal4rletrns.bmp",
- "_",
- "image",
- "decode",
- "pal8rletrns.bmp",
- "_",
- "image",
- "decode",
- "4bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "8bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "24bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "32bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "testcase7.bmp",
- "_",
- "image",
- "decode",
- "Hopstarter-Mac-Folders-Apple.ico",
- "_",
- "image",
- "decode",
- "inc0.gif",
- "_",
- "image",
- "decode",
- "inc1.gif",
- "_",
- "image",
- "decode",
- "incInterlaced.gif",
- "_",
- "image",
- "decode",
- "inc0.jpg",
- "_",
- "image",
- "decode",
- "incGray.jpg",
- "_",
- "image",
- "decode",
- "inc0.wbmp",
- "_",
- "image",
- "decode",
- "inc1.wbmp",
- "_",
- "image",
- "decode",
- "inc0.webp",
- "_",
- "image",
- "decode",
- "inc1.webp",
- "_",
- "image",
- "decode",
- "inc0.ico",
- "_",
- "image",
- "decode",
- "inc1.ico",
- "_",
- "image",
- "decode",
- "inc0.png",
- "_",
- "image",
- "decode",
- "inc1.png",
- "_",
- "image",
- "decode",
- "inc2.png",
- "_",
- "image",
- "decode",
- "inc12.png",
- "_",
- "image",
- "decode",
- "inc13.png",
- "_",
- "image",
- "decode",
- "inc14.png",
"serialize-8888",
"gm",
"_",
@@ -1791,154 +1043,6 @@
"tests",
"gm",
"--blacklist",
- "_",
- "image",
- "decode",
- "pal8os2v2.bmp",
- "_",
- "image",
- "decode",
- "pal8v4.bmp",
- "_",
- "image",
- "decode",
- "pal8v5.bmp",
- "_",
- "image",
- "decode",
- "rgb16-565.bmp",
- "_",
- "image",
- "decode",
- "rgb16-565pal.bmp",
- "_",
- "image",
- "decode",
- "rgb32-111110.bmp",
- "_",
- "image",
- "decode",
- "rgb32bf.bmp",
- "_",
- "image",
- "decode",
- "rgba32.bmp",
- "_",
- "image",
- "decode",
- "rgba32abf.bmp",
- "_",
- "image",
- "decode",
- "rgb24largepal.bmp",
- "_",
- "image",
- "decode",
- "pal8os2v2-16.bmp",
- "_",
- "image",
- "decode",
- "pal8oversizepal.bmp",
- "_",
- "image",
- "decode",
- "pal4rletrns.bmp",
- "_",
- "image",
- "decode",
- "pal8rletrns.bmp",
- "_",
- "image",
- "decode",
- "4bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "8bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "24bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "32bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "testcase7.bmp",
- "_",
- "image",
- "decode",
- "Hopstarter-Mac-Folders-Apple.ico",
- "_",
- "image",
- "decode",
- "inc0.gif",
- "_",
- "image",
- "decode",
- "inc1.gif",
- "_",
- "image",
- "decode",
- "incInterlaced.gif",
- "_",
- "image",
- "decode",
- "inc0.jpg",
- "_",
- "image",
- "decode",
- "incGray.jpg",
- "_",
- "image",
- "decode",
- "inc0.wbmp",
- "_",
- "image",
- "decode",
- "inc1.wbmp",
- "_",
- "image",
- "decode",
- "inc0.webp",
- "_",
- "image",
- "decode",
- "inc1.webp",
- "_",
- "image",
- "decode",
- "inc0.ico",
- "_",
- "image",
- "decode",
- "inc1.ico",
- "_",
- "image",
- "decode",
- "inc0.png",
- "_",
- "image",
- "decode",
- "inc1.png",
- "_",
- "image",
- "decode",
- "inc2.png",
- "_",
- "image",
- "decode",
- "inc12.png",
- "_",
- "image",
- "decode",
- "inc13.png",
- "_",
- "image",
- "decode",
- "inc14.png",
"serialize-8888",
"gm",
"_",
@@ -2137,154 +1241,6 @@
"--blacklist",
"_",
"image",
- "decode",
- "pal8os2v2.bmp",
- "_",
- "image",
- "decode",
- "pal8v4.bmp",
- "_",
- "image",
- "decode",
- "pal8v5.bmp",
- "_",
- "image",
- "decode",
- "rgb16-565.bmp",
- "_",
- "image",
- "decode",
- "rgb16-565pal.bmp",
- "_",
- "image",
- "decode",
- "rgb32-111110.bmp",
- "_",
- "image",
- "decode",
- "rgb32bf.bmp",
- "_",
- "image",
- "decode",
- "rgba32.bmp",
- "_",
- "image",
- "decode",
- "rgba32abf.bmp",
- "_",
- "image",
- "decode",
- "rgb24largepal.bmp",
- "_",
- "image",
- "decode",
- "pal8os2v2-16.bmp",
- "_",
- "image",
- "decode",
- "pal8oversizepal.bmp",
- "_",
- "image",
- "decode",
- "pal4rletrns.bmp",
- "_",
- "image",
- "decode",
- "pal8rletrns.bmp",
- "_",
- "image",
- "decode",
- "4bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "8bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "24bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "32bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "testcase7.bmp",
- "_",
- "image",
- "decode",
- "Hopstarter-Mac-Folders-Apple.ico",
- "_",
- "image",
- "decode",
- "inc0.gif",
- "_",
- "image",
- "decode",
- "inc1.gif",
- "_",
- "image",
- "decode",
- "incInterlaced.gif",
- "_",
- "image",
- "decode",
- "inc0.jpg",
- "_",
- "image",
- "decode",
- "incGray.jpg",
- "_",
- "image",
- "decode",
- "inc0.wbmp",
- "_",
- "image",
- "decode",
- "inc1.wbmp",
- "_",
- "image",
- "decode",
- "inc0.webp",
- "_",
- "image",
- "decode",
- "inc1.webp",
- "_",
- "image",
- "decode",
- "inc0.ico",
- "_",
- "image",
- "decode",
- "inc1.ico",
- "_",
- "image",
- "decode",
- "inc0.png",
- "_",
- "image",
- "decode",
- "inc1.png",
- "_",
- "image",
- "decode",
- "inc2.png",
- "_",
- "image",
- "decode",
- "inc12.png",
- "_",
- "image",
- "decode",
- "inc13.png",
- "_",
- "image",
- "decode",
- "inc14.png",
- "_",
- "image",
"_",
"interlaced1.png",
"_",
@@ -2508,158 +1464,6 @@
"--blacklist",
"_",
"image",
- "decode",
- "pal8os2v2.bmp",
- "_",
- "image",
- "decode",
- "pal8v4.bmp",
- "_",
- "image",
- "decode",
- "pal8v5.bmp",
- "_",
- "image",
- "decode",
- "rgb16-565.bmp",
- "_",
- "image",
- "decode",
- "rgb16-565pal.bmp",
- "_",
- "image",
- "decode",
- "rgb32-111110.bmp",
- "_",
- "image",
- "decode",
- "rgb32bf.bmp",
- "_",
- "image",
- "decode",
- "rgba32.bmp",
- "_",
- "image",
- "decode",
- "rgba32abf.bmp",
- "_",
- "image",
- "decode",
- "rgb24largepal.bmp",
- "_",
- "image",
- "decode",
- "pal8os2v2-16.bmp",
- "_",
- "image",
- "decode",
- "pal8oversizepal.bmp",
- "_",
- "image",
- "decode",
- "pal4rletrns.bmp",
- "_",
- "image",
- "decode",
- "pal8rletrns.bmp",
- "_",
- "image",
- "decode",
- "4bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "8bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "24bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "32bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "testcase7.bmp",
- "_",
- "image",
- "decode",
- "Hopstarter-Mac-Folders-Apple.ico",
- "_",
- "image",
- "decode",
- "frame_larger_than_image.gif",
- "_",
- "image",
- "decode",
- "inc0.gif",
- "_",
- "image",
- "decode",
- "inc1.gif",
- "_",
- "image",
- "decode",
- "incInterlaced.gif",
- "_",
- "image",
- "decode",
- "inc0.jpg",
- "_",
- "image",
- "decode",
- "incGray.jpg",
- "_",
- "image",
- "decode",
- "inc0.wbmp",
- "_",
- "image",
- "decode",
- "inc1.wbmp",
- "_",
- "image",
- "decode",
- "inc0.webp",
- "_",
- "image",
- "decode",
- "inc1.webp",
- "_",
- "image",
- "decode",
- "inc0.ico",
- "_",
- "image",
- "decode",
- "inc1.ico",
- "_",
- "image",
- "decode",
- "inc0.png",
- "_",
- "image",
- "decode",
- "inc1.png",
- "_",
- "image",
- "decode",
- "inc2.png",
- "_",
- "image",
- "decode",
- "inc12.png",
- "_",
- "image",
- "decode",
- "inc13.png",
- "_",
- "image",
- "decode",
- "inc14.png",
- "_",
- "image",
"_",
"interlaced1.png",
"_",
@@ -2886,154 +1690,6 @@
"--blacklist",
"_",
"image",
- "decode",
- "pal8os2v2.bmp",
- "_",
- "image",
- "decode",
- "pal8v4.bmp",
- "_",
- "image",
- "decode",
- "pal8v5.bmp",
- "_",
- "image",
- "decode",
- "rgb16-565.bmp",
- "_",
- "image",
- "decode",
- "rgb16-565pal.bmp",
- "_",
- "image",
- "decode",
- "rgb32-111110.bmp",
- "_",
- "image",
- "decode",
- "rgb32bf.bmp",
- "_",
- "image",
- "decode",
- "rgba32.bmp",
- "_",
- "image",
- "decode",
- "rgba32abf.bmp",
- "_",
- "image",
- "decode",
- "rgb24largepal.bmp",
- "_",
- "image",
- "decode",
- "pal8os2v2-16.bmp",
- "_",
- "image",
- "decode",
- "pal8oversizepal.bmp",
- "_",
- "image",
- "decode",
- "pal4rletrns.bmp",
- "_",
- "image",
- "decode",
- "pal8rletrns.bmp",
- "_",
- "image",
- "decode",
- "4bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "8bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "24bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "32bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "testcase7.bmp",
- "_",
- "image",
- "decode",
- "Hopstarter-Mac-Folders-Apple.ico",
- "_",
- "image",
- "decode",
- "inc0.gif",
- "_",
- "image",
- "decode",
- "inc1.gif",
- "_",
- "image",
- "decode",
- "incInterlaced.gif",
- "_",
- "image",
- "decode",
- "inc0.jpg",
- "_",
- "image",
- "decode",
- "incGray.jpg",
- "_",
- "image",
- "decode",
- "inc0.wbmp",
- "_",
- "image",
- "decode",
- "inc1.wbmp",
- "_",
- "image",
- "decode",
- "inc0.webp",
- "_",
- "image",
- "decode",
- "inc1.webp",
- "_",
- "image",
- "decode",
- "inc0.ico",
- "_",
- "image",
- "decode",
- "inc1.ico",
- "_",
- "image",
- "decode",
- "inc0.png",
- "_",
- "image",
- "decode",
- "inc1.png",
- "_",
- "image",
- "decode",
- "inc2.png",
- "_",
- "image",
- "decode",
- "inc12.png",
- "_",
- "image",
- "decode",
- "inc13.png",
- "_",
- "image",
- "decode",
- "inc14.png",
- "_",
- "image",
"_",
"interlaced1.png",
"_",
@@ -3258,154 +1914,6 @@
"gm",
"image",
"--blacklist",
- "_",
- "image",
- "decode",
- "pal8os2v2.bmp",
- "_",
- "image",
- "decode",
- "pal8v4.bmp",
- "_",
- "image",
- "decode",
- "pal8v5.bmp",
- "_",
- "image",
- "decode",
- "rgb16-565.bmp",
- "_",
- "image",
- "decode",
- "rgb16-565pal.bmp",
- "_",
- "image",
- "decode",
- "rgb32-111110.bmp",
- "_",
- "image",
- "decode",
- "rgb32bf.bmp",
- "_",
- "image",
- "decode",
- "rgba32.bmp",
- "_",
- "image",
- "decode",
- "rgba32abf.bmp",
- "_",
- "image",
- "decode",
- "rgb24largepal.bmp",
- "_",
- "image",
- "decode",
- "pal8os2v2-16.bmp",
- "_",
- "image",
- "decode",
- "pal8oversizepal.bmp",
- "_",
- "image",
- "decode",
- "pal4rletrns.bmp",
- "_",
- "image",
- "decode",
- "pal8rletrns.bmp",
- "_",
- "image",
- "decode",
- "4bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "8bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "24bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "32bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "testcase7.bmp",
- "_",
- "image",
- "decode",
- "Hopstarter-Mac-Folders-Apple.ico",
- "_",
- "image",
- "decode",
- "inc0.gif",
- "_",
- "image",
- "decode",
- "inc1.gif",
- "_",
- "image",
- "decode",
- "incInterlaced.gif",
- "_",
- "image",
- "decode",
- "inc0.jpg",
- "_",
- "image",
- "decode",
- "incGray.jpg",
- "_",
- "image",
- "decode",
- "inc0.wbmp",
- "_",
- "image",
- "decode",
- "inc1.wbmp",
- "_",
- "image",
- "decode",
- "inc0.webp",
- "_",
- "image",
- "decode",
- "inc1.webp",
- "_",
- "image",
- "decode",
- "inc0.ico",
- "_",
- "image",
- "decode",
- "inc1.ico",
- "_",
- "image",
- "decode",
- "inc0.png",
- "_",
- "image",
- "decode",
- "inc1.png",
- "_",
- "image",
- "decode",
- "inc2.png",
- "_",
- "image",
- "decode",
- "inc12.png",
- "_",
- "image",
- "decode",
- "inc13.png",
- "_",
- "image",
- "decode",
- "inc14.png",
"pdf",
"gm",
"_",
@@ -3649,154 +2157,6 @@
"tests",
"gm",
"--blacklist",
- "_",
- "image",
- "decode",
- "pal8os2v2.bmp",
- "_",
- "image",
- "decode",
- "pal8v4.bmp",
- "_",
- "image",
- "decode",
- "pal8v5.bmp",
- "_",
- "image",
- "decode",
- "rgb16-565.bmp",
- "_",
- "image",
- "decode",
- "rgb16-565pal.bmp",
- "_",
- "image",
- "decode",
- "rgb32-111110.bmp",
- "_",
- "image",
- "decode",
- "rgb32bf.bmp",
- "_",
- "image",
- "decode",
- "rgba32.bmp",
- "_",
- "image",
- "decode",
- "rgba32abf.bmp",
- "_",
- "image",
- "decode",
- "rgb24largepal.bmp",
- "_",
- "image",
- "decode",
- "pal8os2v2-16.bmp",
- "_",
- "image",
- "decode",
- "pal8oversizepal.bmp",
- "_",
- "image",
- "decode",
- "pal4rletrns.bmp",
- "_",
- "image",
- "decode",
- "pal8rletrns.bmp",
- "_",
- "image",
- "decode",
- "4bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "8bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "24bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "32bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "testcase7.bmp",
- "_",
- "image",
- "decode",
- "Hopstarter-Mac-Folders-Apple.ico",
- "_",
- "image",
- "decode",
- "inc0.gif",
- "_",
- "image",
- "decode",
- "inc1.gif",
- "_",
- "image",
- "decode",
- "incInterlaced.gif",
- "_",
- "image",
- "decode",
- "inc0.jpg",
- "_",
- "image",
- "decode",
- "incGray.jpg",
- "_",
- "image",
- "decode",
- "inc0.wbmp",
- "_",
- "image",
- "decode",
- "inc1.wbmp",
- "_",
- "image",
- "decode",
- "inc0.webp",
- "_",
- "image",
- "decode",
- "inc1.webp",
- "_",
- "image",
- "decode",
- "inc0.ico",
- "_",
- "image",
- "decode",
- "inc1.ico",
- "_",
- "image",
- "decode",
- "inc0.png",
- "_",
- "image",
- "decode",
- "inc1.png",
- "_",
- "image",
- "decode",
- "inc2.png",
- "_",
- "image",
- "decode",
- "inc12.png",
- "_",
- "image",
- "decode",
- "inc13.png",
- "_",
- "image",
- "decode",
- "inc14.png",
"pdf",
"gm",
"_",
@@ -4040,158 +2400,6 @@
"tests",
"gm",
"--blacklist",
- "_",
- "image",
- "decode",
- "pal8os2v2.bmp",
- "_",
- "image",
- "decode",
- "pal8v4.bmp",
- "_",
- "image",
- "decode",
- "pal8v5.bmp",
- "_",
- "image",
- "decode",
- "rgb16-565.bmp",
- "_",
- "image",
- "decode",
- "rgb16-565pal.bmp",
- "_",
- "image",
- "decode",
- "rgb32-111110.bmp",
- "_",
- "image",
- "decode",
- "rgb32bf.bmp",
- "_",
- "image",
- "decode",
- "rgba32.bmp",
- "_",
- "image",
- "decode",
- "rgba32abf.bmp",
- "_",
- "image",
- "decode",
- "rgb24largepal.bmp",
- "_",
- "image",
- "decode",
- "pal8os2v2-16.bmp",
- "_",
- "image",
- "decode",
- "pal8oversizepal.bmp",
- "_",
- "image",
- "decode",
- "pal4rletrns.bmp",
- "_",
- "image",
- "decode",
- "pal8rletrns.bmp",
- "_",
- "image",
- "decode",
- "4bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "8bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "24bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "32bpp-pixeldata-cropped.bmp",
- "_",
- "image",
- "decode",
- "testcase7.bmp",
- "_",
- "image",
- "decode",
- "Hopstarter-Mac-Folders-Apple.ico",
- "_",
- "image",
- "decode",
- "inc0.gif",
- "_",
- "image",
- "decode",
- "inc1.gif",
- "_",
- "image",
- "decode",
- "incInterlaced.gif",
- "_",
- "image",
- "decode",
- "inc0.jpg",
- "_",
- "image",
- "decode",
- "incGray.jpg",
- "_",
- "image",
- "decode",
- "inc0.wbmp",
- "_",
- "image",
- "decode",
- "inc1.wbmp",
- "_",
- "image",
- "decode",
- "inc0.webp",
- "_",
- "image",
- "decode",
- "inc1.webp",
- "_",
- "image",
- "decode",
- "inc0.ico",
- "_",
- "image",
- "decode",
- "inc1.ico",
- "_",
- "image",
- "decode",
- "inc0.png",
- "_",
- "image",
- "decode",
- "inc1.png",
- "_",
- "image",
- "decode",
- "inc2.png",
- "_",
- "image",
- "decode",
- "inc12.png",
- "_",
- "image",
- "decode",
- "inc13.png",
- "_",
- "image",
- "decode",
- "inc14.png",
- "_",
- "image",
- "decode",
- "_",
"msaa16",
"gm",
"_",
diff --git a/tools/dm_flags.py b/tools/dm_flags.py
index be348bc680..f7398b4146 100755
--- a/tools/dm_flags.py
+++ b/tools/dm_flags.py
@@ -93,57 +93,6 @@ def get_args(bot):
blacklist = []
- # Several of the newest version bmps fail on SkImageDecoder
- blacklist.extend('_ image decode pal8os2v2.bmp'.split(' '))
- blacklist.extend('_ image decode pal8v4.bmp'.split(' '))
- blacklist.extend('_ image decode pal8v5.bmp'.split(' '))
- blacklist.extend('_ image decode rgb16-565.bmp'.split(' '))
- blacklist.extend('_ image decode rgb16-565pal.bmp'.split(' '))
- blacklist.extend('_ image decode rgb32-111110.bmp'.split(' '))
- blacklist.extend('_ image decode rgb32bf.bmp'.split(' '))
- blacklist.extend('_ image decode rgba32.bmp'.split(' '))
- blacklist.extend('_ image decode rgba32abf.bmp'.split(' '))
- blacklist.extend('_ image decode rgb24largepal.bmp'.split(' '))
- blacklist.extend('_ image decode pal8os2v2-16.bmp'.split(' '))
- blacklist.extend('_ image decode pal8oversizepal.bmp'.split(' '))
- blacklist.extend('_ image decode pal4rletrns.bmp'.split(' '))
- blacklist.extend('_ image decode pal8rletrns.bmp'.split(' '))
- blacklist.extend('_ image decode 4bpp-pixeldata-cropped.bmp'.split(' '))
- blacklist.extend('_ image decode 8bpp-pixeldata-cropped.bmp'.split(' '))
- blacklist.extend('_ image decode 24bpp-pixeldata-cropped.bmp'.split(' '))
- blacklist.extend('_ image decode 32bpp-pixeldata-cropped.bmp'.split(' '))
- blacklist.extend('_ image decode testcase7.bmp'.split(' '))
-
- # New ico files that fail on SkImageDecoder
- blacklist.extend('_ image decode Hopstarter-Mac-Folders-Apple.ico'.split(' '))
-
- # Gif test image uses uninitialized memory on Mac bots
- if 'Mac' in bot:
- blacklist.extend('_ image decode frame_larger_than_image.gif'.split(' '))
-
- # Incomplete image tests that fail on SkImageDecoder
- blacklist.extend('_ image decode inc0.gif'.split(' '))
- blacklist.extend('_ image decode inc1.gif'.split(' '))
- blacklist.extend('_ image decode incInterlaced.gif'.split(' '))
- blacklist.extend('_ image decode inc0.jpg'.split(' '))
- blacklist.extend('_ image decode incGray.jpg'.split(' '))
- blacklist.extend('_ image decode inc0.wbmp'.split(' '))
- blacklist.extend('_ image decode inc1.wbmp'.split(' '))
- blacklist.extend('_ image decode inc0.webp'.split(' '))
- blacklist.extend('_ image decode inc1.webp'.split(' '))
- blacklist.extend('_ image decode inc0.ico'.split(' '))
- blacklist.extend('_ image decode inc1.ico'.split(' '))
- blacklist.extend('_ image decode inc0.png'.split(' '))
- blacklist.extend('_ image decode inc1.png'.split(' '))
- blacklist.extend('_ image decode inc2.png'.split(' '))
- blacklist.extend('_ image decode inc12.png'.split(' '))
- blacklist.extend('_ image decode inc13.png'.split(' '))
- blacklist.extend('_ image decode inc14.png'.split(' '))
-
- # Leon doesn't care about this, so why run it?
- if 'Win' in bot:
- blacklist.extend('_ image decode _'.split(' '))
-
# Certain gm's on win7 gpu and pdf are never finishing and keeping the test
# running forever
if 'Win7' in bot:
@@ -160,7 +109,6 @@ def get_args(bot):
if 'iOS' in bot:
blacklist.extend('gpu skp _ _ msaa skp _ _'.split(' '))
- blacklist.extend('gpu image decode _ msaa image decode _'.split(' '))
blacklist.extend('msaa16 gm _ tilemodesProcess'.split(' '))
# the 32-bit GCE bots run out of memory in DM when running these large images