commit 854ee85736e3ea38f874ac490a9ba24d2d58158a
author Chris Dalton <csmartdalton@google.com> Tue Jan 05 15:12:59 2021 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jan 05 23:53:01 2021 +0000
tree 5e1d386b43d5e1c2d60565e129d157671b0216b3
parent 57ea1fcb74d602516e2aa9cb5623072f015c76a5

Delete GrTriangulator::Mode

Bug: skia:10419
Change-Id: Ia81c615538ff1f0fe2372ea2e7bf437ceec08d7e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/349336
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/gpu/ops/GrTriangulatingPathRenderer.cpp

diff --git a/src/gpu/ops/GrTriangulatingPathRenderer.cpp b/src/gpu/ops/GrTriangulatingPathRenderer.cpp
index 993e45e..b72eccf 100644
--- a/src/gpu/ops/GrTriangulatingPathRenderer.cpp
+++ b/src/gpu/ops/GrTriangulatingPathRenderer.cpp
@@ -356,8 +356,7 @@
         SkPath path;
         shape.asPath(&path);
 
-        return GrTriangulator::PathToTriangles(path, tol, clipBounds, allocator,
-                                               GrTriangulator::Mode::kNormal, isLinear);
+        return GrTriangulator::PathToTriangles(path, tol, clipBounds, allocator, isLinear);
     }
 
     void createNonAAMesh(Target* target) {
@@ -441,9 +440,8 @@
         int firstVertex;
         bool isLinear;
         GrEagerDynamicVertexAllocator allocator(target, &vertexBuffer, &firstVertex);
-        int vertexCount = GrTriangulator::PathToTriangles(path, tol, clipBounds, &allocator,
-                                                          GrTriangulator::Mode::kEdgeAntialias,
-                                                          &isLinear);
+        int vertexCount = GrTriangulator::PathToAATriangles(path, tol, clipBounds, &allocator,
+                                                            &isLinear);
         if (vertexCount == 0) {
             return;
         }
@@ -490,9 +488,11 @@
         }
 
 #ifdef SK_DEBUG
-        auto mode = (fAntiAlias) ? GrTriangulator::Mode::kEdgeAntialias
-                                 : GrTriangulator::Mode::kNormal;
-        SkASSERT(GrTriangulator::GetVertexStride(mode) == gp->vertexStride());
+        auto vertexStride = sizeof(SkPoint);
+        if (fAntiAlias) {
+            vertexStride += sizeof(float);
+        }
+        SkASSERT(vertexStride == gp->vertexStride());
 #endif
 
         GrPrimitiveType primitiveType = TRIANGULATOR_WIREFRAME ? GrPrimitiveType::kLines