diff options
| author | Chris Craik <ccraik@google.com> | 2014-11-26 21:02:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-26 21:02:24 +0000 |
| commit | e986817a2dc8a412c12e456319965a67ac60f236 (patch) | |
| tree | b2d50e32c557e8f7c38c0c8f09c9886bc82e0114 | |
| parent | 0eaee607b8799bc6635efc8e65df13b6411b5a84 (diff) | |
| parent | 6eac26a49957eda233ad22ad75da43379f220bbc (diff) | |
| download | frameworks_base-e986817a2dc8a412c12e456319965a67ac60f236.zip frameworks_base-e986817a2dc8a412c12e456319965a67ac60f236.tar.gz frameworks_base-e986817a2dc8a412c12e456319965a67ac60f236.tar.bz2 | |
am 6eac26a4: am ca84c8b1: Merge "Revert "Force-use the pbuffer surface for destroy"" into lmp-mr1-dev
* commit '6eac26a49957eda233ad22ad75da43379f220bbc':
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 80d46ae..118e124 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) { |