Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db0fd9df authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

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

parents a24b5d48 fc736869

core/java/android/view/ViewRootImpl.java

+3 −1
Original line number Diff line number Diff line
@@ -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);

                }

            }

        }

libs/hwui/renderthread/EglManager.cpp

+6 −0
Original line number Diff line number Diff line
@@ -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();