commit 94df572a137438dfc40897b559e8ebcd2a2d075c
author Chris Dalton <csmartdalton@google.com> Mon Apr 19 17:40:40 2021 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Apr 20 16:24:56 2021 +0000
tree 484f50f4b0ac3af59d8777a3bf77e1ded6c45df8
parent f5b87f9b1191cd4f769d1fc3a499a05b19330a14

Convert dmsaa to an SkSurfaceProp

Bug: skia:11396
Change-Id: I1c2a72d80679df1c11529d05cbe781f6dfae6a79
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/396810
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

src/gpu/GrSurfaceDrawContext.cpp

diff --git a/src/gpu/GrSurfaceDrawContext.cpp b/src/gpu/GrSurfaceDrawContext.cpp
index e8bf3dd..e82b276 100644
--- a/src/gpu/GrSurfaceDrawContext.cpp
+++ b/src/gpu/GrSurfaceDrawContext.cpp
@@ -629,8 +629,7 @@
                                        const SkMatrix& viewMatrix,
                                        sk_sp<GrColorSpaceXform> colorSpaceXform) {
     // If we are using dmsaa then go through GrFillRRectOp (via fillRectToRect).
-    if ((fContext->priv().alwaysAntialias() || this->caps()->reducedShaderMode()) &&
-        aa == GrAA::kYes) {
+    if ((this->alwaysAntialias() || this->caps()->reducedShaderMode()) && aa == GrAA::kYes) {
         GrPaint paint;
         paint.setColor4f(color);
         std::unique_ptr<GrFragmentProcessor> fp;
@@ -756,8 +755,8 @@
                   aa == GrAA::kYes ? GrQuadAAFlags::kAll : GrQuadAAFlags::kNone};
 
     // If we are using dmsaa then attempt to draw the rect with GrFillRRectOp.
-    if ((fContext->priv().caps()->reducedShaderMode() || fContext->priv().alwaysAntialias()) &&
-        this->caps()->drawInstancedSupport()                                                 &&
+    if ((fContext->priv().caps()->reducedShaderMode() || this->alwaysAntialias()) &&
+        this->caps()->drawInstancedSupport()                                      &&
         aa == GrAA::kYes) {  // If aa is kNo when using dmsaa, the rect is axis aligned. Don't use
                              // GrFillRRectOp because it might require dual source blending.
                              // http://skbug.com/11756