diff options
| author | Alec Mouri <alecmouri@google.com> | 2022-02-24 01:48:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-02-24 01:48:53 +0000 |
| commit | 3cc984ea8dd1334b68156b6704e809f02ce241d0 (patch) | |
| tree | 7699843929e913079fda1f2f287f5b4868d54d4a /hwc3/impl/HalImpl.cpp | |
| parent | 21e656d2438b04d538b7cd20e1b02ea9f8242094 (diff) | |
| parent | 86d9463ab7383b080994481887a1359ae27b4523 (diff) | |
Merge "Composer reports dimming ratio for client composition instead of nits" into tm-dev
Diffstat (limited to 'hwc3/impl/HalImpl.cpp')
| -rw-r--r-- | hwc3/impl/HalImpl.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/hwc3/impl/HalImpl.cpp b/hwc3/impl/HalImpl.cpp index eb82a70..011fd43 100644 --- a/hwc3/impl/HalImpl.cpp +++ b/hwc3/impl/HalImpl.cpp @@ -953,8 +953,7 @@ int32_t HalImpl::validateDisplay(int64_t display, std::vector<int64_t>* outChang uint32_t* outDisplayRequestMask, std::vector<int64_t>* outRequestedLayers, std::vector<int32_t>* outRequestMasks, - ClientTargetProperty* outClientTargetProperty, - float* outClientTargetWhitePointNits) { + ClientTargetProperty* outClientTargetProperty) { ExynosDisplay* halDisplay; RET_IF_ERR(getHalDisplay(display, halDisplay)); @@ -977,8 +976,6 @@ int32_t HalImpl::validateDisplay(int64_t display, std::vector<int64_t>* outChang RET_IF_ERR(halDisplay->getDisplayRequests(&displayReqs, &reqsCount, hwcRequestedLayers.data(), outRequestMasks->data())); - RET_IF_ERR(halDisplay->getClientTargetWhitePointNits(outClientTargetWhitePointNits)); - h2a::translate(hwcChangedLayers, *outChangedLayers); h2a::translate(hwcCompositionTypes, *outCompositionTypes); *outDisplayRequestMask = displayReqs; |