diff options
| -rw-r--r-- | drmdisplaycomposition.cpp | 3 | ||||
| -rw-r--r-- | drmdisplaycompositor.cpp | 16 |
2 files changed, 13 insertions, 6 deletions
diff --git a/drmdisplaycomposition.cpp b/drmdisplaycomposition.cpp index 949f4a3..b7f8d1a 100644 --- a/drmdisplaycomposition.cpp +++ b/drmdisplaycomposition.cpp @@ -375,6 +375,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; diff --git a/drmdisplaycompositor.cpp b/drmdisplaycompositor.cpp index 3d27f13..14b87aa 100644 --- a/drmdisplaycompositor.cpp +++ b/drmdisplaycompositor.cpp @@ -982,10 +982,13 @@ int DrmDisplayCompositor::SquashFrame(DrmDisplayComposition *src, goto move_layers_back; } - if (comp_plane.type() == DrmCompositionPlane::Type::kDisable) { + if (comp_plane.plane()->type() == DRM_PLANE_TYPE_PRIMARY) + squashed_comp.set_plane(comp_plane.plane()); + else dst->AddPlaneDisable(comp_plane.plane()); + + if (comp_plane.type() == DrmCompositionPlane::Type::kDisable) continue; - } for (auto i : comp_plane.source_layers()) { DrmHwcLayer &layer = src_layers[i]; @@ -1004,11 +1007,12 @@ int DrmDisplayCompositor::SquashFrame(DrmDisplayComposition *src, squashed_comp.source_layers().push_back( squashed_comp.source_layers().size()); } + } - if (comp_plane.plane()->type() == DRM_PLANE_TYPE_PRIMARY) - squashed_comp.set_plane(comp_plane.plane()); - else - dst->AddPlaneDisable(comp_plane.plane()); + if (squashed_comp.plane() == NULL) { + ALOGE("Primary plane not found for squash"); + ret = -ENOTSUP; + goto move_layers_back; } ret = dst->SetLayers(dst_layers.data(), dst_layers.size(), false); |