diff options
| author | Wiwit Rifa'i <wiwitrifai@google.com> | 2022-08-24 04:30:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-08-24 04:30:22 +0000 |
| commit | 6a937c818355b4fe9b75bb8efe235455ed2992b7 (patch) | |
| tree | f6579b749da9fbda03d65dfe2f8c28b69fda2602 /hwc3/ComposerCommandEngine.cpp | |
| parent | 82b71c0da308d88f029c543a9b4370a796c39782 (diff) | |
| parent | 55684b511441d5ae793ce9fbe1f91f270867f7f8 (diff) | |
hwc3: move mustValidateDisplay() to executePresentOrValidateDisplay() am: faac12043d am: 55684b5114
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/common/+/19632602
Change-Id: I1ae7305b95803c481894e52925d84b187ba1f9a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'hwc3/ComposerCommandEngine.cpp')
| -rw-r--r-- | hwc3/ComposerCommandEngine.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/hwc3/ComposerCommandEngine.cpp b/hwc3/ComposerCommandEngine.cpp index ff66f9d..4b3a1a3 100644 --- a/hwc3/ComposerCommandEngine.cpp +++ b/hwc3/ComposerCommandEngine.cpp @@ -236,7 +236,8 @@ void ComposerCommandEngine::executePresentOrValidateDisplay( int err; // First try to Present as is. if (mHal->hasCapability(Capability::SKIP_VALIDATE)) { - err = executePresentDisplay(display); + err = mResources->mustValidateDisplay(display) ? IComposerClient::EX_NOT_VALIDATED + : executePresentDisplay(display); if (!err) { mWriter->setPresentOrValidateResult(display, PresentOrValidate::Result::Presented); return; @@ -262,9 +263,7 @@ int ComposerCommandEngine::executePresentDisplay(int64_t display) { ndk::ScopedFileDescriptor presentFence; std::vector<int64_t> layers; std::vector<ndk::ScopedFileDescriptor> fences; - auto err = mResources->mustValidateDisplay(display) - ? IComposerClient::EX_NOT_VALIDATED - : mHal->presentDisplay(display, presentFence, &layers, &fences); + auto err = mHal->presentDisplay(display, presentFence, &layers, &fences); if (!err) { mWriter->setPresentFence(display, std::move(presentFence)); mWriter->setReleaseFences(display, layers, std::move(fences)); |