Minor cleanup of GrResourceAllocator
This also adds a useful debug print out (of the end-of-opList array)
Change-Id: Ia678b6e8d143ca4f851984fb5026c2ec4f998384
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/202706
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
diff --git a/src/gpu/GrTextureOpList.cpp b/src/gpu/GrTextureOpList.cpp
index ba07add..2d93f77 100644
--- a/src/gpu/GrTextureOpList.cpp
+++ b/src/gpu/GrTextureOpList.cpp
@@ -181,21 +181,22 @@
}
void GrTextureOpList::gatherProxyIntervals(GrResourceAllocator* alloc) const {
- unsigned int cur = alloc->numOps();
// Add the interval for all the writes to this opList's target
if (fRecordedOps.count()) {
+ unsigned int cur = alloc->curOp();
+
alloc->addInterval(fTarget.get(), cur, cur+fRecordedOps.count()-1);
} else {
// This can happen if there is a loadOp (e.g., a clear) but no other draws. In this case we
// still need to add an interval for the destination so we create a fake op# for
// the missing clear op.
- alloc->addInterval(fTarget.get());
+ alloc->addInterval(fTarget.get(), alloc->curOp(), alloc->curOp());
alloc->incOps();
}
auto gather = [ alloc SkDEBUGCODE(, this) ] (GrSurfaceProxy* p) {
- alloc->addInterval(p SkDEBUGCODE(, p == fTarget.get()));
+ alloc->addInterval(p, alloc->curOp(), alloc->curOp() SkDEBUGCODE(, p == fTarget.get()));
};
for (int i = 0; i < fRecordedOps.count(); ++i) {
const GrOp* op = fRecordedOps[i].get(); // only diff from the GrRenderTargetOpList version
@@ -203,7 +204,7 @@
op->visitProxies(gather, GrOp::VisitorType::kAllocatorGather);
}
- // Even though the op may have been moved we still need to increment the op count to
+ // Even though the op may have been (re)moved we still need to increment the op count to
// keep all the math consistent.
alloc->incOps();
}