diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-15 23:17:42 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-15 23:17:42 +0000 |
| commit | 6d98f62745fa3b4296ee749df7aadf18e278966f (patch) | |
| tree | 3a972b57c11a30c31c38f4095ff95e4cfc0ad86d /libhwc2.1/libdevice/ExynosLayer.cpp | |
| parent | 00ac054ef7620ff8a3a2ff16c2a8b8f9dda2dd9e (diff) | |
| parent | 8c34de5710be7e0cc2b4a2d919ae546d176f9776 (diff) | |
Snap for 10331563 from 8c34de5710be7e0cc2b4a2d919ae546d176f9776 to udc-release
Change-Id: Id567326bd5e42fbd624d2a19ed1a9f24f599ccc2
Diffstat (limited to 'libhwc2.1/libdevice/ExynosLayer.cpp')
| -rw-r--r-- | libhwc2.1/libdevice/ExynosLayer.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libhwc2.1/libdevice/ExynosLayer.cpp b/libhwc2.1/libdevice/ExynosLayer.cpp index 79a9ca1..8f1662d 100644 --- a/libhwc2.1/libdevice/ExynosLayer.cpp +++ b/libhwc2.1/libdevice/ExynosLayer.cpp @@ -39,6 +39,7 @@ ExynosLayer::ExynosLayer(ExynosDisplay* display) : ExynosMPPSource(MPP_SOURCE_LAYER, this), mDisplay(display), mCompositionType(HWC2_COMPOSITION_INVALID), + mRequestedCompositionType(HWC2_COMPOSITION_INVALID), mExynosCompositionType(HWC2_COMPOSITION_INVALID), mValidateCompositionType(HWC2_COMPOSITION_INVALID), mValidateExynosCompositionType(HWC2_COMPOSITION_INVALID), @@ -422,7 +423,7 @@ int32_t ExynosLayer::setLayerBuffer(buffer_handle_t buffer, int32_t acquireFence checkFps(mLastLayerBuffer != mLayerBuffer); if (mLayerBuffer != mLastLayerBuffer) { mLastUpdateTime = systemTime(CLOCK_MONOTONIC); - if (mCompositionType != HWC2_COMPOSITION_REFRESH_RATE_INDICATOR) + if (mRequestedCompositionType != HWC2_COMPOSITION_REFRESH_RATE_INDICATOR) mDisplay->mBufferUpdates++; } } @@ -512,11 +513,12 @@ int32_t ExynosLayer::setLayerCompositionType(int32_t /*hwc2_composition_t*/ type type = HWC2_COMPOSITION_DEVICE; #endif - if (type != mCompositionType) { + if (type != mCompositionType && type != mRequestedCompositionType) { setGeometryChanged(GEOMETRY_LAYER_TYPE_CHANGED); } mCompositionType = type; + mRequestedCompositionType = type; return HWC2_ERROR_NONE; } @@ -1166,7 +1168,7 @@ void ExynosLayer::setGeometryChanged(uint64_t changedBit) { mLastUpdateTime = systemTime(CLOCK_MONOTONIC); mGeometryChanged |= changedBit; - if (mCompositionType != HWC2_COMPOSITION_REFRESH_RATE_INDICATOR) + if (mRequestedCompositionType != HWC2_COMPOSITION_REFRESH_RATE_INDICATOR) mDisplay->setGeometryChanged(changedBit); } |