diff options
| author | John Reck <jreck@google.com> | 2014-09-03 07:39:53 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2014-09-03 11:13:53 -0700 |
| commit | 17035b0211a3c9d45ea46a99217a6acbe76e8fbe (patch) | |
| tree | 0dc5117cec7ace03afc6dc817d9865752c6116f0 /libs/hwui/Caches.h | |
| parent | 6e31e0f3d1ca8579e75ee1cfe4ac7c30c525f946 (diff) | |
| download | frameworks_base-17035b0211a3c9d45ea46a99217a6acbe76e8fbe.zip frameworks_base-17035b0211a3c9d45ea46a99217a6acbe76e8fbe.tar.gz frameworks_base-17035b0211a3c9d45ea46a99217a6acbe76e8fbe.tar.bz2 | |
Have destroy call freePrefetchedLayers
Bug: 17208461
There's a potential race condition between HardwareRenderer.destroy()
being called (which calls destroyCanvasAndSurface()) and the renderer
being finalized (which is what calls freePrefetchedLayers), during which
time it's possible we get a TRIM_MEMORY_COMPLETE and destroy the EGL
context.
Fix this race condition by moving stopDrawing() and freePrefetchedLayers()
into destroyCanvasAndSurface() where they should have been in the first
place.
Also, if we hit the assertion failure, dump the current state of
Caches to try and provide more context for the failure.
Change-Id: Ife0ba3562041e8b08e87e3e13640472b3004eed6
Diffstat (limited to 'libs/hwui/Caches.h')
| -rw-r--r-- | libs/hwui/Caches.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libs/hwui/Caches.h b/libs/hwui/Caches.h index 0482430..726b74d 100644 --- a/libs/hwui/Caches.h +++ b/libs/hwui/Caches.h @@ -107,6 +107,7 @@ struct CacheLogger { /////////////////////////////////////////////////////////////////////////////// class RenderNode; +class RenderState; class ANDROID_API Caches: public Singleton<Caches> { Caches(); @@ -132,6 +133,8 @@ public: */ bool initProperties(); + void setRenderState(RenderState* renderState) { mRenderState = renderState; } + /** * Flush the cache. * @@ -431,6 +434,8 @@ private: GLuint mBoundTextures[REQUIRED_TEXTURE_UNITS_COUNT]; OverdrawColorSet mOverdrawDebugColorSet; + + RenderState* mRenderState; }; // class Caches }; // namespace uirenderer |