commit 80313c85e05705ebee67f59e0f7b0aa98295da43
author Brian Salomon <bsalomon@google.com> Wed Feb 24 10:19:11 2021 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Feb 24 16:32:04 2021 +0000
tree a12c2a5470252d67e07d6eda7c620c4742c5d29b
parent a77ed8b382c737b2101cc6fe18b717a50f182b7e

Go back to using coverage FP in aarecteffect/convexpoly GMs.

Drawing these with a color FP using fillRectWithFP made them harder
to triage.

TBR: michaelludwig@google.com
Change-Id: I97f181e861c1c24bb2224f00901eb470d868f3c4
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375059
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

gm/aarecteffect.cpp

diff --git a/gm/aarecteffect.cpp b/gm/aarecteffect.cpp
index e112b7a..298926f 100644
--- a/gm/aarecteffect.cpp
+++ b/gm/aarecteffect.cpp
@@ -23,6 +23,7 @@
 #include "src/gpu/GrPaint.h"
 #include "src/gpu/GrSurfaceDrawContext.h"
 #include "src/gpu/effects/generated/GrAARectEffect.h"
+#include "tools/gpu/TestOps.h"
 
 #include <memory>
 #include <utility>
@@ -76,8 +77,13 @@
                 auto fp = GrAARectEffect::Make(/*inputFP=*/nullptr, edgeType, rect);
                 SkASSERT(fp);
 
-                auto drawRect = rect.makeOutset(kOutset, kOutset).roundOut();
-                surfaceDrawContext->fillRectWithFP(drawRect, std::move(fp));
+                GrPaint grPaint;
+                grPaint.setColor4f({ 0, 0, 0, 1.f });
+                grPaint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc));
+                grPaint.setCoverageFragmentProcessor(std::move(fp));
+                auto drawRect = rect.makeOutset(kOutset, kOutset);
+                auto op = sk_gpu_test::test_ops::MakeRect(context, std::move(grPaint), drawRect);
+                surfaceDrawContext->addDrawOp(std::move(op));
 
                 x += SkScalarCeilToScalar(rect.width() + kDX);
             }

gm/convexpolyeffect.cpp

diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp
index 59c6870..d665da8 100644
--- a/gm/convexpolyeffect.cpp
+++ b/gm/convexpolyeffect.cpp
@@ -25,6 +25,7 @@
 #include "src/gpu/GrPaint.h"
 #include "src/gpu/GrSurfaceDrawContext.h"
 #include "src/gpu/effects/GrConvexPolyEffect.h"
+#include "tools/gpu/TestOps.h"
 
 #include <memory>
 #include <utility>
@@ -111,8 +112,13 @@
                     continue;
                 }
 
-                auto rect = p.getBounds().makeOutset(kOutset, kOutset).roundOut();
-                surfaceDrawContext->fillRectWithFP(rect, std::move(fp));
+                GrPaint grPaint;
+                grPaint.setColor4f({ 0, 0, 0, 1.f });
+                grPaint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc));
+                grPaint.setCoverageFragmentProcessor(std::move(fp));
+                auto rect = p.getBounds().makeOutset(kOutset, kOutset);
+                auto op = sk_gpu_test::test_ops::MakeRect(context, std::move(grPaint), rect);
+                surfaceDrawContext->addDrawOp(std::move(op));
 
                 x += SkScalarCeilToScalar(path->getBounds().width() + kDX);
             }