diff options
| author | 2023-02-02 02:02:57 +0000 | |
|---|---|---|
| committer | 2023-02-02 02:02:57 +0000 | |
| commit | 473757b641e4515bd53ab826161db5100fe3ec09 (patch) | |
| tree | 5ea3645767f69b8bacd1dfafd04835ad7bf135b0 /libs/gui/BLASTBufferQueue.cpp | |
| parent | 4c5a6e35bee3998f96da5343b2175a9802f736f8 (diff) | |
| parent | 2d449b5ffaf8dc64690c05283656d09509a4b2ac (diff) | |
Merge "Fix an arithmetic error when using unsigned" am: 5e053bba77 am: 43f03d260e am: 2d449b5ffa
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2411296
Change-Id: Id1bbfeeefe433f1151390d8a695e96aa72f9e49b
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.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/gui/BLASTBufferQueue.cpp b/libs/gui/BLASTBufferQueue.cpp index 60603ba50a..5d12463f88 100644 --- a/libs/gui/BLASTBufferQueue.cpp +++ b/libs/gui/BLASTBufferQueue.cpp @@ -432,8 +432,8 @@ void BLASTBufferQueue::releaseBufferCallbackLocked( mCurrentMaxAcquiredBufferCount = *currentMaxAcquiredBufferCount; } - const auto numPendingBuffersToHold = - isEGL ? std::max(0u, mMaxAcquiredBuffers - mCurrentMaxAcquiredBufferCount) : 0; + const uint32_t numPendingBuffersToHold = + isEGL ? std::max(0, mMaxAcquiredBuffers - (int32_t)mCurrentMaxAcquiredBufferCount) : 0; auto rb = ReleasedBuffer{id, releaseFence}; if (std::find(mPendingRelease.begin(), mPendingRelease.end(), rb) == mPendingRelease.end()) { |