diff options
| author | 2023-02-02 01:26:36 +0000 | |
|---|---|---|
| committer | 2023-02-02 01:26:36 +0000 | |
| commit | 2d449b5ffaf8dc64690c05283656d09509a4b2ac (patch) | |
| tree | 9ce282ab04738a73997787317ef82bd41e3e15c5 | |
| parent | 3a92433b21f236e3cc01a34f860917d5c62b45fa (diff) | |
| parent | 43f03d260e5b41ad9755e59eb034d47fc22b7694 (diff) | |
Merge "Fix an arithmetic error when using unsigned" am: 5e053bba77 am: 43f03d260e
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2411296
Change-Id: I4863b69b5946430cc27fbd911fa4409a548f2fb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 8ee9b14945..ba04b2f476 100644 --- a/libs/gui/BLASTBufferQueue.cpp +++ b/libs/gui/BLASTBufferQueue.cpp @@ -429,8 +429,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()) { |