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

Commit 6f39efbe authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "[RenderEngine] Fix use-after-move error" into rvc-dev am: a81aa942 

Change-Id: I2745414db2fc3c548d03dfba166eef1bd438ca17
parents a469afd1 a81aa942

libs/renderengine/gl/GLESRenderEngine.cpp

+7 −3
Original line number Diff line number Diff line
@@ -957,10 +957,14 @@ status_t GLESRenderEngine::drawLayers(const DisplaySettings& display, 
        return NO_ERROR;

    }



    if (bufferFence.get() >= 0 && !waitFence(std::move(bufferFence))) {

    if (bufferFence.get() >= 0) {

        // Duplicate the fence for passing to waitFence.

        base::unique_fd bufferFenceDup(dup(bufferFence.get()));

        if (bufferFenceDup < 0 || !waitFence(std::move(bufferFenceDup))) {

            ATRACE_NAME("Waiting before draw");

            sync_wait(bufferFence.get(), -1);

        }

    }



    if (buffer == nullptr) {

        ALOGE("No output buffer provided. Aborting GPU composition.");