aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-09-29 19:56:41 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-09-29 19:56:41 +0000
commitc7453bf843f7d535dae3f74a059111d9f64bec7c (patch)
tree3619f64665856213a0facf65588efa27fd7d1660
parentff9b7ec9eef776079be91dbac2d0b1ed533ce775 (diff)
parent0117218bea8357f2b1257ed352e711315a3ae05e (diff)
downloaddrm_hwcomposer-c7453bf843f7d535dae3f74a059111d9f64bec7c.tar.gz
release-request-99856c15-b008-4977-9971-f86523a23c0a-for-git_oc-m2-release-4367109 snap-temp-L18300000107415568
Change-Id: I0ab8fb4184e47c7dafffc0f97ee87b5ab33ab92e
-rw-r--r--drmdisplaycomposition.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/drmdisplaycomposition.cpp b/drmdisplaycomposition.cpp
index 949f4a3..b7f8d1a 100644
--- a/drmdisplaycomposition.cpp
+++ b/drmdisplaycomposition.cpp
@@ -375,6 +375,9 @@ int DrmDisplayComposition::Plan(SquashState *squash,
if (!i.plane())
continue;
+ // make sure that source layers are ordered based on zorder
+ std::sort(i.source_layers().begin(), i.source_layers().end());
+
std::vector<DrmPlane *> *container;
if (i.plane()->type() == DRM_PLANE_TYPE_PRIMARY)
container = primary_planes;