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

Commit bed68e21 authored by John Reck's avatar John Reck Committed by Automerger Merge Worker
Browse files

Merge "HWUI: reset buffer state after MakeCurrent" am: 188e20b8 am: 8c5ac04d am: 45e4f2bd 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2528107



Change-Id: I4ad3fa069ace7b0d5b79ed892ea3f040bfd74586
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2f2b4072 45e4f2bd

libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp

+33 −0
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ SkiaOpenGLPipeline::~SkiaOpenGLPipeline() { 
}



MakeCurrentResult SkiaOpenGLPipeline::makeCurrent() {

    bool wasSurfaceless = mEglManager.isCurrent(EGL_NO_SURFACE);



    // In case the surface was destroyed (e.g. a previous trimMemory call) we

    // need to recreate it here.

    if (mHardwareBuffer) {
@@ -65,6 +67,37 @@ MakeCurrentResult SkiaOpenGLPipeline::makeCurrent() { 
    if (!mEglManager.makeCurrent(mEglSurface, &error)) {

        return MakeCurrentResult::AlreadyCurrent;

    }



    // Make sure read/draw buffer state of default framebuffer is GL_BACK. Vendor implementations

    // disagree on the draw/read buffer state if the default framebuffer transitions from a surface

    // to EGL_NO_SURFACE and vice-versa. There was a related discussion within Khronos on this topic.

    // See https://cvs.khronos.org/bugzilla/show_bug.cgi?id=13534.

    // The discussion was not resolved with a clear consensus

    if (error == 0 && wasSurfaceless && mEglSurface != EGL_NO_SURFACE) {

        GLint curReadFB = 0;

        GLint curDrawFB = 0;

        glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &curReadFB);

        glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &curDrawFB);



        GLint buffer = GL_NONE;

        glBindFramebuffer(GL_FRAMEBUFFER, 0);

        glGetIntegerv(GL_DRAW_BUFFER0, &buffer);

        if (buffer == GL_NONE) {

            const GLenum drawBuffer = GL_BACK;

            glDrawBuffers(1, &drawBuffer);

        }



        glGetIntegerv(GL_READ_BUFFER, &buffer);

        if (buffer == GL_NONE) {

            glReadBuffer(GL_BACK);

        }



        glBindFramebuffer(GL_READ_FRAMEBUFFER, curReadFB);

        glBindFramebuffer(GL_DRAW_FRAMEBUFFER, curDrawFB);



        GL_CHECKPOINT(LOW);

    }



    return error ? MakeCurrentResult::Failed : MakeCurrentResult::Succeeded;

}