ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix check for fence merge success

Browse Source 
Change-Id: I9b16526ebfe4ffabf7c4372cca9b192ce046aa21
This commit is contained in:
Jesse Hall 2012-07-03 13:41:54 -07:00
parent c5c5a14c06
commit e7db724bed
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/gui/SurfaceTexture.cpp
View File

@ -338,14 +338,14 @@ void SurfaceTexture::setReleaseFence(int fenceFd) {
sp<Fence> mergedFence = Fence::merge(
String8("SurfaceTexture merged release"),
mEGLSlots[mCurrentTexture].mReleaseFence, fence);
if (mergedFence.get()) {
if (!mergedFence.get()) {
ALOGE("failed to merge release fences");
// synchronization is broken, the best we can do is hope fences
// signal in order so the new fence will act like a union
mEGLSlots[mCurrentTexture].mReleaseFence = fence;
} else {
mEGLSlots[mCurrentTexture].mReleaseFence = mergedFence;
return;
}
mEGLSlots[mCurrentTexture].mReleaseFence = mergedFence;
}
}