Merge "EGL: fix eglTerminate blob cache behavior"

This commit is contained in:
Jamie Gennis 2013-07-30 22:37:57 +00:00 committed by Android (Google) Code Review
commit 7925b6bdb8
1 changed files with 3 additions and 6 deletions

View File

@ -126,11 +126,8 @@ void egl_cache_t::initialize(egl_display_t *display) {
void egl_cache_t::terminate() {
Mutex::Autolock lock(mMutex);
if (mBlobCache != NULL) {
saveBlobCacheLocked();
mBlobCache = NULL;
}
mInitialized = false;
saveBlobCacheLocked();
mBlobCache = NULL;
}
void egl_cache_t::setBlob(const void* key, EGLsizeiANDROID keySize,
@ -218,7 +215,7 @@ static uint32_t crc32c(const uint8_t* buf, size_t len) {
}
void egl_cache_t::saveBlobCacheLocked() {
if (mFilename.length() > 0) {
if (mFilename.length() > 0 && mBlobCache != NULL) {
size_t cacheSize = mBlobCache->getFlattenedSize();
size_t headerSize = cacheFileHeaderSize;
const char* fname = mFilename.string();