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

Switch to using GrContext::setResourceCacheLimit and getResourceCacheLimit

Browse Source 
The old version that took a maxResourceCount are now deprecated

Test: does it compile
Change-Id: Ib4d69c8907169329c7765c648f46fa5e4a10bf7a
This commit is contained in:
Robert Phillips
2019-09-06 13:18:17 -04:00
parent d5c504d587
commit 57bb0bfb44
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/hwui/pipeline/skia/SkiaPipeline.cpp
View File

@@ -511,13 +511,13 @@ void SkiaPipeline::renderFrameImpl(const LayerUpdateQueue& layers, const SkRect&
}
void SkiaPipeline::dumpResourceCacheUsage() const {
int resources, maxResources;
size_t bytes, maxBytes;
int resources;
size_t bytes;
mRenderThread.getGrContext()->getResourceCacheUsage(&resources, &bytes);
mRenderThread.getGrContext()->getResourceCacheLimits(&maxResources, &maxBytes);
size_t maxBytes = mRenderThread.getGrContext()->getResourceCacheLimit();
SkString log("Resource Cache Usage:\n");
log.appendf("%8d items out of %d maximum items\n", resources, maxResources);
log.appendf("%8d items\n", resources);
log.appendf("%8zu bytes (%.2f MB) out of %.2f MB maximum\n", bytes,
bytes * (1.0f / (1024.0f * 1024.0f)), maxBytes * (1.0f / (1024.0f * 1024.0f)));

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

@@ -69,8 +69,7 @@ void CacheManager::reset(sk_sp<GrContext> context) {
if (context) {
mGrContext = std::move(context);
mGrContext->getResourceCacheLimits(&mMaxResources, nullptr);
mGrContext->setResourceCacheLimits(mMaxResources, mMaxResourceBytes);
mGrContext->setResourceCacheLimit(mMaxResourceBytes);
}
}
@@ -119,8 +118,8 @@ void CacheManager::trimMemory(TrimMemoryMode mode) {
// limits between the background and max amounts. This causes the unlocked resources
// that have persistent data to be purged in LRU order.
mGrContext->purgeUnlockedResources(true);
mGrContext->setResourceCacheLimits(mMaxResources, mBackgroundResourceBytes);
mGrContext->setResourceCacheLimits(mMaxResources, mMaxResourceBytes);
mGrContext->setResourceCacheLimit(mBackgroundResourceBytes);
mGrContext->setResourceCacheLimit(mMaxResourceBytes);
SkGraphics::SetFontCacheLimit(mBackgroundCpuFontCacheBytes);
SkGraphics::SetFontCacheLimit(mMaxCpuFontCacheBytes);
break;

1
libs/hwui/renderthread/CacheManager.h
View File

@@ -71,7 +71,6 @@ private:
sk_sp<GrContext> mGrContext;
#endif
int mMaxResources = 0;
const size_t mMaxResourceBytes;
const size_t mBackgroundResourceBytes;