diff options
| author | John Reck <jreck@google.com> | 2014-11-06 09:45:10 -0800 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2014-11-06 09:45:10 -0800 |
| commit | a35778c799e8073a42b9e22191bde9d838327ab7 (patch) | |
| tree | f4d74fc026f8dcf6d8ea8e5a18be30a14b990b70 /libs/hwui/ResourceCache.cpp | |
| parent | b9744c1c1f5e8cc936da7f1832665f77ad5bb18f (diff) | |
| download | frameworks_base-a35778c799e8073a42b9e22191bde9d838327ab7.zip frameworks_base-a35778c799e8073a42b9e22191bde9d838327ab7.tar.gz frameworks_base-a35778c799e8073a42b9e22191bde9d838327ab7.tar.bz2 | |
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
Diffstat (limited to 'libs/hwui/ResourceCache.cpp')
| -rw-r--r-- | libs/hwui/ResourceCache.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libs/hwui/ResourceCache.cpp b/libs/hwui/ResourceCache.cpp index 329d92f..12d4928 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 { /////////////////////////////////////////////////////////////////////////////// |