Detach op memory pool from recording context
This changes GrOpMemoryPool to no longer extend SkRefCnt, and all usages
either are std::unique_ptr for owners, or GrOpMemoryPool* when ownership
is held somewhere else. The culmination of this is that DDLs explicitly
detach the memory pool from the recording context instead of the GrOpsTask
maintaining a strong ref that preserved the memory somewhat sneakily.
Change-Id: I33e2caebea70cebe8fd7681207c631feeaf2c703
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/259424
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
diff --git a/src/gpu/GrOpsTask.cpp b/src/gpu/GrOpsTask.cpp
index b57066f..ea21b55 100644
--- a/src/gpu/GrOpsTask.cpp
+++ b/src/gpu/GrOpsTask.cpp
@@ -352,11 +352,11 @@
////////////////////////////////////////////////////////////////////////////////
-GrOpsTask::GrOpsTask(sk_sp<GrOpMemoryPool> opMemoryPool,
+GrOpsTask::GrOpsTask(GrOpMemoryPool* opMemoryPool,
GrSurfaceProxyView view,
GrAuditTrail* auditTrail)
: GrRenderTask(std::move(view))
- , fOpMemoryPool(std::move(opMemoryPool))
+ , fOpMemoryPool(opMemoryPool)
, fAuditTrail(auditTrail)
, fLastClipStackGenID(SK_InvalidUniqueID)
SkDEBUGCODE(, fNumClips(0)) {
@@ -366,7 +366,7 @@
void GrOpsTask::deleteOps() {
for (auto& chain : fOpChains) {
- chain.deleteOps(fOpMemoryPool.get());
+ chain.deleteOps(fOpMemoryPool);
}
fOpChains.reset();
}
@@ -815,7 +815,7 @@
while (true) {
OpChain& candidate = fOpChains.fromBack(i);
op = candidate.appendOp(std::move(op), processorAnalysis, dstProxyView, clip, caps,
- fOpMemoryPool.get(), fAuditTrail);
+ fOpMemoryPool, fAuditTrail);
if (!op) {
return;
}
@@ -850,7 +850,7 @@
int j = i + 1;
while (true) {
OpChain& candidate = fOpChains[j];
- if (candidate.prependChain(&chain, caps, fOpMemoryPool.get(), fAuditTrail)) {
+ if (candidate.prependChain(&chain, caps, fOpMemoryPool, fAuditTrail)) {
break;
}
// Stop traversing if we would cause a painter's order violation.