diff options
| author | John Reck <jreck@google.com> | 2014-11-25 19:52:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-25 19:52:53 +0000 |
| commit | dec3f138c2f6a31879b0fe055a26d618e4874bb5 (patch) | |
| tree | 56f1c4b6985c0c2e874242c4b564dc06548febf9 | |
| parent | c1de25d8ebaecff697c1d5dfaa445e18ee07fa2d (diff) | |
| parent | b945f2313aee6e49a082ba5caaf95334d2570d52 (diff) | |
| download | frameworks_base-dec3f138c2f6a31879b0fe055a26d618e4874bb5.zip frameworks_base-dec3f138c2f6a31879b0fe055a26d618e4874bb5.tar.gz frameworks_base-dec3f138c2f6a31879b0fe055a26d618e4874bb5.tar.bz2 | |
Merge "Force-use the pbuffer surface for destroy" into lmp-mr1-dev
| -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 39528be..4f39ac9 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) { |