diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-05-17 09:36:38 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-17 14:19:40 +0000 |
| commit | 318c419d3e373487a8bb28f56ea921ed850e61ac (patch) | |
| tree | 5899f07429b2bbc12bd27a3ecff05292e52c3017 /src/gpu/GrTextureOpList.cpp | |
| parent | 292bf7a163729330ec6d337992ddd2403a0ed8a2 (diff) | |
Remove RenderTarget pointer from GrRenderTargetOpList::RecordedOp
Change-Id: I08afe531cd9c65af4b3f6b6006bc3eaf7071cfec
Change-Id: I08afe531cd9c65af4b3f6b6006bc3eaf7071cfec
Reviewed-on: https://skia-review.googlesource.com/17117
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrTextureOpList.cpp')
| -rw-r--r-- | src/gpu/GrTextureOpList.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/gpu/GrTextureOpList.cpp b/src/gpu/GrTextureOpList.cpp index dd1c8403b0..0963f3541c 100644 --- a/src/gpu/GrTextureOpList.cpp +++ b/src/gpu/GrTextureOpList.cpp @@ -41,10 +41,6 @@ void GrTextureOpList::dump() const { } } -void GrTextureOpList::validateTargetsSingleRenderTarget() const { - SkASSERT(1 == fRecordedOps.count() || 0 == fRecordedOps.count()); -} - #endif void GrTextureOpList::prepareOps(GrOpFlushState* flushState) { @@ -93,20 +89,16 @@ bool GrTextureOpList::copySurface(GrResourceProvider* resourceProvider, this->addDependency(src); #endif - // See the comment in GrRenderTargetOpList about why we pass the invalid ID here. - this->recordOp(std::move(op), - GrGpuResource::UniqueID::InvalidID(), - GrSurfaceProxy::UniqueID::InvalidID()); + this->recordOp(std::move(op)); return true; } -void GrTextureOpList::recordOp(std::unique_ptr<GrOp> op, - GrGpuResource::UniqueID resourceUniqueID, - GrSurfaceProxy::UniqueID proxyUniqueID) { +void GrTextureOpList::recordOp(std::unique_ptr<GrOp> op) { + SkASSERT(fTarget.get()); // A closed GrOpList should never receive new/more ops SkASSERT(!this->isClosed()); - GR_AUDIT_TRAIL_ADD_OP(fAuditTrail, op.get(), resourceUniqueID, proxyUniqueID); + GR_AUDIT_TRAIL_ADD_OP(fAuditTrail, op.get(), fTarget.get()->uniqueID()); GrOP_INFO("Re-Recording (%s, opID: %u)\n" "\tBounds LRTB (%f, %f, %f, %f)\n", op->name(), |