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

Commit 54ccdea3 authored by Jeffrey Kardatzke's avatar Jeffrey Kardatzke Committed by android-build-merger
Browse files

Merge "Fixed incorrect usage of native fences" into pi-dev 

am: 57a532e6

Change-Id: I5b09e2f8027b8067246b82a896106be14eeca053
parents 90f1d82b 57a532e6

libs/gui/GLConsumer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -984,7 +984,8 @@ status_t GLConsumer::doGLFenceWaitLocked() const { 
    }



    if (mCurrentFence->isValid()) {

        if (SyncFeatures::getInstance().useWaitSync()) {

        if (SyncFeatures::getInstance().useWaitSync() &&

            SyncFeatures::getInstance().useNativeFenceSync()) {

            // Create an EGLSyncKHR from the current fence.

            int fenceFd = mCurrentFence->dup();

            if (fenceFd == -1) {