diff options
| author |  msarett <msarett@google.com> | 2016-02-10 06:48:21 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-10 06:48:21 -0800 |
| commit | 36c070d82856bd79eaa13bd058af45e19f302b53 (patch) | |
| tree | 67cada10970c48f6770fbd2e3aa062180cb373e7 /dm | |
| parent | 50a8dd0a00538840e55233146cb202e256cc6c34 (diff) | |
Enable ImageGenerator tests on direct raster and direct gpu backends
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1682973004
Review URL: https://codereview.chromium.org/1682973004
Diffstat (limited to 'dm')
| -rw-r--r-- | dm/DMSrcSink.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index 1e323cbdee..9a62362010 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -271,7 +271,9 @@ CodecSrc::CodecSrc(Path path, Mode mode, DstColorType dstColorType, SkAlphaType bool CodecSrc::veto(SinkFlags flags) const { // Test CodecImageGenerator on 8888, 565, and gpu if (kGen_Mode == fMode) { - return flags.type != SinkFlags::kRaster || flags.type != SinkFlags::kGPU || + // For image generator, we want to test kDirect approaches for kRaster and kGPU, + // while skipping everything else. + return (flags.type != SinkFlags::kRaster && flags.type != SinkFlags::kGPU) || flags.approach != SinkFlags::kDirect; } |