diff options
| author | 2022-03-14 21:36:22 +0800 | |
|---|---|---|
| committer | 2022-03-15 01:29:04 +0000 | |
| commit | 91b346a484de18fa4bb3809629fb23060fe74625 (patch) | |
| tree | 53d030cbe200303d42fa18a30eff1ba3fddeeff1 /libs/gui/LayerState.cpp | |
| parent | e1c6809d35754caad6a8657666a163f5c21242eb (diff) | |
Merge ColorSpaceAgnosticChanged property in a transactioin
Make sure ColorSpaceAgnosticChanged could be merged.
Test: manual
Fixes: 224493490
Change-Id: Ie47968698c3500ab3c1ad7a37a84b5dbe82eac95
Diffstat (limited to 'libs/gui/LayerState.cpp')
| -rw-r--r-- | libs/gui/LayerState.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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, |