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

Commit e8fed71d authored by Jesse Hall's avatar Jesse Hall Committed by Gerrit Code Review
Browse files

Merge "Abort surface composition if hw surface is invalid"

parents f0dcff89 c8c71096

services/surfaceflinger/SurfaceFlinger.cpp

+5 −1
Original line number Diff line number Diff line
@@ -1520,7 +1520,11 @@ void SurfaceFlinger::doComposeSurfaces(const sp<const DisplayDevice>& hw, const 


    const bool hasGlesComposition = hwc.hasGlesComposition(id) || (cur==end);

    if (hasGlesComposition) {

        DisplayDevice::makeCurrent(mEGLDisplay, hw, mEGLContext);

        if (!DisplayDevice::makeCurrent(mEGLDisplay, hw, mEGLContext)) {

            ALOGW("DisplayDevice::makeCurrent failed. Aborting surface composition for display %s",

                  hw->getDisplayName().string());

            return;

        }



        // set the frame buffer

        glMatrixMode(GL_MODELVIEW);