diff options
| author | Chris Craik <ccraik@google.com> | 2014-11-26 21:08:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-26 21:08:00 +0000 |
| commit | 62bdf2c86342db66d86ceff3a8c0b609e4570bfc (patch) | |
| tree | 7a1de1fc46fad8849e465038311cf02bb4e6e1e9 | |
| parent | ddf7e2dfc26ea5341c62cb5391a1cfb12cd8c129 (diff) | |
| parent | e986817a2dc8a412c12e456319965a67ac60f236 (diff) | |
| download | frameworks_base-62bdf2c86342db66d86ceff3a8c0b609e4570bfc.zip frameworks_base-62bdf2c86342db66d86ceff3a8c0b609e4570bfc.tar.gz frameworks_base-62bdf2c86342db66d86ceff3a8c0b609e4570bfc.tar.bz2 | |
am e986817a: am 6eac26a4: am ca84c8b1: Merge "Revert "Force-use the pbuffer surface for destroy"" into lmp-mr1-dev
* commit 'e986817a2dc8a412c12e456319965a67ac60f236':
Revert "Force-use the pbuffer surface for destroy"
| -rw-r--r-- | libs/hwui/renderthread/CanvasContext.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp index 25b13c1..ee629c0 100644 --- a/libs/hwui/renderthread/CanvasContext.cpp +++ b/libs/hwui/renderthread/CanvasContext.cpp @@ -60,8 +60,6 @@ CanvasContext::~CanvasContext() { void CanvasContext::destroy() { stopDrawing(); - setSurface(NULL); - mEglManager.usePBufferSurface(); freePrefetechedLayers(); destroyHardwareResources(); mAnimationContext->destroy(); @@ -69,6 +67,7 @@ void CanvasContext::destroy() { delete mCanvas; mCanvas = 0; } + setSurface(NULL); } void CanvasContext::setSurface(ANativeWindow* window) { |