diff options
| author | 2021-08-11 18:39:52 +0000 | |
|---|---|---|
| committer | 2021-08-11 18:39:52 +0000 | |
| commit | d6a8b2665cf24b6d35f89a443ddd62872fef3621 (patch) | |
| tree | 5c0d6920c6706c25941270293b33203b2f14e3e3 /libs/gui/LayerState.cpp | |
| parent | bf53ccb864e90abe3c2d12590ef3dbeee9ff6a33 (diff) | |
| parent | 90aa1640ec4afb10a7e18c93f475466fc9efdba5 (diff) | |
Merge releaseBufferEndpoint in LayerState am: 9c3cb1a965 am: 90aa1640ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15532615
Change-Id: I3dbfae2d17f3553dfa44ff18a0708b021f9e6e5b
Diffstat (limited to 'libs/gui/LayerState.cpp')
| -rw-r--r-- | libs/gui/LayerState.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp index 2922ce9542..87aa34dd65 100644 --- a/libs/gui/LayerState.cpp +++ b/libs/gui/LayerState.cpp @@ -463,6 +463,7 @@ void layer_state_t::merge(const layer_state_t& other) { if (other.what & eBufferChanged) { what |= eBufferChanged; buffer = other.buffer; + releaseBufferEndpoint = other.releaseBufferEndpoint; } if (other.what & eAcquireFenceChanged) { what |= eAcquireFenceChanged; |