Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33b3bd1b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Change CacheManager to not flush and submit at end of trimMemory."

parents 563bbb70 846644a4

libs/hwui/renderthread/CacheManager.cpp

+2 −6
Original line number Original line Diff line number Diff line
@@ -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() {