summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author chaviw <chaviw@google.com> 2021-08-11 18:28:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-08-11 18:28:58 +0000
commit90aa1640ec4afb10a7e18c93f475466fc9efdba5 (patch)
treefa0dd17754ada370f2b3d8db17286461f1b7b291
parentfefc094295edf9b339052454a0fb0f197a4ee3ea (diff)
parent9c3cb1a965e5a94dae8c311421f9cac7a43693aa (diff)
Merge releaseBufferEndpoint in LayerState am: 9c3cb1a965
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15532615 Change-Id: I9c047f1b9252b268bf29348543338d9ffa7b2bb8
-rw-r--r--libs/gui/LayerState.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp
index 5bed69cfc7..8a7a8711bf 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;