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

Commit 82a9353d authored by Hung-Wei Chen's avatar Hung-Wei Chen Committed by Android (Google) Code Review
Browse files

Revert "EGL BlobCache: Support multifile cache and flexible size..." 

Revert submission 20505145-blobcache_multfile_20221221d_upload

Reason for revert: DroidMonitor-triggered revert due to breakage , bug b/263445637.

BUG: 263445637

Reverted changes: /q/submissionid:20505145-blobcache_multfile_20221221d_upload

Change-Id: I3933393bbe257341327c1662972b297cf6c99cd3
parent c4524997

libs/graphicsenv/GraphicsEnv.cpp

+0 −8
Original line number Diff line number Diff line
@@ -569,14 +569,6 @@ void GraphicsEnv::setDebugLayersGLES(const std::string layers) { 
    mDebugLayersGLES = layers;

}



int64_t GraphicsEnv::getBlobCacheQuotaBytes() {

    return mBlobCacheQuotaBytes;

}



void GraphicsEnv::setBlobCacheQuotaBytes(int64_t cacheBytes) {

    mBlobCacheQuotaBytes = cacheBytes;

}



// Return true if all the required libraries from vndk and sphal namespace are

// linked to the updatable gfx driver namespace correctly.

bool GraphicsEnv::linkDriverNamespaceLocked(android_namespace_t* vndkNamespace) {

libs/graphicsenv/include/graphicsenv/GraphicsEnv.h

+0 −5
Original line number Diff line number Diff line
@@ -143,9 +143,6 @@ public: 
    // Get the debug layers to load.

    const std::string& getDebugLayersGLES();



    int64_t getBlobCacheQuotaBytes();

    void setBlobCacheQuotaBytes(int64_t cacheBytes);



private:

    enum UseAngle { UNKNOWN, YES, NO };
@@ -191,8 +188,6 @@ private: 
    std::string mDebugLayersGLES;

    // Additional debug layers search path.

    std::string mLayerPaths;

    // Blob cache quota bytes

    int64_t mBlobCacheQuotaBytes;

    // This mutex protects the namespace creation.

    std::mutex mNamespaceMutex;

    // Updatable driver namespace.

opengl/libs/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ cc_library_shared { 
    srcs: [

        "EGL/egl_tls.cpp",

        "EGL/egl_cache.cpp",

        "EGL/egl_cache_multifile.cpp",

        "EGL/egl_display.cpp",

        "EGL/egl_object.cpp",

        "EGL/egl_layers.cpp",

opengl/libs/EGL/FileBlobCache.cpp

+0 −6
Original line number Diff line number Diff line
@@ -185,10 +185,4 @@ void FileBlobCache::writeToFile() { 
    }

}



size_t FileBlobCache::getSize() {

    if (mFilename.length() > 0) {

        return getFlattenedSize() + cacheFileHeaderSize;

    }

    return 0;

}

}

opengl/libs/EGL/FileBlobCache.h

+0 −3
Original line number Diff line number Diff line
@@ -33,9 +33,6 @@ public: 
    // disk.

    void writeToFile();



    // Return the total size of the cache

    size_t getSize();



private:

    // mFilename is the name of the file for storing cache contents.

    std::string mFilename;