Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ca84c8b1: Merge "Revert "Force-use the pbuffer surface for destroy"" into lmp-mr1-dev

Browse Source 
* commit 'ca84c8b1b0e364e01ce392f0dbca5132830a148d':
  Revert "Force-use the pbuffer surface for destroy"
This commit is contained in:
Chris Craik
2014-11-26 20:57:35 +00:00
committed by Android Git Automerger
parent 9bde6e419e ca84c8b1b0
commit 6eac26a499
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/hwui/renderthread/CanvasContext.cpp
View File

@@ -60,8 +60,6 @@ CanvasContext::~CanvasContext() {
void CanvasContext::destroy() { void CanvasContext::destroy() {
stopDrawing(); stopDrawing();
setSurface(NULL);
mEglManager.usePBufferSurface();
freePrefetechedLayers(); freePrefetechedLayers();
destroyHardwareResources(); destroyHardwareResources();
mAnimationContext->destroy(); mAnimationContext->destroy();
@@ -69,6 +67,7 @@ void CanvasContext::destroy() {
delete mCanvas; delete mCanvas;
mCanvas = 0; mCanvas = 0;
} }
setSurface(NULL);
} }
void CanvasContext::setSurface(ANativeWindow* window) { void CanvasContext::setSurface(ANativeWindow* window) {