diff options
author | 2018-05-30 08:38:16 -0400 | |
---|---|---|
committer | 2018-05-30 13:21:48 +0000 | |
commit | 93540dd15715057e00b4f136977f441720317b60 (patch) | |
tree | 849d34a21533c1b4a300c651279e1585228756d4 /src/gpu/ccpr | |
parent | e61ba84299eb4840e82a25a411f2c380ff754a7f (diff) |
Allow CCPR in DDL mode
Bug: skia:7988
Change-Id: If757f29e0156c0ef7045b437b04e17aebe4de851
Reviewed-on: https://skia-review.googlesource.com/130509
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/gpu/ccpr')
-rw-r--r-- | src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp | 10 | ||||
-rw-r--r-- | src/gpu/ccpr/GrCoverageCountingPathRenderer.h | 21 |
2 files changed, 23 insertions, 8 deletions
diff --git a/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp b/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp index d51c0b525a..63e503b4c1 100644 --- a/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp +++ b/src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp @@ -50,7 +50,7 @@ sk_sp<GrCoverageCountingPathRenderer> GrCoverageCountingPathRenderer::CreateIfSu GrCCPerOpListPaths* GrCoverageCountingPathRenderer::lookupPendingPaths(uint32_t opListID) { auto it = fPendingPaths.find(opListID); if (fPendingPaths.end() == it) { - auto paths = skstd::make_unique<GrCCPerOpListPaths>(); + sk_sp<GrCCPerOpListPaths> paths = sk_make_sp<GrCCPerOpListPaths>(); it = fPendingPaths.insert(std::make_pair(opListID, std::move(paths))).first; } return it->second.get(); @@ -227,6 +227,7 @@ void GrCoverageCountingPathRenderer::preFlush(GrOnFlushResourceProvider* onFlush // Commit flushing paths to the resources once they are successfully completed. for (auto& flushingPaths : fFlushingPaths) { + SkASSERT(!flushingPaths->fFlushResources); flushingPaths->fFlushResources = resources; } } @@ -234,6 +235,13 @@ void GrCoverageCountingPathRenderer::preFlush(GrOnFlushResourceProvider* onFlush void GrCoverageCountingPathRenderer::postFlush(GrDeferredUploadToken, const uint32_t* opListIDs, int numOpListIDs) { SkASSERT(fFlushing); + + // In DDL mode these aren't guaranteed to be deleted so we must clear out the perFlush + // resources manually. + for (auto& flushingPaths : fFlushingPaths) { + flushingPaths->fFlushResources = nullptr; + } + // We wait to erase these until after flush, once Ops and FPs are done accessing their data. fFlushingPaths.reset(); SkDEBUGCODE(fFlushing = false); diff --git a/src/gpu/ccpr/GrCoverageCountingPathRenderer.h b/src/gpu/ccpr/GrCoverageCountingPathRenderer.h index d10186601c..66374ea007 100644 --- a/src/gpu/ccpr/GrCoverageCountingPathRenderer.h +++ b/src/gpu/ccpr/GrCoverageCountingPathRenderer.h @@ -21,7 +21,8 @@ class GrCCDrawPathsOp; /** * Tracks all the paths in a given opList that will be drawn when it flushes. */ -struct GrCCPerOpListPaths { +// DDL TODO: given the usage pattern in DDL mode, this could probably be non-atomic refcounting. +struct GrCCPerOpListPaths : SkRefCnt { ~GrCCPerOpListPaths() { // Ensure there are no surviving DrawPathsOps with a dangling pointer into this class. if (!fDrawOps.isEmpty()) { @@ -57,17 +58,23 @@ public: SkASSERT(!fFlushing); } - using PendingPathsMap = std::map<uint32_t, std::unique_ptr<GrCCPerOpListPaths>>; + using PendingPathsMap = std::map<uint32_t, sk_sp<GrCCPerOpListPaths>>; // In DDL mode, Ganesh needs to be able to move the pending GrCCPerOpListPaths to the DDL object // (detachPendingPaths) and then return them upon replay (mergePendingPaths). PendingPathsMap detachPendingPaths() { return std::move(fPendingPaths); } - void mergePendingPaths(PendingPathsMap&& paths) { + void mergePendingPaths(const PendingPathsMap& paths) { +#ifdef SK_DEBUG // Ensure there are no duplicate opList IDs between the incoming path map and ours. - SkDEBUGCODE(for (const auto& it : paths) SkASSERT(!fPendingPaths.count(it.first))); - fPendingPaths.insert(std::make_move_iterator(paths.begin()), - std::make_move_iterator(paths.end())); + // This should always be true since opList IDs are globally unique and these are coming + // from different DDL recordings. + for (const auto& it : paths) { + SkASSERT(!fPendingPaths.count(it.first)); + } +#endif + + fPendingPaths.insert(paths.begin(), paths.end()); } // GrPathRenderer overrides. @@ -101,7 +108,7 @@ private: // fFlushingPaths holds the GrCCPerOpListPaths objects that are currently being flushed. // (It will only contain elements when fFlushing is true.) - SkSTArray<4, std::unique_ptr<GrCCPerOpListPaths>> fFlushingPaths; + SkSTArray<4, sk_sp<GrCCPerOpListPaths>> fFlushingPaths; SkDEBUGCODE(bool fFlushing = false); const bool fDrawCachablePaths; |