diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-04-13 03:13:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-13 03:13:34 +0000 |
| commit | 66990debfbe674fcfee421bdf10f624778aa76e8 (patch) | |
| tree | ae0b5cfe2c1d8c7484539f530322e6a4d2538484 | |
| parent | 03b9b05e6f1b86cd298cc8977d107b72378d8848 (diff) | |
| parent | 7891c45fdb9fffeae162b2b35136e1fe201ee301 (diff) | |
| download | vulkan-cereal-66990debfbe674fcfee421bdf10f624778aa76e8.tar.gz | |
Merge "Handle empty fence in SyncThread::doSyncWait" am: 85d52231b1 am: b918ad4a5b am: 7891c45fdb
Original change: https://android-review.googlesource.com/c/device/generic/vulkan-cereal/+/2063027
Change-Id: Ia2a1f22c180df684632b2cfd2e4165ca4cc200ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | stream-servers/SyncThread.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/stream-servers/SyncThread.cpp b/stream-servers/SyncThread.cpp index fbad448f..8e24b413 100644 --- a/stream-servers/SyncThread.cpp +++ b/stream-servers/SyncThread.cpp @@ -313,8 +313,10 @@ void SyncThread::initSyncEGLContext() { void SyncThread::doSyncWait(FenceSync* fenceSync, std::function<void()> onComplete) { DPRINT("enter"); - if (!FenceSync::getFromHandle((uint64_t)(uintptr_t)fenceSync) && onComplete) { - onComplete(); + if (!FenceSync::getFromHandle((uint64_t)(uintptr_t)fenceSync)) { + if (onComplete) { + onComplete(); + } return; } // We shouldn't use FenceSync to wait, when SyncThread is initialized |