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

Commit f86ad8f6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix wrong surfaceRequiresRedraw check"

parents 6a4076da 4145919e

libs/hwui/TreeInfo.cpp

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ TreeInfo::TreeInfo(TraversalMode mode, renderthread::CanvasContext& canvasContex 
        : mode(mode)

        , prepareTextures(mode == MODE_FULL)

        , canvasContext(canvasContext)

        , damageGenerationId(canvasContext.getFrameNumber())

        , disableForceDark(canvasContext.useForceDark() ? 0 : 1)

        , screenSize(canvasContext.getNextFrameSize()) {}

libs/hwui/renderthread/CanvasContext.cpp

+2 −1
Original line number Diff line number Diff line
@@ -303,6 +303,7 @@ void CanvasContext::prepareTree(TreeInfo& info, int64_t* uiFrameInfo, int64_t sy 


    info.damageAccumulator = &mDamageAccumulator;

    info.layerUpdateQueue = &mLayerUpdateQueue;

    info.damageGenerationId = mDamageId++;

    info.out.canDrawThisFrame = true;



    mAnimationContext->startFrame(info.mode);
@@ -702,7 +703,7 @@ bool CanvasContext::surfaceRequiresRedraw() { 
    surface->query(NATIVE_WINDOW_WIDTH, &width);

    surface->query(NATIVE_WINDOW_HEIGHT, &height);



    return width == mLastFrameWidth && height == mLastFrameHeight;

    return width != mLastFrameWidth || height != mLastFrameHeight;

}



void CanvasContext::setRenderAheadDepth(int renderAhead) {

libs/hwui/renderthread/CanvasContext.h

+1 −0
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ private: 
    // Need at least 4 because we do quad buffer. Add a 5th for good measure.

    RingBuffer<SwapHistory, 5> mSwapHistory;

    int64_t mFrameNumber = -1;

    int64_t mDamageId = 0;



    // last vsync for a dropped frame due to stuffed queue

    nsecs_t mLastDropVsync = 0;