commit 37c7bdda22eb38d2ceff50ab29785de3cc2d1478
author Chris Dalton <csmartdalton@google.com> Fri Mar 13 09:21:12 2020 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Mar 16 14:32:50 2020 +0000
tree 1f47601bb08e81c82acf593237043387c9aea504
parent 56c09f0d446e508149dafdea8855b7b83b4cc044

Remove GrMesh::setVertexData

Fuses the relevant functionality into the set() calls.

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

src/gpu/ops/GrQuadPerEdgeAA.cpp

diff --git a/src/gpu/ops/GrQuadPerEdgeAA.cpp b/src/gpu/ops/GrQuadPerEdgeAA.cpp
index ee2a694..42162f8 100644
--- a/src/gpu/ops/GrQuadPerEdgeAA.cpp
+++ b/src/gpu/ops/GrQuadPerEdgeAA.cpp
@@ -400,11 +400,9 @@
 
     if (spec.indexBufferOption() == IndexBufferOption::kTriStrips) {
         SkASSERT(!indexBuffer);
-
-        mesh->setNonIndexedNonInstanced(4);
         int offset = absVertBufferOffset +
                                     runningQuadCount * GrResourceProvider::NumVertsPerNonAAQuad();
-        mesh->setVertexData(std::move(vertexBuffer), offset);
+        mesh->set(std::move(vertexBuffer), 4, offset);
         return;
     }
 
@@ -434,9 +432,8 @@
         // preferred.
         int offset = absVertBufferOffset + runningQuadCount * numVertsPerQuad;
 
-        mesh->setIndexedPatterned(std::move(indexBuffer), numIndicesPerQuad,
-                                  numVertsPerQuad, quadsInDraw, maxNumQuads);
-        mesh->setVertexData(std::move(vertexBuffer), offset);
+        mesh->setIndexedPatterned(std::move(indexBuffer), numIndicesPerQuad, quadsInDraw,
+                                  maxNumQuads, std::move(vertexBuffer), numVertsPerQuad, offset);
     } else {
         int baseIndex = runningQuadCount * numIndicesPerQuad;
         int numIndicesToDraw = quadsInDraw * numIndicesPerQuad;
@@ -445,8 +442,8 @@
         int maxVertex = (runningQuadCount + quadsInDraw) * numVertsPerQuad;
 
         mesh->setIndexed(std::move(indexBuffer), numIndicesToDraw,
-                         baseIndex, minVertex, maxVertex, GrPrimitiveRestart::kNo);
-        mesh->setVertexData(std::move(vertexBuffer), absVertBufferOffset);
+                         baseIndex, minVertex, maxVertex, GrPrimitiveRestart::kNo,
+                         std::move(vertexBuffer), absVertBufferOffset);
     }
 }