commit b9cdd87a8c4b30ae1c8f98c22a5a2cb92c0ec876
author Adrian Salido <salidoa@google.com> Thu Sep 21 23:12:00 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 21 23:12:00 2017 +0000
tree 3619f64665856213a0facf65588efa27fd7d1660
parent 582e7ab130b9e7d9097ce23377cbb9ea63f3fdb4
parent 2bd0f1d90e2854500d29582919c965f8cf81c889

drm_hwcomposer: reorder source layers according to zorder am: 228ca6d118 am: 4b54b81847 am: 1ad48d0662
am: 2bd0f1d90e

Change-Id: I4cae74eacdb01c8b65c70e9dc0c0041f3502f648

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;