diff options
| author | John Reck <jreck@google.com> | 2014-11-26 12:02:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-26 12:02:19 +0000 |
| commit | 0d4ab958c11801f5453e999f930416c87c63d100 (patch) | |
| tree | 02b23e48142325e228d32e81783cdb7a84c7ca99 /libs/hwui/renderthread/CanvasContext.cpp | |
| parent | 2f47df83343e51214c792dc89874f0bccbeb4593 (diff) | |
| parent | 4e3404d90fe33a0ff790aff4a97b6bb55e4c0e8f (diff) | |
| download | frameworks_base-0d4ab958c11801f5453e999f930416c87c63d100.zip frameworks_base-0d4ab958c11801f5453e999f930416c87c63d100.tar.gz frameworks_base-0d4ab958c11801f5453e999f930416c87c63d100.tar.bz2 | |
am 4e3404d9: am dec3f138: Merge "Force-use the pbuffer surface for destroy" into lmp-mr1-dev
* commit '4e3404d90fe33a0ff790aff4a97b6bb55e4c0e8f':
Force-use the pbuffer surface for destroy
Diffstat (limited to 'libs/hwui/renderthread/CanvasContext.cpp')
| -rw-r--r-- | libs/hwui/renderthread/CanvasContext.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp index 118e124..80d46ae 100644 --- a/libs/hwui/renderthread/CanvasContext.cpp +++ b/libs/hwui/renderthread/CanvasContext.cpp @@ -60,6 +60,8 @@ CanvasContext::~CanvasContext() { void CanvasContext::destroy() { stopDrawing(); + setSurface(NULL); + mEglManager.usePBufferSurface(); freePrefetechedLayers(); destroyHardwareResources(); mAnimationContext->destroy(); @@ -67,7 +69,6 @@ void CanvasContext::destroy() { delete mCanvas; mCanvas = 0; } - setSurface(NULL); } void CanvasContext::setSurface(ANativeWindow* window) { |