diff options
Diffstat (limited to 'drmhwctwo.cpp')
| -rw-r--r-- | drmhwctwo.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drmhwctwo.cpp b/drmhwctwo.cpp index 617467a..3c22484 100644 --- a/drmhwctwo.cpp +++ b/drmhwctwo.cpp @@ -526,8 +526,7 @@ HWC2::Error DrmHwcTwo::HwcDisplay::PresentDisplay(int32_t *retire_fence) { std::vector<DrmPlane *> primary_planes(primary_planes_); std::vector<DrmPlane *> overlay_planes(overlay_planes_); - ret = composition->Plan(compositor_.squash_state(), &primary_planes, - &overlay_planes); + ret = composition->Plan(&primary_planes, &overlay_planes); if (ret) { ALOGE("Failed to plan the composition ret=%d", ret); return HWC2::Error::BadConfig; @@ -679,12 +678,10 @@ HWC2::Error DrmHwcTwo::HwcDisplay::ValidateDisplay(uint32_t *num_types, case HWC2::Composition::SolidColor: case HWC2::Composition::Cursor: case HWC2::Composition::Sideband: + default: layer.set_validated_type(HWC2::Composition::Client); ++*num_types; break; - default: - layer.set_validated_type(layer.sf_type()); - break; } } return *num_types ? HWC2::Error::HasChanges : HWC2::Error::None; |