Convert FillRRectOp to the new bind/draw API

Change-Id: Ide8f951ec64c245f94ddae5b442a115495b3e3f0
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/275550
Reviewed-by: Robert Phillips <[email protected]>
Commit-Queue: Chris Dalton <[email protected]>

Author: csmartdalton86

src/gpu/GrOpFlushState.h

@@ -135,6 +135,9 @@ class GrOpFlushState final : public GrDeferredUploadTarget, public GrMeshDrawOp:
     const GrSurfaceProxyView* outputView() const final { return this->drawOpArgs().outputView(); }
     GrRenderTargetProxy* proxy() const final { return this->drawOpArgs().proxy(); }
     const GrAppliedClip* appliedClip() const final { return this->drawOpArgs().appliedClip(); }
+    const SkIRect* scissorRectIfEnabled() const {
+        return this->appliedClip() ? this->appliedClip()->scissorRectIfEnabled() : nullptr;
+    }
     GrAppliedClip detachAppliedClip() final;
     const GrXferProcessor::DstProxyView& dstProxyView() const final {
         return this->drawOpArgs().dstProxyView();

src/gpu/ops/GrFillRRectOp.cpp

@@ -900,14 +900,11 @@ void FillRRectOp::onExecute(GrOpFlushState* flushState, const SkRect& chainBound
         fProgramInfo = this->createProgramInfo(flushState);
     }
 
-    GrMesh* mesh = flushState->allocator()->make<GrMesh>();
-    mesh->setIndexedInstanced(std::move(fIndexBuffer), fIndexCount,
-                              std::move(fInstanceBuffer), fInstanceCount,
-                              fBaseInstance, GrPrimitiveRestart::kNo);
-    mesh->setVertexData(std::move(fVertexBuffer));
-
-    flushState->opsRenderPass()->bindPipeline(*fProgramInfo, this->bounds());
-    flushState->opsRenderPass()->drawMeshes(*fProgramInfo, mesh, 1);
+    GrOpsRenderPass* renderPass = flushState->opsRenderPass();
+    renderPass->bindPipeline(*fProgramInfo, this->bounds(), flushState->scissorRectIfEnabled());
+    renderPass->bindTextures(fProgramInfo->primProc(), nullptr, fProgramInfo->pipeline());
+    renderPass->bindBuffers(fIndexBuffer.get(), fInstanceBuffer.get(), fVertexBuffer.get());
+    renderPass->drawIndexedInstanced(fIndexCount, 0, fInstanceCount, fBaseInstance, 0);
 }
 
 // Will the given corner look good if we use HW derivatives?