diff options
| author |  Chris Dalton <csmartdalton@google.com> | 2018-05-22 16:17:48 -0600 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-23 13:27:41 +0000 |
| commit | f104fec6d745540019556823f849535fe8872653 (patch) | |
| tree | 49a7fb44c37f7e8b333f259714d14a2f5eefa3e3 /src/gpu/GrRenderTargetOpList.cpp | |
| parent | 3087c1f382f1cd547598dc75f47ccbc8fe1e6e0f (diff) | |
Delete GrDrawOp::wasRecorded
Bug: skia:7988
Change-Id: I8d12beec835767f22302a1e167fcef46ee5e5ffc
Reviewed-on: https://skia-review.googlesource.com/129555
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Diffstat (limited to 'src/gpu/GrRenderTargetOpList.cpp')
| -rw-r--r-- | src/gpu/GrRenderTargetOpList.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/GrRenderTargetOpList.cpp b/src/gpu/GrRenderTargetOpList.cpp index b53b4006c8..f98e0f4197 100644 --- a/src/gpu/GrRenderTargetOpList.cpp +++ b/src/gpu/GrRenderTargetOpList.cpp @@ -322,10 +322,10 @@ bool GrRenderTargetOpList::combineIfPossible(const RecordedOp& a, GrOp* b, return a.fOp->combineIfPossible(b, caps); } -void GrRenderTargetOpList::recordOp(std::unique_ptr<GrOp> op, - const GrCaps& caps, - GrAppliedClip* clip, - const DstProxy* dstProxy) { +uint32_t GrRenderTargetOpList::recordOp(std::unique_ptr<GrOp> op, + const GrCaps& caps, + GrAppliedClip* clip, + const DstProxy* dstProxy) { SkASSERT(fTarget.get()); // A closed GrOpList should never receive new/more ops @@ -358,7 +358,7 @@ void GrRenderTargetOpList::recordOp(std::unique_ptr<GrOp> op, GrOP_INFO("\t\t\tBackward: Combined op info:\n"); GrOP_INFO(SkTabString(candidate.fOp->dumpInfo(), 4).c_str()); GR_AUDIT_TRAIL_OPS_RESULT_COMBINED(fAuditTrail, candidate.fOp.get(), op.get()); - return; + return SK_InvalidUniqueID; } // Stop going backwards if we would cause a painter's order violation. if (!can_reorder(fRecordedOps.fromBack(i).fOp->bounds(), op->bounds())) { @@ -381,7 +381,7 @@ void GrRenderTargetOpList::recordOp(std::unique_ptr<GrOp> op, SkDEBUGCODE(fNumClips++;) } fRecordedOps.emplace_back(std::move(op), clip, dstProxy); - fRecordedOps.back().fOp->wasRecorded(this); + return this->uniqueID(); } void GrRenderTargetOpList::forwardCombine(const GrCaps& caps) { |