commit 1247867d86af9f9cd1a9f2bc89cb953b79b38180
author Greg Daniel <egdaniel@google.com> Fri Aug 14 11:35:58 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Aug 14 16:37:25 2020 +0000
tree 2b386756f621a0d8602e004a9234a2d1037ac8c4
parent a496e3ff07a7da40d0c0ed2664e2fc93b407e38a

Remove ability to add waitOp to GrOpsTask.

This isn't used anywhere since we no have GrWaitRenderTask.

Change-Id: I31e5f89fabf547346886edba5db1fac819096146
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310377
Reviewed-by: Adlai Holler <adlai@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

src/gpu/GrOpsTask.cpp

diff --git a/src/gpu/GrOpsTask.cpp b/src/gpu/GrOpsTask.cpp
index 7404949..907154c 100644
--- a/src/gpu/GrOpsTask.cpp
+++ b/src/gpu/GrOpsTask.cpp
@@ -613,12 +613,6 @@
 }
 
 bool GrOpsTask::resetForFullscreenClear(CanDiscardPreviousOps canDiscardPreviousOps) {
-    // If we previously recorded a wait op, we cannot delete the wait op. Until we track the wait
-    // ops separately from normal ops, we have to avoid clearing out any ops in this case as well.
-    if (fHasWaitOp) {
-        canDiscardPreviousOps = CanDiscardPreviousOps::kNo;
-    }
-
     if (CanDiscardPreviousOps::kYes == canDiscardPreviousOps || this->isEmpty()) {
         this->deleteOps();
         fDeferredProxies.reset();

src/gpu/GrOpsTask.h

diff --git a/src/gpu/GrOpsTask.h b/src/gpu/GrOpsTask.h
index 2d1e48e..5f17e4b 100644
--- a/src/gpu/GrOpsTask.h
+++ b/src/gpu/GrOpsTask.h
@@ -100,12 +100,6 @@
         this->recordOp(std::move(op), GrProcessorSet::EmptySetAnalysis(), nullptr, nullptr, caps);
     }
 
-    void addWaitOp(GrDrawingManager* drawingMgr, std::unique_ptr<GrOp> op,
-                   GrTextureResolveManager textureResolveManager, const GrCaps& caps) {
-        fHasWaitOp = true;
-        this->addOp(drawingMgr, std::move(op), textureResolveManager, caps);
-    }
-
     void addDrawOp(GrDrawingManager* drawingMgr, std::unique_ptr<GrDrawOp> op,
                    const GrProcessorSet::Analysis& processorAnalysis,
                    GrAppliedClip&& clip, const DstProxyView& dstProxyView,
@@ -319,9 +313,6 @@
     SkIRect fLastDevClipBounds;
     int fLastClipNumAnalyticElements;
 
-    // We must track if we have a wait op so that we don't delete the op when we have a full clear.
-    bool fHasWaitOp = false;
-
     // For ops/opsTask we have mean: 5 stdDev: 28
     SkSTArray<25, OpChain> fOpChains;