commit a5c27173eadd38091ff86f13d2445e965760925e
author Mike Klein <mtklein@google.com> Tue Apr 02 10:26:48 2019 -0400
committer Mike Klein <mtklein@google.com> Tue Apr 02 19:08:44 2019 +0000
tree b9f46c80ae962c08fff95a8d3c5dbb35121c0b1f
parent f16e0744d0ce65edf7426bcdbb8f159f909a8389

allow skipped source/backend pairs in fm

GMs sometimes want to skip instead of drawing or failing.
E.g. GPU-only GMs with a non-GPU backend.

Change-Id: I5bd8acecbef1aa88b4d7e6cfb88dfde04424aa8b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/205349
Reviewed-by: Mike Klein <mtklein@google.com>

tools/fm/fm.cpp

diff --git a/tools/fm/fm.cpp b/tools/fm/fm.cpp
index c9ab870..bb7e87e 100644
--- a/tools/fm/fm.cpp
+++ b/tools/fm/fm.cpp
@@ -94,7 +94,7 @@
 struct Source {
     SkString                               name;
     SkISize                                size;
-    std::function<void(SkCanvas*)>         draw;
+    std::function<bool(SkCanvas*)>         draw;  // true -> ok, false -> skip; failures should exit_with_failure()
     std::function<void(GrContextOptions*)> tweak;
 };
 
@@ -104,11 +104,14 @@
         gm->getISize(),
         [gm](SkCanvas* canvas) {
             SkString err;
-            if (skiagm::DrawResult::kFail == gm->draw(canvas, &err)) {
-                fprintf(stderr, "Drawing GM %s failed: %s\n",
-                        gm->getName(), err.c_str());
-                exit_with_failure();
+            switch (gm->draw(canvas, &err)) {
+                case skiagm::DrawResult::kOk:   return true;
+                case skiagm::DrawResult::kSkip: break;
+                case skiagm::DrawResult::kFail:
+                    fprintf(stderr, "Drawing GM %s failed: %s\n", gm->getName(), err.c_str());
+                    exit_with_failure();
             }
+            return false;
         },
         [gm](GrContextOptions* options) { gm->modifyGrContextOptions(options); },
     };
@@ -120,6 +123,7 @@
         pic->cullRect().roundOut().size(),
         [pic](SkCanvas* canvas) {
             canvas->drawPicture(pic);
+            return true;
         },
         [](GrContextOptions*) {},
     };
@@ -144,11 +148,12 @@
                 case SkCodec::kErrorInInput:
                 case SkCodec::kIncompleteInput:
                     canvas->drawBitmap(bm, 0,0);
-                    break;
+                    return true;
                 default:
                     fprintf(stderr, "SkCodec::getPixels failed: %d.", result);
                     exit_with_failure();
             }
+            return false;
         },
         [](GrContextOptions*) {},
     };
@@ -159,29 +164,35 @@
         name,
         svg->containerSize().isEmpty() ? SkISize{1000,1000}
                                        : svg->containerSize().toCeil(),
-        [svg](SkCanvas* canvas) { svg->render(canvas); },
+        [svg](SkCanvas* canvas) {
+            svg->render(canvas);
+            return true;
+        },
         [](GrContextOptions*) {},
     };
 }
 
 
-static sk_sp<SkImage> draw_with_cpu(std::function<void(SkCanvas*)> draw,
+static sk_sp<SkImage> draw_with_cpu(std::function<bool(SkCanvas*)> draw,
                                     SkImageInfo info) {
     if (sk_sp<SkSurface> surface = SkSurface::MakeRaster(info)) {
-        draw(surface->getCanvas());
-        return surface->makeImageSnapshot();
+        if (draw(surface->getCanvas())) {
+            return surface->makeImageSnapshot();
+        }
     }
     return nullptr;
 }
 
-static sk_sp<SkData> draw_as_skp(std::function<void(SkCanvas*)> draw,
+static sk_sp<SkData> draw_as_skp(std::function<bool(SkCanvas*)> draw,
                                  SkImageInfo info) {
     SkPictureRecorder recorder;
-    draw(recorder.beginRecording(info.width(), info.height()));
-    return recorder.finishRecordingAsPicture()->serialize();
+    if (draw(recorder.beginRecording(info.width(), info.height()))) {
+        return recorder.finishRecordingAsPicture()->serialize();
+    }
+    return nullptr;
 }
 
-static sk_sp<SkData> draw_as_pdf(std::function<void(SkCanvas*)> draw,
+static sk_sp<SkData> draw_as_pdf(std::function<bool(SkCanvas*)> draw,
                                  SkImageInfo info,
                                  SkString name) {
     SkPDF::Metadata metadata;
@@ -192,15 +203,16 @@
 
     SkDynamicMemoryWStream stream;
     if (sk_sp<SkDocument> doc = SkPDF::MakeDocument(&stream, metadata)) {
-        draw(doc->beginPage(info.width(), info.height()));
-        doc->endPage();
-        doc->close();
-        return stream.detachAsData();
+        if (draw(doc->beginPage(info.width(), info.height()))) {
+            doc->endPage();
+            doc->close();
+            return stream.detachAsData();
+        }
     }
     return nullptr;
 }
 
-static sk_sp<SkImage> draw_with_gpu(std::function<void(SkCanvas*)> draw,
+static sk_sp<SkImage> draw_with_gpu(std::function<bool(SkCanvas*)> draw,
                                     SkImageInfo info,
                                     GrContextFactory::ContextType api,
                                     GrContextFactory* factory) {
@@ -279,8 +291,10 @@
         factory->abandonContexts();
     }
 
-    draw(surface->getCanvas());
-    sk_sp<SkImage> image = surface->makeImageSnapshot();
+    sk_sp<SkImage> image;
+    if (draw(surface->getCanvas())) {
+        image = surface->makeImageSnapshot();
+    }
 
     if (FLAGS_abandonGpuContext) {
         factory->abandonContexts();
@@ -453,8 +467,10 @@
         }
 
         if (!image && !blob) {
-            fprintf(stderr, "FM backend returned a no image or data blob.\n");
-            exit_with_failure();
+            if (FLAGS_verbose) {
+                fprintf(stdout, "\tskipped\n");
+            }
+            continue;
         }
 
         SkBitmap bitmap;