diff options
| author | Sean Paul <seanpaul@chromium.org> | 2016-06-23 04:05:08 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-23 04:05:08 +0000 |
| commit | 9d7612026ef82a71deca52c936bbf445a06cf278 (patch) | |
| tree | deab7ab595f4b333b463e0db7a46e8d9e3f5718a | |
| parent | 7cabba970139676246be8799069a552066addd13 (diff) | |
| parent | fab5ea10b0e81e830c484e19b322a3c11fa9e9e6 (diff) | |
| download | drm_hwcomposer-n-iot-preview-2.tar.gz | |
drm_hwcomposer: Count all layers with content in SquashFrameandroid-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2
am: fab5ea10b0
Change-Id: I050b6a4c2b9361dd89571712ad9dd8cc2c86060c
| -rw-r--r-- | drmdisplaycompositor.cpp | 2 |
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; |