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

Commit fb680657 authored by Chris Craik's avatar Chris Craik Committed by Android (Google) Code Review
Browse files

Merge "Add deferredList null check"

parents dd8697c0 ba868c3e

libs/hwui/DisplayList.cpp

+5 −3
Original line number Diff line number Diff line
@@ -381,8 +381,10 @@ status_t DisplayList::setViewProperties(OpenGLRenderer& renderer, Rect& dirty, 
        }

    }

    if (mAlpha < 1 && !mCaching) {

        if (deferredList) {

            // flush since we'll either enter a Layer, or set alpha, both not supported in deferral

            status |= deferredList->flush(renderer, dirty, flags, level);

        }



        if (!mHasOverlappingRendering) {

            renderer.setAlpha(mAlpha);
@@ -399,7 +401,7 @@ status_t DisplayList::setViewProperties(OpenGLRenderer& renderer, Rect& dirty, 
        }

    }

    if (mClipChildren && !mCaching) {

        if (CC_UNLIKELY(!renderer.hasRectToRectTransform())) {

        if (deferredList && CC_UNLIKELY(!renderer.hasRectToRectTransform())) {

            // flush, since clip will likely be a region

            status |= deferredList->flush(renderer, dirty, flags, level);

        }