From a35778c799e8073a42b9e22191bde9d838327ab7 Mon Sep 17 00:00:00 2001 From: John Reck Date: Thu, 6 Nov 2014 09:45:10 -0800 Subject: Yank ResourceCache out of Caches Bug: 17947547 Pull the ResourceCache (aka, ref-counting side channel) out of Caches so that DisplayListRenderer doesn't use Caches, avoiding the risk of instantiating Caches on the wrong thread or without a GL context Change-Id: I7d63b70b3b0a0163308c5dedd6ef255eadebe8fd --- libs/hwui/ResourceCache.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'libs/hwui/ResourceCache.cpp') diff --git a/libs/hwui/ResourceCache.cpp b/libs/hwui/ResourceCache.cpp index 329d92f0be13..12d4928ad78c 100644 --- a/libs/hwui/ResourceCache.cpp +++ b/libs/hwui/ResourceCache.cpp @@ -21,6 +21,12 @@ #include "Caches.h" namespace android { + +#ifdef USE_OPENGL_RENDERER +using namespace uirenderer; +ANDROID_SINGLETON_STATIC_INSTANCE(ResourceCache); +#endif + namespace uirenderer { /////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3-59-g8ed1b