From 91b346a484de18fa4bb3809629fb23060fe74625 Mon Sep 17 00:00:00 2001 From: Arthur Hung Date: Mon, 14 Mar 2022 21:36:22 +0800 Subject: Merge ColorSpaceAgnosticChanged property in a transactioin Make sure ColorSpaceAgnosticChanged could be merged. Test: manual Fixes: 224493490 Change-Id: Ie47968698c3500ab3c1ad7a37a84b5dbe82eac95 --- libs/gui/LayerState.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libs/gui/LayerState.cpp') diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp index 338ff1114f..49b669eb3f 100644 --- a/libs/gui/LayerState.cpp +++ b/libs/gui/LayerState.cpp @@ -594,6 +594,10 @@ void layer_state_t::merge(const layer_state_t& other) { what |= eColorChanged; color = other.color; } + if (other.what & eColorSpaceAgnosticChanged) { + what |= eColorSpaceAgnosticChanged; + colorSpaceAgnostic = other.colorSpaceAgnostic; + } if ((other.what & what) != other.what) { ALOGE("Unmerged SurfaceComposer Transaction properties. LayerState::merge needs updating? " "other.what=0x%" PRIX64 " what=0x%" PRIX64 " unmerged flags=0x%" PRIX64, -- cgit v1.2.3-59-g8ed1b