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/GrAuditTrail.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/GrAuditTrail.cpp')
| -rw-r--r-- | src/gpu/GrAuditTrail.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gpu/GrAuditTrail.cpp b/src/gpu/GrAuditTrail.cpp index e6b5c3adb2..411be3f428 100644 --- a/src/gpu/GrAuditTrail.cpp +++ b/src/gpu/GrAuditTrail.cpp @@ -10,9 +10,7 @@ const int GrAuditTrail::kGrAuditTrailInvalidID = -1; -void GrAuditTrail::addOp(const GrOp* op, - GrGpuResource::UniqueID resourceID, - GrRenderTargetProxy::UniqueID proxyID) { +void GrAuditTrail::addOp(const GrOp* op, GrRenderTargetProxy::UniqueID proxyID) { SkASSERT(fEnabled); Op* auditOp = new Op; fOpPool.emplace_back(auditOp); @@ -46,7 +44,7 @@ void GrAuditTrail::addOp(const GrOp* op, // We use the op pointer as a key to find the OpNode we are 'glomming' ops onto fIDLookup.set(op->uniqueID(), auditOp->fOpListID); - OpNode* opNode = new OpNode(resourceID, proxyID); + OpNode* opNode = new OpNode(proxyID); opNode->fBounds = op->bounds(); opNode->fChildren.push_back(auditOp); fOpList.emplace_back(opNode); @@ -91,7 +89,6 @@ void GrAuditTrail::copyOutFromOpList(OpInfo* outOpInfo, int opListID) { const OpNode* bn = fOpList[opListID].get(); SkASSERT(bn); outOpInfo->fBounds = bn->fBounds; - outOpInfo->fResourceUniqueID = bn->fResourceUniqueID; outOpInfo->fProxyUniqueID = bn->fProxyUniqueID; for (int j = 0; j < bn->fChildren.count(); j++) { OpInfo::Op& outOp = outOpInfo->fOps.push_back(); @@ -289,7 +286,6 @@ SkString GrAuditTrail::Op::toJson() const { SkString GrAuditTrail::OpNode::toJson() const { SkString json; json.append("{"); - json.appendf("\"ResourceID\": \"%u\",", fResourceUniqueID.asUInt()); json.appendf("\"ProxyID\": \"%u\",", fProxyUniqueID.asUInt()); skrect_to_json(&json, "Bounds", fBounds); JsonifyTArray(&json, "Ops", fChildren, true); |