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

Commit cb0649f7 authored by John Reck's avatar John Reck Committed by android-build-merger
Browse files

Merge \"Avoid re-calculating vsync mid-frame\" into nyc-dev 

am: fc275d24

Change-Id: Ic46d2d9627c4dcbd345b49f01af0bf3b8247259c
parents ee4c0a3c fc275d24

libs/hwui/AnimationContext.cpp

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ void AnimationContext::startFrame(TreeInfo::TraversalMode mode) { 
        mCurrentFrameAnimations.mNextHandle = head;

        head->mPreviousHandle = &mCurrentFrameAnimations;

    }

    mFrameTimeMs = mClock.computeFrameTimeMs();

    mFrameTimeMs = ns2ms(mClock.latestVsync());

}



void AnimationContext::runRemainingAnimations(TreeInfo& info) {

libs/hwui/renderthread/TimeLord.cpp

+0 −4
Original line number Diff line number Diff line
@@ -43,10 +43,6 @@ nsecs_t TimeLord::computeFrameTimeNanos() { 
    return mFrameTimeNanos;

}



nsecs_t TimeLord::computeFrameTimeMs() {

    return nanoseconds_to_milliseconds(computeFrameTimeNanos());

}



} /* namespace renderthread */

} /* namespace uirenderer */

} /* namespace android */

libs/hwui/renderthread/TimeLord.h

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ public: 
    // returns true if the vsync is newer, false if it was rejected for staleness

    bool vsyncReceived(nsecs_t vsync);

    nsecs_t latestVsync() { return mFrameTimeNanos; }

    nsecs_t computeFrameTimeMs();

    nsecs_t computeFrameTimeNanos();



private: