summaryrefslogtreecommitdiff
path: root/drmdisplaycomposition.cpp
diff options
context:
space:
mode:
authorSean Paul <seanpaul@chromium.org>2016-05-03 16:40:59 -0700
committerSean Paul <seanpaul@chromium.org>2016-05-12 14:27:16 -0400
commit4f4ef69e539c8f0c7352f12247b7551936736d04 (patch)
tree4a2688daf8cc45fcea8ae54cf75d197a8edff1ae /drmdisplaycomposition.cpp
parent3960cddcd115201392efc6ada9a939e20769732d (diff)
downloaddrm_hwcomposer-4f4ef69e539c8f0c7352f12247b7551936736d04.tar.gz
drm_hwcomposer-4f4ef69e539c8f0c7352f12247b7551936736d04.tar.xz
drm_hwcomposer: Don't use Plan() in SquashAll
Simplify the SquashAll() function by generating the composition without using Plan(). This allows us to specify exactly what we want on the screen without involving the normal plane provisioning code. BUG=b/28117135 TEST=Tested on ryu, squashing still works Signed-off-by: Sean Paul <seanpaul@chromium.org> Change-Id: Ieec9c323941e2a80252b33d14563c4d218d38dfb
Diffstat (limited to 'drmdisplaycomposition.cpp')
-rw-r--r--drmdisplaycomposition.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/drmdisplaycomposition.cpp b/drmdisplaycomposition.cpp
index d2b6211..d5450ff 100644
--- a/drmdisplaycomposition.cpp
+++ b/drmdisplaycomposition.cpp
@@ -186,6 +186,11 @@ static std::vector<size_t> SetBitsToVector(uint64_t in, size_t *index_map) {
return out;
}
+int DrmDisplayComposition::AddPlaneComposition(DrmCompositionPlane plane) {
+ composition_planes_.emplace_back(std::move(plane));
+ return 0;
+}
+
void DrmDisplayComposition::SeparateLayers(size_t *used_layers,
size_t num_used_layers,
DrmHwcRect<int> *exclude_rects,
@@ -484,6 +489,10 @@ int DrmDisplayComposition::Plan(SquashState *squash,
overlay_planes);
}
+ return FinalizeComposition();
+}
+
+int DrmDisplayComposition::FinalizeComposition() {
return CreateAndAssignReleaseFences();
}