summaryrefslogtreecommitdiff
path: root/libs/gui/ConsumerBase.cpp
diff options
context:
space:
mode:
author Dan Stoza <stoza@google.com> 2017-02-16 14:55:03 -0800
committer Dan Stoza <stoza@google.com> 2017-02-16 14:55:03 -0800
commita34320a81c9787958f1b02e93e828472e54864b5 (patch)
treec7f060f1f052ac6b2431a807432125264cfc3e72 /libs/gui/ConsumerBase.cpp
parent52eb3c9f8b436c0e389090436b5aac2b6ff888aa (diff)
libui: Remove STL from Fence
Renames Fence::hasSignaled to Fence::getStatus, and changes its return type from std::experimental::optional (STL is no longer permitted in libui) to an enum class. Also updates its one caller. Test: Builds and sailfish boots Change-Id: I682039b9fd88bf79f1e2a955944c4a564ed6f60b
Diffstat (limited to 'libs/gui/ConsumerBase.cpp')
-rw-r--r--libs/gui/ConsumerBase.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/gui/ConsumerBase.cpp b/libs/gui/ConsumerBase.cpp
index be2b1afd36..c26de6673b 100644
--- a/libs/gui/ConsumerBase.cpp
+++ b/libs/gui/ConsumerBase.cpp
@@ -318,16 +318,16 @@ status_t ConsumerBase::addReleaseFenceLocked(int slot,
return OK;
}
- auto signaled = mSlots[slot].mFence->hasSignaled();
+ auto status = mSlots[slot].mFence->getStatus();
- if (!signaled) {
+ if (status == Fence::Status::Invalid) {
CB_LOGE("fence has invalid state");
return BAD_VALUE;
}
- if (*signaled) {
+ if (status == Fence::Status::Signaled) {
mSlots[slot].mFence = fence;
- } else {
+ } else { // status == Fence::Status::Unsignaled
char fenceName[32] = {};
snprintf(fenceName, 32, "%.28s:%d", mName.string(), slot);
sp<Fence> mergedFence = Fence::merge(