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

Commit 0f8a929a authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Change-Id: I3fc824842e600b33c533d3813de32fd62b65fb15
parents 5fda14a2 f56a9d8d

libs/renderengine/gl/GLESRenderEngine.cpp

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

        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");

            ATRACE_NAME("Waiting before draw");

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

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

        }

        }

    }





    if (buffer == nullptr) {

    if (buffer == nullptr) {

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

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