commit 22dd57b82cebeacbaea1bfda71df64283e712ce7
author Chris Dalton <csmartdalton@google.com> Wed Mar 17 17:35:07 2021 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Mar 17 23:36:12 2021 +0000
tree a0cfd973c730c313d2dac4af3d7e21be3ce90a88
parent 3150839b598e99855af42b84e5ce554e96cf0855

Revert "Add tooling support for dmsaa"

This reverts commit 188443be8d18b270a9f5810448d667e6ba009cb0.

Reason for revert: It looks like non-dmsaa bots might have been
affected. Let's land first without the new bots to make sure nothing
else changes.

Original change's description:
> Add tooling support for dmsaa
>
> Adds a "fAlwaysAntiAlias" flag to GrContextOptions that can be set from
> tooling code. When dmsaa is set, SkGpuDevice draws everything
> antialiased. Adds new "gldmsaa" and "glesdmsaa" configs and creates bots
> to run them.
>
> Bug: skia:11396
> Change-Id: I165e89434b733f7b02312cea0e6649812528083b
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384936
> Commit-Queue: Chris Dalton <csmartdalton@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>

TBR=bsalomon@google.com,csmartdalton@google.com,michaelludwig@google.com

Change-Id: Ib805b417ebd34d1fad79e0e1fe625765ee487f65
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:11396
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/386336
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Auto-Submit: Chris Dalton <csmartdalton@google.com>

bench/nanobench.cpp

diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index 2cb8b00..c646319 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -247,7 +247,6 @@
     }
     bool init(SkImageInfo info, Benchmark* bench) override {
         GrContextOptions options = grContextOpts;
-        options.fAlwaysAntialias = config.useDMSAA;
         bench->modifyGrContextOptions(&options);
         this->factory = std::make_unique<GrContextFactory>(options);
         SkSurfaceProps props(this->config.surfaceFlags, kRGB_H_SkPixelGeometry);
@@ -470,7 +469,6 @@
         const auto ctxType = gpuConfig->getContextType();
         const auto ctxOverrides = gpuConfig->getContextOverrides();
         const auto sampleCount = gpuConfig->getSamples();
-        const auto useDMSAA = gpuConfig->getUseDMSAA();
         const auto colorType = gpuConfig->getColorType();
         auto colorSpace = gpuConfig->getColorSpace();
         if (gpuConfig->getSurfType() != SkCommandLineConfigGpu::SurfType::kDefault) {
@@ -501,7 +499,6 @@
             kPremul_SkAlphaType,
             sk_ref_sp(colorSpace),
             sampleCount,
-            useDMSAA,
             ctxType,
             ctxOverrides,
             gpuConfig->getSurfaceFlags()
@@ -520,7 +517,7 @@
             }                                                                  \
             Config config = {                                                  \
                 SkString(#name), Benchmark::backend, color, alpha, colorSpace, \
-                0, false, kBogusContextType, kBogusContextOverrides, 0         \
+                0, kBogusContextType, kBogusContextOverrides, 0                \
             };                                                                 \
             configs->push_back(config);                                        \
             return;                                                            \