summaryrefslogtreecommitdiff
path: root/libs/gui/LayerState.cpp
diff options
context:
space:
mode:
author John Reck <jreck@google.com> 2021-02-16 11:37:33 -0500
committer John Reck <jreck@google.com> 2021-02-18 14:42:23 -0500
commitc00c669cbc76f201879ebf2e0ce60d386a0fa483 (patch)
treecf0ba5cc37d82f5d0d62845fffcc979b07998ac9 /libs/gui/LayerState.cpp
parent93be444a3d8e6e2d0ef73f82b0e42104ad4462bc (diff)
StretchEffect changes
Bug: 179047472 Test: StretchySurfaceViewActivity in HwAccelerationTests Change-Id: Ia1fcd6136a380bb7099fae08ceb024eae4f79ac8
Diffstat (limited to 'libs/gui/LayerState.cpp')
-rw-r--r--libs/gui/LayerState.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp
index f053372cb0..288bf92c15 100644
--- a/libs/gui/LayerState.cpp
+++ b/libs/gui/LayerState.cpp
@@ -548,6 +548,10 @@ void layer_state_t::merge(const layer_state_t& other) {
what |= eAutoRefreshChanged;
autoRefresh = other.autoRefresh;
}
+ if (other.what & eStretchChanged) {
+ what |= eStretchChanged;
+ stretchEffect = other.stretchEffect;
+ }
if ((other.what & what) != other.what) {
ALOGE("Unmerged SurfaceComposer Transaction properties. LayerState::merge needs updating? "
"other.what=0x%" PRIu64 " what=0x%" PRIu64,