commit 39ca9734a7c4a092544598449ddf761f1ec0f630
author Chris Dalton <csmartdalton@google.com> Tue Mar 10 10:34:17 2020 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Mar 10 20:12:53 2020 +0000
tree 8bc54ec31f675023546d38c1bf8411e6cfa97183
parent 6e7eac9fffc71fc82404222ea5b9aa294bd31116

Migrate ccpr to the new bind/draw API

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

src/gpu/ccpr/GrGSCoverageProcessor.cpp

diff --git a/src/gpu/ccpr/GrGSCoverageProcessor.cpp b/src/gpu/ccpr/GrGSCoverageProcessor.cpp
index f6a69ea..feaac1a 100644
--- a/src/gpu/ccpr/GrGSCoverageProcessor.cpp
+++ b/src/gpu/ccpr/GrGSCoverageProcessor.cpp
@@ -7,7 +7,7 @@
 
 #include "src/gpu/ccpr/GrGSCoverageProcessor.h"
 
-#include "src/gpu/GrMesh.h"
+#include "src/gpu/GrOpsRenderPass.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h"
 
@@ -409,7 +409,8 @@
     }
 };
 
-void GrGSCoverageProcessor::reset(PrimitiveType primitiveType, GrResourceProvider*) {
+void GrGSCoverageProcessor::reset(PrimitiveType primitiveType, int subpassIdx,
+                                  GrResourceProvider*) {
     fPrimitiveType = primitiveType;  // This will affect the return values for numInputPoints, etc.
 
     if (4 == this->numInputPoints() || this->hasInputWeight()) {
@@ -427,28 +428,23 @@
     }
 
     this->setVertexAttributes(&fInputXOrYValues, 1);
+
+    SkASSERT(subpassIdx == 0 || subpassIdx == 1);
+    fSubpass = (Subpass)subpassIdx;
 }
 
-void GrGSCoverageProcessor::appendMesh(sk_sp<const GrGpuBuffer> instanceBuffer, int instanceCount,
-                                       int baseInstance, SkTArray<GrMesh>* out) const {
+void GrGSCoverageProcessor::bindBuffers(GrOpsRenderPass* renderPass,
+                                        const GrBuffer* instanceBuffer) const {
+    renderPass->bindBuffers(nullptr, nullptr, instanceBuffer);
+}
+
+void GrGSCoverageProcessor::drawInstances(GrOpsRenderPass* renderPass, int instanceCount,
+                                          int baseInstance) const {
     // We don't actually make instanced draw calls. Instead, we feed transposed x,y point values to
     // the GPU in a regular vertex array and draw kLines (see initGS). Then, each vertex invocation
     // receives either the shape's x or y values as inputs, which it forwards to the geometry
     // shader.
-    GrMesh& mesh = out->push_back();
-    mesh.setNonIndexedNonInstanced(instanceCount * 2);
-    mesh.setVertexData(std::move(instanceBuffer), baseInstance * 2);
-}
-
-void GrGSCoverageProcessor::draw(
-        GrOpFlushState* flushState, const GrPipeline& pipeline, const SkIRect scissorRects[],
-        const GrMesh meshes[], int meshCount, const SkRect& drawBounds) const {
-    // The geometry shader impl draws primitives in two subpasses: The first pass fills the interior
-    // and does edge AA. The second pass does touch up on corner pixels.
-    for (int i = 0; i < 2; ++i) {
-        fSubpass = (Subpass) i;
-        INHERITED::draw(flushState, pipeline, scissorRects, meshes, meshCount, drawBounds);
-    }
+    renderPass->draw(instanceCount * 2, baseInstance * 2);
 }
 
 GrGLSLPrimitiveProcessor* GrGSCoverageProcessor::onCreateGLSLInstance(