summaryrefslogtreecommitdiffstats
path: root/services/surfaceflinger/DisplayHardware
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2012-09-05 20:09:05 -0700
committerJamie Gennis <jgennis@google.com>2012-09-06 17:54:53 -0700
commitb27254154642575dfb4bbfa79fbedde7d7ee23dd (patch)
tree20f11812c640baf475d46d04f6c3ac88e47d1829 /services/surfaceflinger/DisplayHardware
parent331841b96b92646c93c87627c03f77b892f711cd (diff)
downloadframeworks_native-b27254154642575dfb4bbfa79fbedde7d7ee23dd.zip
frameworks_native-b27254154642575dfb4bbfa79fbedde7d7ee23dd.tar.gz
frameworks_native-b27254154642575dfb4bbfa79fbedde7d7ee23dd.tar.bz2
libgui: move fence handling into ConsumerBase
This change moves some common fence handling code into the base class for BufferQueue consumer classes. It also makes the ConsumerBase class initialize a buffer slot's fence with the acquire fence every time a buffer is acquired. Change-Id: I0bd88bc269e919653b659bfb3ebfb04dd61692a0
Diffstat (limited to 'services/surfaceflinger/DisplayHardware')
-rw-r--r--services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp b/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
index 7fb1159..f85f604 100644
--- a/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
+++ b/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
@@ -125,7 +125,7 @@ status_t FramebufferSurface::nextBuffer(sp<GraphicBuffer>* buffer) {
item.mBuf != mCurrentBufferSlot) {
// Release the previous buffer.
err = releaseBufferLocked(mCurrentBufferSlot, EGL_NO_DISPLAY,
- EGL_NO_SYNC_KHR, Fence::NO_FENCE);
+ EGL_NO_SYNC_KHR);
if (err != NO_ERROR && err != BufferQueue::STALE_BUFFER_SLOT) {
ALOGE("error releasing buffer: %s (%d)", strerror(-err), err);
return err;