commit 94310794353ea0ce40e2da838f6a86158978ffb6
author Chris Dalton <csmartdalton@google.com> Fri Mar 12 11:10:24 2021 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Mar 12 22:14:16 2021 +0000
tree 035d73c6a61875efc3b296758b52bed89e89d5d8
parent 90898de3468d19d78e68db34bdeda384a6f2346a

Unblock msaa clip atlas on AMD, Imagination, and Adreno

TBR=michaelludwig@google.com

Change-Id: I858df2325abac4ce8de966446078397cc359e944
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384296
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp

diff --git a/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp b/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp
index a93ca9f..022ce6b 100644
--- a/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp
+++ b/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp
@@ -18,15 +18,14 @@
     const GrShaderCaps& shaderCaps = *caps.shaderCaps();
     GrBackendFormat defaultA8Format = caps.getDefaultBackendFormat(GrColorType::kAlpha_8,
                                                                    GrRenderable::kYes);
-    if (caps.driverDisableCCPR() || !shaderCaps.integerSupport() ||
+    if (caps.driverDisableMSAAClipAtlas() || !shaderCaps.integerSupport() ||
         !caps.drawInstancedSupport() || !shaderCaps.floatIs32Bits() ||
         !defaultA8Format.isValid() || // This checks both texturable and renderable
         !caps.halfFloatVertexAttributeSupport()) {
         return false;
     }
 
-    if (!caps.driverDisableMSAACCPR() &&
-        caps.internalMultisampleCount(defaultA8Format) > 1 &&
+    if (caps.internalMultisampleCount(defaultA8Format) > 1 &&
         caps.sampleLocationsSupport() &&
         shaderCaps.sampleMaskSupport()) {
         return true;