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.cpp

diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index 54ce44c..6561ad9 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -880,7 +880,9 @@
 
 bool ImageGenSrc::veto(SinkFlags flags) const {
     if (fIsGpu) {
-        return flags.type != SinkFlags::kGPU || flags.approach != SinkFlags::kDirect;
+        // MSAA runs tend to run out of memory and tests the same code paths as regular gpu configs.
+        return flags.type != SinkFlags::kGPU || flags.approach != SinkFlags::kDirect ||
+               flags.multisampled == SinkFlags::kMultisampled;
     }
 
     return flags.type != SinkFlags::kRaster || flags.approach != SinkFlags::kDirect;