summaryrefslogtreecommitdiff
path: root/libs/gui/GLConsumer.cpp
diff options
context:
space:
mode:
author Jesse Hall <jessehall@google.com> 2013-03-20 11:37:21 -0700
committer Jesse Hall <jessehall@google.com> 2013-03-22 09:56:58 -0700
commit13f01cbdbd34779a234bc674df79e23672fd5c0b (patch)
tree9b1c9334f276ff039a2621fe0e639ff06249473c /libs/gui/GLConsumer.cpp
parent8d8c75976171d194ca8f94727b22e3bf7676b9dd (diff)
Pass sp<Fence>s around instead of file descriptors
Change-Id: Iac70584a2207940730e8f803a543e4e9a4000c47
Diffstat (limited to 'libs/gui/GLConsumer.cpp')
-rw-r--r--libs/gui/GLConsumer.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/libs/gui/GLConsumer.cpp b/libs/gui/GLConsumer.cpp
index 09831fb8b9..630eb7c044 100644
--- a/libs/gui/GLConsumer.cpp
+++ b/libs/gui/GLConsumer.cpp
@@ -367,14 +367,14 @@ status_t GLConsumer::checkAndUpdateEglStateLocked() {
return NO_ERROR;
}
-void GLConsumer::setReleaseFence(int fenceFd) {
- sp<Fence> fence(new Fence(fenceFd));
- if (fenceFd == -1 || mCurrentTexture == BufferQueue::INVALID_BUFFER_SLOT)
- return;
- status_t err = addReleaseFence(mCurrentTexture, fence);
- if (err != OK) {
- ST_LOGE("setReleaseFence: failed to add the fence: %s (%d)",
- strerror(-err), err);
+void GLConsumer::setReleaseFence(const sp<Fence>& fence) {
+ if (fence->isValid() &&
+ mCurrentTexture != BufferQueue::INVALID_BUFFER_SLOT) {
+ status_t err = addReleaseFence(mCurrentTexture, fence);
+ if (err != OK) {
+ ST_LOGE("setReleaseFence: failed to add the fence: %s (%d)",
+ strerror(-err), err);
+ }
}
}