commit 473a848200a60a850accc316f59ed5ec2131bbb4
author Robert Phillips <robertphillips@google.com> Tue Oct 20 10:44:15 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Oct 20 17:35:42 2020 +0000
tree 2c039c698aae26047945484cadb1c46c5428cffa
parent 9ae860a9fe85beb4ffe6f2b67056ffa17b9a23d5

Make GrFillRectOp::onPrePrepareDraws also call base class' version

and add a TriangulatingPathOp::onPrePrepareDraws shell.

Bug: 1108408
Change-Id: Ifc5e80c08ffaa47927d1691c0a8dd52db24adcd0
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/328597
Reviewed-by: Adlai Holler <adlai@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/ops/GrFillRectOp.cpp

diff --git a/src/gpu/ops/GrFillRectOp.cpp b/src/gpu/ops/GrFillRectOp.cpp
index a874ea6..c966a41 100644
--- a/src/gpu/ops/GrFillRectOp.cpp
+++ b/src/gpu/ops/GrFillRectOp.cpp
@@ -198,8 +198,6 @@
     }
 
     GrProgramInfo* programInfo() override {
-        // This Op implements its own onPrePrepareDraws so this entry point should never be called.
-        SkASSERT(0);
         return fProgramInfo;
     }
 
@@ -221,7 +219,7 @@
                                                             renderPassXferBarriers);
     }
 
-    void onPrePrepareDraws(GrRecordingContext* context,
+    void onPrePrepareDraws(GrRecordingContext* rContext,
                            const GrSurfaceProxyView* writeView,
                            GrAppliedClip* clip,
                            const GrXferProcessor::DstProxyView& dstProxyView,
@@ -230,15 +228,10 @@
 
         SkASSERT(!fPrePreparedVertices);
 
-        SkArenaAlloc* arena = context->priv().recordTimeAllocator();
+        INHERITED::onPrePrepareDraws(rContext, writeView, clip, dstProxyView,
+                                     renderPassXferBarriers);
 
-        // This is equivalent to a GrOpFlushState::detachAppliedClip
-        GrAppliedClip appliedClip = clip ? std::move(*clip) : GrAppliedClip::Disabled();
-
-        this->createProgramInfo(context->priv().caps(), arena, writeView,
-                                std::move(appliedClip), dstProxyView, renderPassXferBarriers);
-
-        context->priv().recordProgramInfo(fProgramInfo);
+        SkArenaAlloc* arena = rContext->priv().recordTimeAllocator();
 
         const VertexSpec vertexSpec = this->vertexSpec();
 

src/gpu/ops/GrTriangulatingPathRenderer.cpp

diff --git a/src/gpu/ops/GrTriangulatingPathRenderer.cpp b/src/gpu/ops/GrTriangulatingPathRenderer.cpp
index b158a19..196b54b 100644
--- a/src/gpu/ops/GrTriangulatingPathRenderer.cpp
+++ b/src/gpu/ops/GrTriangulatingPathRenderer.cpp
@@ -403,6 +403,17 @@
                                                              renderPassXferBarriers);
     }
 
+    void onPrePrepareDraws(GrRecordingContext* rContext,
+                           const GrSurfaceProxyView* writeView,
+                           GrAppliedClip* clip,
+                           const GrXferProcessor::DstProxyView& dstProxyView,
+                           GrXferBarrierFlags renderPassXferBarriers) override {
+        TRACE_EVENT0("skia.gpu", TRACE_FUNC);
+
+        INHERITED::onPrePrepareDraws(rContext, writeView, clip, dstProxyView,
+                                     renderPassXferBarriers);
+    }
+
     void onPrepareDraws(Target* target) override {
         if (fAntiAlias) {
             this->createAAMesh(target);