commit 787fd9d80a68fe2ad3d7f6616310319df4aa97ae
author Robert Phillips <robertphillips@google.com> Mon Mar 22 14:48:09 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Mar 22 19:44:40 2021 +0000
tree b9eb5cb778cf8da2854f9b875f8b7ee4503e42a1
parent 583a343d9ade326e9a94508875c6017bbd414ba9

Fuse GrPrimitiveProcessor & GrGeometryProcessor into a new GrGeometryProcessor

With the removal of NVPR we no longer need this distinction.

Bug: skia:11760
Change-Id: I225a4feb764395fb72aca3ffc8b6d05396bf0b1e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/386890
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>

src/gpu/ops/GrStrokeRectOp.cpp

diff --git a/src/gpu/ops/GrStrokeRectOp.cpp b/src/gpu/ops/GrStrokeRectOp.cpp
index e8a358c..cfad2bd 100644
--- a/src/gpu/ops/GrStrokeRectOp.cpp
+++ b/src/gpu/ops/GrStrokeRectOp.cpp
@@ -201,7 +201,7 @@
             this->createProgramInfo(target);
         }
 
-        size_t kVertexStride = fProgramInfo->primProc().vertexStride();
+        size_t kVertexStride = fProgramInfo->geomProc().vertexStride();
         int vertexCount = kVertsPerHairlineRect;
         if (fStrokeWidth > 0) {
             vertexCount = kVertsPerStrokeRect;
@@ -241,7 +241,7 @@
         }
 
         flushState->bindPipelineAndScissorClip(*fProgramInfo, chainBounds);
-        flushState->bindTextures(fProgramInfo->primProc(), nullptr, fProgramInfo->pipeline());
+        flushState->bindTextures(fProgramInfo->geomProc(), nullptr, fProgramInfo->pipeline());
         flushState->drawMesh(*fMesh);
     }
 
@@ -568,7 +568,7 @@
         return;
     }
     PatternHelper helper(target, GrPrimitiveType::kTriangles,
-                         fProgramInfo->primProc().vertexStride(), std::move(indexBuffer),
+                         fProgramInfo->geomProc().vertexStride(), std::move(indexBuffer),
                          verticesPerInstance, indicesPerInstance, instanceCount, maxQuads);
     GrVertexWriter vertices{ helper.vertices() };
     if (!vertices.fPtr) {
@@ -598,7 +598,7 @@
     }
 
     flushState->bindPipelineAndScissorClip(*fProgramInfo, chainBounds);
-    flushState->bindTextures(fProgramInfo->primProc(), nullptr, fProgramInfo->pipeline());
+    flushState->bindTextures(fProgramInfo->geomProc(), nullptr, fProgramInfo->pipeline());
     flushState->drawMesh(*fMesh);
 }