commit e44d5e5c0d6ac9b029a4cdeec2ddcda3768fb5e4
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Dec 01 14:39:35 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 01 14:39:35 2017 +0000
tree f33f6a5bd2692b3308f7f8520ca3b1a7a79842ff
parent 514a7403b39b7ba22094747e10e22ef4f8ef1f26
parent e75ef1fb3f553c0c1ae7a9372c058cb8860538ce

Merge "Enable Skia shader cache"

libs/hwui/renderthread/CacheManager.cpp

diff --git a/libs/hwui/renderthread/CacheManager.cpp b/libs/hwui/renderthread/CacheManager.cpp
index a33b287..5e89fae 100644
--- a/libs/hwui/renderthread/CacheManager.cpp
+++ b/libs/hwui/renderthread/CacheManager.cpp
@@ -17,7 +17,9 @@
 #include "CacheManager.h"
 
 #include "Layer.h"
+#include "Properties.h"
 #include "RenderThread.h"
+#include "pipeline/skia/ShaderCache.h"
 #include "renderstate/RenderState.h"
 
 #include <GrContextOptions.h>
@@ -46,6 +48,9 @@
     mVectorDrawableAtlas = new skiapipeline::VectorDrawableAtlas(
             mMaxSurfaceArea / 2,
             skiapipeline::VectorDrawableAtlas::StorageMode::disallowSharedSurface);
+    if (Properties::isSkiaEnabled()) {
+        skiapipeline::ShaderCache::get().initShaderDiskCache();
+    }
 }
 
 void CacheManager::reset(GrContext* context) {
@@ -127,6 +132,8 @@
         }
         contextOptions->fExecutor = mTaskProcessor.get();
     }
+
+    contextOptions->fPersistentCache = &skiapipeline::ShaderCache::get();
 }
 
 void CacheManager::trimMemory(TrimMemoryMode mode) {