Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change CacheManager to not flush and submit at end of trimMemory." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-02-09 14:28:42 +00:00
committed by Android (Google) Code Review
parent 02151de444 41ef566268
commit 1afc2cdb46
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/hwui/renderthread/CacheManager.cpp
View File

@@ -101,7 +101,8 @@ void CacheManager::trimMemory(TrimMemoryMode mode) {
return; return;
} }
mGrContext->flushAndSubmit(); // flush and submit all work to the gpu and wait for it to finish
mGrContext->flushAndSubmit(/*syncCpu=*/true);
switch (mode) { switch (mode) {
case TrimMemoryMode::Complete: case TrimMemoryMode::Complete:
@@ -119,11 +120,6 @@ void CacheManager::trimMemory(TrimMemoryMode mode) {
SkGraphics::SetFontCacheLimit(mMaxCpuFontCacheBytes); SkGraphics::SetFontCacheLimit(mMaxCpuFontCacheBytes);
break; break;
} }
// We must sync the cpu to make sure deletions of resources still queued up on the GPU actually
// happen.
mGrContext->flush({});
mGrContext->submit(true);
} }
void CacheManager::trimStaleResources() { void CacheManager::trimStaleResources() {