summaryrefslogtreecommitdiff
path: root/libs/gui/BLASTBufferQueue.cpp
diff options
context:
space:
mode:
author Chavi Weingarten <chaviw@google.com> 2023-08-07 16:34:49 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-07 16:34:49 +0000
commit2a4cec49d2a7d6dd507bfc0937f18abddc6af666 (patch)
tree38842bb7211930e2371faec0b1df4d77c2ac17bb /libs/gui/BLASTBufferQueue.cpp
parent7d03d6e2bb55066a064a8164969ab9fa17835b6d (diff)
parent9653f016f448919bbe2b2305240f9b3ff2533bda (diff)
Merge "Remove check for new requested sync before flushing shadow queue" into udc-qpr-dev am: 9653f016f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/24323554 Change-Id: I2c8d5ba4efa1782342f4cf55d8b1ba7e0e1aa707 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/gui/BLASTBufferQueue.cpp')
-rw-r--r--libs/gui/BLASTBufferQueue.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/libs/gui/BLASTBufferQueue.cpp b/libs/gui/BLASTBufferQueue.cpp
index 5c324b29cd..207fa4fd31 100644
--- a/libs/gui/BLASTBufferQueue.cpp
+++ b/libs/gui/BLASTBufferQueue.cpp
@@ -303,13 +303,8 @@ void BLASTBufferQueue::transactionCommittedCallback(nsecs_t /*latchTime*/,
// frame numbers that were in a sync. We remove the frame from mSyncedFrameNumbers
// set and then check if it's empty. If there are no more pending syncs, we can
// proceed with flushing the shadow queue.
- // We also want to check if mSyncTransaction is null because it's possible another
- // sync request came in while waiting, but it hasn't started processing yet. In that
- // case, we don't actually want to flush the frames in between since they will get
- // processed and merged with the sync transaction and released earlier than if they
- // were sent to SF
mSyncedFrameNumbers.erase(currFrameNumber);
- if (mSyncedFrameNumbers.empty() && mSyncTransaction == nullptr) {
+ if (mSyncedFrameNumbers.empty()) {
flushShadowQueue();
}
} else {