commit e64acba60e031af0b0a9617b8415008e744b4a40
author Adrian Salido <salidoa@google.com> Thu Sep 21 23:14:00 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 21 23:14:00 2017 +0000
tree ebe535181180d602413a7eec93da83cfb381702f
parent bf510efb04e8954da409dc1f041839de0c38bff3
parent b9cdd87a8c4b30ae1c8f98c22a5a2cb92c0ec876

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

Change-Id: Ida63f3d63416c07facf168d7dd3168df807d4aa4

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;