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

Commit e7db724b authored by Jesse Hall's avatar Jesse Hall
Browse files

Fix check for fence merge success 

Change-Id: I9b16526ebfe4ffabf7c4372cca9b192ce046aa21
parent c5c5a14c

libs/gui/SurfaceTexture.cpp

+3 −3
Original line number Diff line number Diff line
@@ -338,14 +338,14 @@ void SurfaceTexture::setReleaseFence(int fenceFd) { 
        sp<Fence> mergedFence = Fence::merge(

                String8("SurfaceTexture merged release"),

                mEGLSlots[mCurrentTexture].mReleaseFence, fence);

        if (mergedFence.get()) {

        if (!mergedFence.get()) {

            ALOGE("failed to merge release fences");

            // synchronization is broken, the best we can do is hope fences

            // signal in order so the new fence will act like a union

            mEGLSlots[mCurrentTexture].mReleaseFence = fence;

        } else {

            mEGLSlots[mCurrentTexture].mReleaseFence = mergedFence;

            return;

        }

        mEGLSlots[mCurrentTexture].mReleaseFence = mergedFence;

    }

}