aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Salido <salidoa@google.com>2017-09-21 23:09:29 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-09-21 23:09:29 +0000
commit2bd0f1d90e2854500d29582919c965f8cf81c889 (patch)
treeebe535181180d602413a7eec93da83cfb381702f
parentcbe2d26cadc315c858fc753ea9e757d1ff0f831a (diff)
parent1ad48d06624a684c645268a60e06394839be6044 (diff)
downloaddrm_hwcomposer-2bd0f1d90e2854500d29582919c965f8cf81c889.tar.gz
drm_hwcomposer: reorder source layers according to zorder am: 228ca6d118 am: 4b54b81847
am: 1ad48d0662 Change-Id: I377fb2ba4c75f12b74f7794c50c2d78c09aa082a
-rw-r--r--drmdisplaycomposition.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/drmdisplaycomposition.cpp b/drmdisplaycomposition.cpp
index 293160b..0f8084b 100644
--- a/drmdisplaycomposition.cpp
+++ b/drmdisplaycomposition.cpp
@@ -379,6 +379,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;