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

Commit b53c6087 authored by Chris Craik's avatar Chris Craik Committed by android-build-merger
Browse files

Wait on frame work fences when frames are dropped am: 06e2e9cf 

am: 7a14f5ae

Change-Id: I9f2159f2f5c8111df0c14e46cc5690cbfab9b7e9
parents 22eecbe2 7a14f5ae

libs/hwui/renderthread/CanvasContext.cpp

+3 −0
Original line number Original line Diff line number Diff line
@@ -633,6 +633,9 @@ void CanvasContext::prepareAndDraw(RenderNode* node) { 
    prepareTree(info, frameInfo, systemTime(CLOCK_MONOTONIC), node);

    prepareTree(info, frameInfo, systemTime(CLOCK_MONOTONIC), node);

    if (info.out.canDrawThisFrame) {

    if (info.out.canDrawThisFrame) {

        draw();

        draw();

    } else {

        // wait on fences so tasks don't overlap next frame

        waitOnFences();

    }

    }

}

}

libs/hwui/renderthread/CanvasContext.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -168,6 +168,8 @@ public: 




    ANDROID_API int64_t getFrameNumber();

    ANDROID_API int64_t getFrameNumber();





    void waitOnFences();



private:

private:

    friend class RegisterFrameCallbackTask;

    friend class RegisterFrameCallbackTask;

    // TODO: Replace with something better for layer & other GL object

    // TODO: Replace with something better for layer & other GL object
@@ -178,8 +180,6 @@ private: 




    void freePrefetchedLayers(TreeObserver* observer);

    void freePrefetchedLayers(TreeObserver* observer);





    void waitOnFences();



    bool isSwapChainStuffed();

    bool isSwapChainStuffed();





    EGLint mLastFrameWidth = 0;

    EGLint mLastFrameWidth = 0;

libs/hwui/renderthread/DrawFrameTask.cpp

+3 −0
Original line number Original line Diff line number Diff line
@@ -104,6 +104,9 @@ void DrawFrameTask::run() { 




    if (CC_LIKELY(canDrawThisFrame)) {

    if (CC_LIKELY(canDrawThisFrame)) {

        context->draw();

        context->draw();

    } else {

        // wait on fences so tasks don't overlap next frame

        context->waitOnFences();

    }

    }





    if (!canUnblockUiThread) {

    if (!canUnblockUiThread) {