commit 1ad48d06624a684c645268a60e06394839be6044
author Adrian Salido <salidoa@google.com> Thu Sep 21 23:07:30 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 21 23:07:30 2017 +0000
tree ebe535181180d602413a7eec93da83cfb381702f
parent a0bd156a4f9806ada1d142d512dc96036abb6c3a
parent 4b54b818477fb0650dc563cf9196578816c34597

drm_hwcomposer: reorder source layers according to zorder am: 228ca6d118
am: 4b54b81847

Change-Id: I5754e2f4cd28bc710ad32fb735b74af04b53bc10

drmdisplaycomposition.cpp

diff --git a/drmdisplaycomposition.cpp b/drmdisplaycomposition.cpp
index 293160b..0f8084b 100644
--- a/drmdisplaycomposition.cpp
+++ b/drmdisplaycomposition.cpp
@@ -379,6 +379,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;