From 9c3cb1a965e5a94dae8c311421f9cac7a43693aa Mon Sep 17 00:00:00 2001
From: chaviw <chaviw@google.com>
Date: Wed, 11 Aug 2021 11:33:34 -0500
Subject: Merge releaseBufferEndpoint in LayerState

If T1 has a buffer update and gets merged into T2, where T2 modified the
same SC, we need to ensure releaseBufferEndpoint is also merged.

Test: split, pip
Fixes: 196198502
Change-Id: I836d32f4c439235a91a4c933a1b477813f6726a2
---
 libs/gui/LayerState.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'libs/gui/LayerState.cpp')

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;
-- 
cgit v1.2.3-59-g8ed1b