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

Commit bc925d8d authored by Rico Wind's avatar Rico Wind Committed by Android (Google) Code Review
Browse files

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

parents 683a2ef4 82a9353d
Loading
Loading
Loading
Loading
+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) {
+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.
+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",
+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;
}
}
+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;
Loading