From: Stan Iliev <stani@google.com>
Date: Tue, 14 Nov 2017 18:42:42 +0000 (-0500)
Subject: Disable skia shader cache
X-Git-Tag: android-x86-9.0-r1~325^2~23^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=01b439475ccd965c37f4ae194c0dc284628c7635;p=android-x86%2Fframeworks-base.git

Disable skia shader cache

Disable skia shader cache, which is causing image rendering
issues.

Test: Ran CNN app and images are OK.
Bug: 69264347
Change-Id: Ie81f3398074f28ac1670333f1fd3c95267b2beb3
---

diff --git a/libs/hwui/renderthread/CacheManager.cpp b/libs/hwui/renderthread/CacheManager.cpp
index c22364b4a569..a33b2874e7a5 100644
--- a/libs/hwui/renderthread/CacheManager.cpp
+++ b/libs/hwui/renderthread/CacheManager.cpp
@@ -18,7 +18,6 @@
 
 #include "Layer.h"
 #include "RenderThread.h"
-#include "pipeline/skia/ShaderCache.h"
 #include "renderstate/RenderState.h"
 
 #include <GrContextOptions.h>
@@ -128,8 +127,6 @@ void CacheManager::configureContext(GrContextOptions* contextOptions) {
         }
         contextOptions->fExecutor = mTaskProcessor.get();
     }
-
-    contextOptions->fPersistentCache = &skiapipeline::ShaderCache::get();
 }
 
 void CacheManager::trimMemory(TrimMemoryMode mode) {
diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp
index 3e2eeee2bcf5..05a9b75b4504 100644
--- a/libs/hwui/renderthread/RenderThread.cpp
+++ b/libs/hwui/renderthread/RenderThread.cpp
@@ -16,7 +16,6 @@
 
 #include "RenderThread.h"
 
-#include "pipeline/skia/ShaderCache.h"
 #include "CanvasContext.h"
 #include "EglManager.h"
 #include "OpenGLReadback.h"
@@ -106,7 +105,6 @@ void RenderThread::initThreadLocals() {
     mRenderState = new RenderState(*this);
     mVkManager = new VulkanManager(*this);
     mCacheManager = new CacheManager(mDisplayInfo);
-    uirenderer::skiapipeline::ShaderCache::get().initShaderDiskCache();
 }
 
 void RenderThread::dumpGraphicsMemory(int fd) {