aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Paul <seanpaul@chromium.org>2016-06-23 04:15:32 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-23 04:15:32 +0000
commita77cd05acd4606cb38abe59a2edd1efed16d57b0 (patch)
treedeab7ab595f4b333b463e0db7a46e8d9e3f5718a
parent7c49f90c2ae578850211e963fad7c5eaac975ece (diff)
parenta48e4fbb7619a87cd87c773090e10520d6ebf6e5 (diff)
downloaddrm_hwcomposer-a77cd05acd4606cb38abe59a2edd1efed16d57b0.tar.gz
drm_hwcomposer: Count all layers with content in SquashFrame am: fab5ea10b0 am: 9d7612026e am: 5ef27816e9
am: a48e4fbb76 Change-Id: I8489a79540f353bd2ea1de1365f5e6a8a3ac3e80
-rw-r--r--drmdisplaycompositor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/drmdisplaycompositor.cpp b/drmdisplaycompositor.cpp
index 279d5a6..92323b6 100644
--- a/drmdisplaycompositor.cpp
+++ b/drmdisplaycompositor.cpp
@@ -1061,7 +1061,7 @@ int DrmDisplayCompositor::SquashFrame(DrmDisplayComposition *src,
// Make sure there is more than one layer to squash.
size_t src_planes_with_layer = std::count_if(
src_planes.begin(), src_planes.end(), [](DrmCompositionPlane &p) {
- return p.type() == DrmCompositionPlane::Type::kLayer;
+ return p.type() != DrmCompositionPlane::Type::kDisable;
});
if (src_planes_with_layer <= 1)
return -EALREADY;