diff options
| author |  mtklein <mtklein@chromium.org> | 2015-04-21 10:49:13 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-04-21 10:49:14 -0700 |
| commit | 05641a5582bbb3ee40dc2c9ba21d837df9340583 (patch) | |
| tree | 2d494e018269e027643eaa6236c742d4c0a2e851 | |
| parent | fca5c88873cbf30f756bcb57e28df62f56c26d85 (diff) | |
DM: failure to canary a sink is now fatal.
This requires we remove NVPR from the default set of configs, as we only find
out at runtime that it's not available. All the other defaults will either be
compiled in and supported, or not compiled in and non-fatally skipped as
unknown configs.
BUG=skia:
Review URL: https://codereview.chromium.org/1100773003
| -rw-r--r-- | dm/DM.cpp | 4 | ||||
| -rw-r--r-- | tools/flags/SkCommonFlags.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -300,8 +300,8 @@ static void push_sink(const char* tag, Sink* s) { SkString log; Error err = sink->draw(noop, &bitmap, &stream, &log); if (err.isFatal()) { - SkDebugf("Skipping %s: %s\n", tag, err.c_str()); - return; + SkDebugf("Could not run %s: %s\n", tag, err.c_str()); + exit(1); } Tagged<Sink>& ts = gSinks.push_back(); diff --git a/tools/flags/SkCommonFlags.cpp b/tools/flags/SkCommonFlags.cpp index d05f76439b..ed7d5ccf5c 100644 --- a/tools/flags/SkCommonFlags.cpp +++ b/tools/flags/SkCommonFlags.cpp @@ -7,7 +7,7 @@ #include "SkCommonFlags.h" -DEFINE_string(config, "565 8888 gpu nonrendering angle nvprmsaa4 hwui ", +DEFINE_string(config, "565 8888 gpu nonrendering angle hwui ", "Options: 565 8888 pdf gpu nonrendering msaa4 msaa16 nvprmsaa4 nvprmsaa16 " "gpudft gpunull gpudebug angle mesa (and many more)"); |