commit bd7c551a0f65cb79fe4ed188ce5b594d653bddad
author Brian Salomon <bsalomon@google.com> Tue Mar 07 09:08:36 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Mar 07 14:52:45 2017 +0000
tree 1a92d863f27440d821aca4fb3add4ab20e075121
parent c0a4c4f969464ec9854d726836a430262351d63d

Don't run image tests on msaa configs.

BUG=skia:6331
BUG=skia:4888

Change-Id: I8b66f4662342c2b60ddd2859146839d7cb09bbeb
Reviewed-on: https://skia-review.googlesource.com/9339
Reviewed-by: Matt Sarett <msarett@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

dm/DMSrcSink.h

diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h
index 92c5773..220738b 100644
--- a/dm/DMSrcSink.h
+++ b/dm/DMSrcSink.h
@@ -57,8 +57,11 @@
 };
 
 struct SinkFlags {
-    enum { kNull, kGPU, kVector, kRaster } type;
-    enum { kDirect, kIndirect } approach;
+    enum Type { kNull, kGPU, kVector, kRaster } type;
+    enum Approach { kDirect, kIndirect } approach;
+    enum Multisampled { kNotMultisampled, kMultisampled } multisampled;
+    SinkFlags(Type t, Approach a, Multisampled ms = kNotMultisampled)
+            : type(t), approach(a), multisampled(ms) {}
 };
 
 struct Src {
@@ -310,7 +313,9 @@
     Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override;
     bool serial() const override { return !fThreaded; }
     const char* fileExtension() const override { return "png"; }
-    SinkFlags flags() const override { return SinkFlags{ SinkFlags::kGPU, SinkFlags::kDirect }; }
+    SinkFlags flags() const override {
+        return SinkFlags{ SinkFlags::kGPU, SinkFlags::kDirect, SinkFlags::kMultisampled };
+    }
 private:
     sk_gpu_test::GrContextFactory::ContextType        fContextType;
     sk_gpu_test::GrContextFactory::ContextOverrides   fContextOverrides;