commit 62214f779f38ca5909e29fee3c88cb888fee0791
author Robert Phillips <robertphillips@google.com> Tue Jun 15 10:12:51 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jun 15 15:22:17 2021 +0000
tree 61ac30b942dc4ef0ca9365e28605580ad4870401
parent ca1f0c1bc4f06626f0d15abcfb686d34460e469e

Clean up prior to making GrPathRenderers OGA-only

GrCpuVertexAllocator, GrIsStrokeHairlineOrEquivalent and kLinearizationPrecision are still
useful in the NGA so divorce them from OGA-only classes.

Bug: skia:11837
Change-Id: Ib10e6b5448e0eb2b62c0178cfd019009a3a2e952
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/418148
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/GrSoftwarePathRenderer.cpp

diff --git a/src/gpu/GrSoftwarePathRenderer.cpp b/src/gpu/GrSoftwarePathRenderer.cpp
index b7c6e43..d82fa2e 100644
--- a/src/gpu/GrSoftwarePathRenderer.cpp
+++ b/src/gpu/GrSoftwarePathRenderer.cpp
@@ -21,6 +21,7 @@
 #include "src/gpu/GrProxyProvider.h"
 #include "src/gpu/GrRecordingContextPriv.h"
 #include "src/gpu/GrSWMaskHelper.h"
+#include "src/gpu/GrUtil.h"
 #include "src/gpu/SkGr.h"
 #include "src/gpu/geometry/GrStyledShape.h"
 #include "src/gpu/ops/GrDrawOp.h"
@@ -233,8 +234,8 @@
     // We really need to know if the shape will be inverse filled or not
     // If the path is hairline, ignore inverse fill.
     bool inverseFilled = args.fShape->inverseFilled() &&
-                        !IsStrokeHairlineOrEquivalent(args.fShape->style(),
-                                                      *args.fViewMatrix, nullptr);
+                        !GrIsStrokeHairlineOrEquivalent(args.fShape->style(),
+                                                        *args.fViewMatrix, nullptr);
 
     SkIRect unclippedDevShapeBounds, clippedDevShapeBounds, devClipBounds;
     // To prevent overloading the cache with entries during animations we limit the cache of masks