summaryrefslogtreecommitdiffstats
path: root/libs/hwui/renderthread
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2014-11-26 18:59:58 +0000
committerChris Craik <ccraik@google.com>2014-11-26 18:59:58 +0000
commit9f81485a76dd02a07fd460a29db6adddd2ca2efe (patch)
treeb83710c292efceb1675ae0a1adb543ba24b704a7 /libs/hwui/renderthread
parentb945f2313aee6e49a082ba5caaf95334d2570d52 (diff)
downloadframeworks_base-9f81485a76dd02a07fd460a29db6adddd2ca2efe.zip
frameworks_base-9f81485a76dd02a07fd460a29db6adddd2ca2efe.tar.gz
frameworks_base-9f81485a76dd02a07fd460a29db6adddd2ca2efe.tar.bz2
Revert "Force-use the pbuffer surface for destroy"
bug:18528859 This reverts commit b945f2313aee6e49a082ba5caaf95334d2570d52. Change-Id: I6915624d356cb8570471eb3a5b8921f59b58db6d
Diffstat (limited to 'libs/hwui/renderthread')
-rw-r--r--libs/hwui/renderthread/CanvasContext.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index 4f39ac9..39528be 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) {