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

Commit f34df7c2 authored by Cody Northrop's avatar Cody Northrop Committed by Android (Google) Code Review
Browse files

Merge "EGL BlobCache: Disable multifile to address Wembley perf"

parents eba23f20 0278db49

opengl/libs/EGL/egl_cache.cpp

+1 −3
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static EGLsizeiANDROID getBlob(const void* key, EGLsizeiANDROID keySize, void* v 
//

egl_cache_t::egl_cache_t()

      : mInitialized(false),

        mMultifileMode(true),

        mMultifileMode(false),

        mCacheByteLimit(maxTotalSize),

        mMultifileCleanupPending(false) {}
@@ -114,8 +114,6 @@ void egl_cache_t::initialize(egl_display_t* display) { 
        }

    }



    mMultifileMode = true;



    // Allow forcing monolithic cache for debug purposes

    if (base::GetProperty("debug.egl.blobcache.multifilemode", "") == "false") {

        ALOGD("Forcing monolithic cache due to debug.egl.blobcache.multifilemode == \"false\"");

opengl/tests/EGLTest/egl_cache_test.cpp

+3 −0
Original line number Diff line number Diff line
@@ -134,6 +134,9 @@ std::string EGLCacheTest::getCachefileName() { 
}



TEST_F(EGLCacheTest, ModifiedCacheMisses) {

    // Turn this back on if multifile becomes the default

    GTEST_SKIP() << "Skipping test designed for multifile, see b/263574392 and b/246966894";



    uint8_t buf[4] = { 0xee, 0xee, 0xee, 0xee };

    mCache->initialize(egl_display_t::get(EGL_DEFAULT_DISPLAY));