commit 93be6aefeb68bf2b098ac4bd6c75a499862e63c7
author Adrian Salido <salidoa@google.com> Fri Oct 06 21:37:35 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 06 21:37:35 2017 +0000
tree 7eb3d2bd745c1e8c895194a4d3f20b7d2260a941
parent 8fc5634650ccdeb95dc98e0b421dee3ff6edf154
parent 556f56cea7c73c9ab06acd49c1509f256c4b51c0

Merge "drm_hwcomposer: make sure primary plane is allocated for squash" into oc-mr1-dev

drmdisplaycomposition.cpp

diff --git a/drmdisplaycomposition.cpp b/drmdisplaycomposition.cpp
index 949f4a3..b7f8d1a 100644
--- a/drmdisplaycomposition.cpp
+++ b/drmdisplaycomposition.cpp
@@ -375,6 +375,9 @@
     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;