Add imagemasksubset GM
authorfmalita <fmalita@chromium.org>
Fri, 26 Aug 2016 17:13:39 +0000 (10:13 -0700)
committerCommit bot <commit-bot@chromium.org>
Fri, 26 Aug 2016 17:13:40 +0000 (10:13 -0700)
(GM for non-N32 SkImage subsetting)

BUG=skia:5687
R=bsalomon@google.com,robertphillips@google.com,reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2286733002

Review-Url: https://codereview.chromium.org/2286733002

35 files changed:
gm/imagemasksubset.cpp [new file with mode: 0644]
infra/bots/recipes/swarm_test.expected/Test-Android-GCC-AndroidOne-GPU-Mali400MP2-Arm7-Release.json
infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json
infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug.json
infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus10-GPU-MaliT604-Arm7-Release.json
infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug.json
infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json
infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus9-CPU-Denver-Arm64-Debug.json
infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NexusPlayer-CPU-SSE4-x86-Release.json
infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json
infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json
infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json
infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json
infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json
infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
infra/bots/recipes/swarm_test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json
infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json
infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json
infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json
infra/bots/recipes/swarm_test.expected/adb_in_path.json
infra/bots/recipes/swarm_test.expected/big_issue_number.json
infra/bots/recipes/swarm_test.expected/download_and_push_skimage.json
infra/bots/recipes/swarm_test.expected/download_and_push_skps.json
infra/bots/recipes/swarm_test.expected/download_and_push_svgs.json
infra/bots/recipes/swarm_test.expected/failed_dm.json
infra/bots/recipes/swarm_test.expected/failed_get_hashes.json
infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json
infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json
infra/bots/recipes/swarm_test.expected/missing_SVG_VERSION_device.json
infra/bots/recipes/swarm_test.expected/recipe_with_gerrit_patch.json
infra/bots/recipes/swarm_test.py

diff --git a/gm/imagemasksubset.cpp b/gm/imagemasksubset.cpp
new file mode 100644 (file)
index 0000000..80e63f6
--- /dev/null
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2016 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "gm.h"
+#include "SkCanvas.h"
+#include "SkImage.h"
+#include "SkImageGenerator.h"
+#include "SkSurface.h"
+#include "sk_tool_utils.h"
+
+namespace {
+
+const SkISize   kSize = SkISize::Make(100, 100);
+const SkIRect kSubset = SkIRect::MakeLTRB(25, 25, 75, 75);
+const SkRect    kDest = SkRect::MakeXYWH(10, 10, 100, 100);
+
+sk_sp<SkImage> make_mask(const sk_sp<SkSurface>& surface) {
+    sk_tool_utils::draw_checkerboard(surface->getCanvas(), 0x80808080, 0x00000000, 5);
+    return surface->makeImageSnapshot();
+}
+
+class MaskGenerator final : public SkImageGenerator {
+public:
+    MaskGenerator(const SkImageInfo& info) : INHERITED(info) {}
+
+    bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, SkPMColor*,
+                     int*) override {
+        if (info.colorType() == kIndex_8_SkColorType) {
+            return false;
+        }
+
+        make_mask(SkSurface::MakeRasterDirect(info, pixels, rowBytes));
+        return true;
+    }
+
+private:
+    typedef SkImageGenerator INHERITED;
+};
+
+using MakerT = sk_sp<SkImage>(*)(SkCanvas*, const SkImageInfo&);
+const MakerT makers[] = {
+    // SkImage_Raster
+    [](SkCanvas*, const SkImageInfo& info) -> sk_sp<SkImage> {
+        return make_mask(SkSurface::MakeRaster(info));
+    },
+
+    // SkImage_Gpu
+    [](SkCanvas* c, const SkImageInfo& info) -> sk_sp<SkImage> {
+        sk_sp<SkSurface> surface;
+#if SK_SUPPORT_GPU
+        surface = SkSurface::MakeRenderTarget(c->getGrContext(), SkBudgeted::kNo, info);
+#endif
+        return make_mask(surface ? surface : SkSurface::MakeRaster(info));
+    },
+
+    // SkImage_Generator
+    [](SkCanvas*, const SkImageInfo& info) -> sk_sp<SkImage> {
+        return SkImage::MakeFromGenerator(new MaskGenerator(info));
+    },
+};
+
+} // anonymous ns
+
+// Checks whether subset SkImages preserve the original color type (A8 in this case).
+DEF_SIMPLE_GM(imagemasksubset, canvas, 480, 480) {
+    SkPaint paint;
+    paint.setColor(0xff00ff00);
+
+    const SkImageInfo info = SkImageInfo::MakeA8(kSize.width(), kSize.height());
+
+    for (size_t i = 0; i < SK_ARRAY_COUNT(makers); ++i) {
+        sk_sp<SkImage> image = makers[i](canvas, info);
+        if (image) {
+            canvas->drawImageRect(image, SkRect::Make(kSubset), kDest, &paint);
+            sk_sp<SkImage> subset = image->makeSubset(kSubset);
+            canvas->drawImageRect(subset, kDest.makeOffset(kSize.width() * 1.5f, 0), &paint);
+        }
+        canvas->translate(0, kSize.height() * 1.5f);
+    }
+}
index bc571dc..16ad3bc 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index 2a51426..d10c04b 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index 8b285f3..12b31ae 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index 336a896..052af25 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index 91389e4..014a850 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index c157fa9..4b13ac7 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index d509c62..f0247a9 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index ff48c4b..bc6ca58 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index d96cb21..6061b17 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index 032882f..4359d0b 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index 943f5fc..230acae 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index fb9ae8d..2e679f0 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index 418b6eb..789e007 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index 2ea5508..1d0dd69 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index 13107b2..a4f44b9 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index 3e47b8d..3e87679 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index 7ea6535..0ee2a55 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index c482f83..da75014 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index 8ce00a3..80f18f3 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index 96597aa..c88297e 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index e8b7d2c..19f846c 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index ddf2c4a..6afb29d 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index 77ae9be..182d3f3 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index 4662fa3..cc00d7b 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index bc4a7f6..0e0ab86 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index 2af4eb6..537e608 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index 5332275..c6853f1 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index aaa522c..773f8e5 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index 52af68c..b7bad21 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index 2f379a2..e998a35 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index 0afe92d..159d8a9 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index f4511b1..25e8a2d 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index 35ccfbf..d8db6ad 100644 (file)
       "serialize-8888",
       "gm",
       "_",
+      "imagemasksubset",
+      "serialize-8888",
+      "gm",
+      "_",
       "bitmapfilters",
       "serialize-8888",
       "gm",
index 67c9f27..6427af0 100644 (file)
@@ -217,7 +217,8 @@ def dm_flags(bot):
                        'fontmgr_bounds_1_-0.25',
                        'fontmgr_bounds',
                        'fontmgr_match',
-                       'fontmgr_iter']
+                       'fontmgr_iter',
+                       'imagemasksubset']
 
   # skia:5589
   bad_serialize_gms.extend(['bitmapfilters',