diff options
| author | Jamie Gennis <jgennis@google.com> | 2013-02-13 23:22:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-13 23:22:04 +0000 |
| commit | b997f6ef0f3fa7cf67fd7487b88e5d6ac0bb15e9 (patch) | |
| tree | 640c13270504ecc91c21bdc62a0b8397a4a5426f /libs/gui/ConsumerBase.cpp | |
| parent | c8a1e10fd2465509685d382c79d7c059db8491ac (diff) | |
| parent | c52e16cbf9798b95188c82465dfd84b914ff5199 (diff) | |
| download | frameworks_native-b997f6ef0f3fa7cf67fd7487b88e5d6ac0bb15e9.zip frameworks_native-b997f6ef0f3fa7cf67fd7487b88e5d6ac0bb15e9.tar.gz frameworks_native-b997f6ef0f3fa7cf67fd7487b88e5d6ac0bb15e9.tar.bz2 | |
Merge changes I50831d4e,I5360aebe
* changes:
flatland: remove an unneeded #include
libgui: disallow NULL Fence pointers
Diffstat (limited to 'libs/gui/ConsumerBase.cpp')
| -rw-r--r-- | libs/gui/ConsumerBase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/gui/ConsumerBase.cpp b/libs/gui/ConsumerBase.cpp index 8f391aa..fb6ba7d 100644 --- a/libs/gui/ConsumerBase.cpp +++ b/libs/gui/ConsumerBase.cpp @@ -84,7 +84,7 @@ ConsumerBase::~ConsumerBase() { void ConsumerBase::freeBufferLocked(int slotIndex) { CB_LOGV("freeBufferLocked: slotIndex=%d", slotIndex); mSlots[slotIndex].mGraphicBuffer = 0; - mSlots[slotIndex].mFence = 0; + mSlots[slotIndex].mFence = Fence::NO_FENCE; } // Used for refactoring, should not be in final interface @@ -228,7 +228,7 @@ status_t ConsumerBase::releaseBufferLocked(int slot, EGLDisplay display, freeBufferLocked(slot); } - mSlots[slot].mFence.clear(); + mSlots[slot].mFence = Fence::NO_FENCE; return err; } |