AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Have CCPR atlas generator run for all paths, ignore opsTaskIDs

Browse Source 
This simplifies our world a lot, especially when reordering/merging
ops tasks. As noted in the comments, this assumes a full flush every
time but the successor – which is coming soon – won't rely on that.

Bug: skia:10877, skia:11948
Change-Id: I1843e80dfee8d7a868c6db4bae94bcd2cbfb5b78
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/403856
Commit-Queue: Adlai Holler <adlai@google.com>
Reviewed-by: Chris Dalton <csmartdalton@google.com>
This commit is contained in:
Adlai Holler 2021-05-04 09:58:07 -04:00 committed by Skia Commit-Bot
parent dbed577501
commit 516c1ce3d4
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/gpu/ccpr/GrCoverageCountingPathRenderer.cpp
View File

@ -143,7 +143,7 @@ static void assign_atlas_textures(GrTexture* atlasTexture, ClipMapsIter nextPath
}
void GrCoverageCountingPathRenderer::preFlush(
GrOnFlushResourceProvider* onFlushRP, SkSpan<const uint32_t> taskIDs) {
GrOnFlushResourceProvider* onFlushRP, SkSpan<const uint32_t> /*taskIDs*/) {
SkASSERT(!fFlushing);
SkDEBUGCODE(fFlushing = true);
@ -156,23 +156,22 @@ void GrCoverageCountingPathRenderer::preFlush(
specs.fMaxPreferredTextureSize = maxPreferredRTSize;
specs.fMinTextureSize = std::min(512, maxPreferredRTSize);
// Move the per-opsTask paths that are about to be flushed from fPendingPaths to flushingPaths,
// Move the path lists from fPendingPaths to flushingPaths,
// and count them up so we can preallocate buffers.
// NOTE: This assumes a full flush, as opposed to partial flush. This CCPR atlasing technique
// is on its way out, though. skbug.com/11948
// Also, this temporary array could go away but the ClipMapsIter code would get a whole lot
// messier. Leave it be.
SkSTArray<8, sk_sp<GrCCPerOpsTaskPaths>> flushingPaths;
flushingPaths.reserve_back(taskIDs.count());
for (uint32_t taskID : taskIDs) {
auto iter = fPendingPaths.find(taskID);
if (fPendingPaths.end() == iter) {
continue; // No paths on this opsTask.
}
flushingPaths.push_back(std::move(iter->second));
fPendingPaths.erase(iter);
flushingPaths.reserve_back(fPendingPaths.size());
for (auto& [taskID, paths] : fPendingPaths) {
flushingPaths.push_back(std::move(paths));
for (const auto& clipsIter : flushingPaths.back()->fClipPaths) {
clipsIter.second->accountForOwnPath(&specs);
}
}
fPendingPaths.clear();
GrCCPerFlushResources perFlushResources(onFlushRP, specs);