commit d1afef6b1801103a2b107681b231db3e0942b5fc
author Brian Osman <brianosman@google.com> Thu Apr 09 16:24:23 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Apr 15 14:30:46 2020 +0000
tree 689e2d27b771eafe673fb577c6182e9da54e8c5e
parent d276e3f0099ae0e257d83927048ec5f64d6fcb54

Support markers (custom matrices) in SkVertices Attributes

Bug: skia:9984
Change-Id: Ie799ffa19304978e2076f9ba790e8a34c1b03adf
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/283225
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

src/gpu/GrRenderTargetContext.cpp

diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp
index 2a81bae..79563e6 100644
--- a/src/gpu/GrRenderTargetContext.cpp
+++ b/src/gpu/GrRenderTargetContext.cpp
@@ -1084,7 +1084,7 @@
                                          sk_sp<SkVertices> vertices,
                                          GrPrimitiveType* overridePrimType,
                                          const SkRuntimeEffect* effect,
-                                         const SkM44* localToWorld) {
+                                         const SkMarkedMatrixProvider* matrixProvider) {
     ASSERT_SINGLE_OWNER
     RETURN_IF_ABANDONED
     SkDEBUGCODE(this->validate();)
@@ -1094,9 +1094,10 @@
 
     SkASSERT(vertices);
     GrAAType aaType = this->chooseAAType(GrAA::kNo);
-    std::unique_ptr<GrDrawOp> op = GrDrawVerticesOp::Make(
-            fContext, std::move(paint), std::move(vertices), viewMatrix, aaType,
-            this->colorInfo().refColorSpaceXformFromSRGB(), overridePrimType, effect, localToWorld);
+    std::unique_ptr<GrDrawOp> op =
+            GrDrawVerticesOp::Make(fContext, std::move(paint), std::move(vertices), viewMatrix,
+                                   aaType, this->colorInfo().refColorSpaceXformFromSRGB(),
+                                   overridePrimType, effect, matrixProvider);
     this->addDrawOp(clip, std::move(op));
 }