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
2014-11-26 12:02:19 +00:00
parent 2f47df8334 4e3404d90f
commit 0d4ab958c1
1 changed files with 2 additions and 1 deletions
--- 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) {