drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Switch to pbuffer surface sooner" into nyc-dev

Browse Source
This commit is contained in:
John Reck
2016-02-26 23:53:46 +00:00
committed by Android (Google) Code Review
parent a24b5d4811 fc736869ac
commit db0fd9dfb2
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/ViewRootImpl.java
View File

@ -1078,8 +1078,10 @@ public final class ViewRootImpl implements ViewParent,
scheduleTraversals();
} else {
if (mAttachInfo.mHardwareRenderer != null) {
mAttachInfo.mHardwareRenderer.destroyHardwareResources(mView);
// TODO: Temporary to help track down b/27286867
Log.d(mTag, "WindowStopped on " + getTitle());
mAttachInfo.mHardwareRenderer.updateSurface(null);
mAttachInfo.mHardwareRenderer.destroyHardwareResources(mView);
}
}
}

6
libs/hwui/renderthread/EglManager.cpp
View File

@ -270,6 +270,12 @@ bool EglManager::makeCurrent(EGLSurface surface, EGLint* errOut) {
// Ensure we always have a valid surface & context
surface = mPBufferSurface;
}
// TODO: Temporary to help diagnose b/27286867
if (mCurrentSurface == mPBufferSurface || surface == mPBufferSurface) {
ALOGD("Switching from surface %p%s to %p%s", mCurrentSurface,
mCurrentSurface == mPBufferSurface ? " (pbuffer)" : "",
surface, surface == mPBufferSurface ? " (pbuffer)" : "");
}
if (!eglMakeCurrent(mEglDisplay, surface, surface, mEglContext)) {
if (errOut) {
*errOut = eglGetError();