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

Commit d6a8b266 authored by chaviw's avatar chaviw Committed by Automerger Merge Worker
Browse files

Merge releaseBufferEndpoint in LayerState am: 9c3cb1a9 am: 90aa1640 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15532615

Change-Id: I3dbfae2d17f3553dfa44ff18a0708b021f9e6e5b
parents bf53ccb8 90aa1640

libs/gui/LayerState.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -463,6 +463,7 @@ void layer_state_t::merge(const layer_state_t& other) { 
    if (other.what & eBufferChanged) {

    if (other.what & eBufferChanged) {

        what |= eBufferChanged;

        what |= eBufferChanged;

        buffer = other.buffer;

        buffer = other.buffer;

        releaseBufferEndpoint = other.releaseBufferEndpoint;

    }

    }

    if (other.what & eAcquireFenceChanged) {

    if (other.what & eAcquireFenceChanged) {

        what |= eAcquireFenceChanged;

        what |= eAcquireFenceChanged;