From bd7c551a0f65cb79fe4ed188ce5b594d653bddad Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Tue, 7 Mar 2017 09:08:36 -0500 Subject: 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 Commit-Queue: Brian Salomon --- dm/DMSrcSink.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'dm/DMSrcSink.h') diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h index 92c5773d36..220738b63b 100644 --- a/dm/DMSrcSink.h +++ b/dm/DMSrcSink.h @@ -57,8 +57,11 @@ private: }; 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 @@ public: 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; -- cgit v1.2.3