corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1155498 - Part 2 - Use new FenceHandle to handle the fence in TextureHost. r=sotaro

Browse Source
This commit is contained in:
Ethan Lin
2015-05-13 00:36:00 +02:00
parent 5de19c51ac
commit 02d4c66440
5 changed files with 23 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
gfx/layers/opengl/TextureHostOGL.cpp
View File

@@ -110,71 +110,50 @@ FlagsToGLFlags(TextureFlags aFlags)
return static_cast<gl::TextureImage::Flags>(result);
}
#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
bool
TextureHostOGL::SetReleaseFence(const android::sp<android::Fence>& aReleaseFence)
TextureHostOGL::SetReleaseFence(const FenceHandle& aReleaseFence)
{
if (!aReleaseFence.get() || !aReleaseFence->isValid()) {
if (!aReleaseFence.IsValid()) {
// HWC might not provide Fence.
// In this case, HWC implicitly handles buffer's fence.
return false;
}
if (!mReleaseFence.get()) {
mReleaseFence = aReleaseFence;
} else {
android::sp<android::Fence> mergedFence = android::Fence::merge(
android::String8::format("TextureHostOGL"),
mReleaseFence, aReleaseFence);
if (!mergedFence.get()) {
// synchronization is broken, the best we can do is hope fences
// signal in order so the new fence will act like a union.
// This error handling is same as android::ConsumerBase does.
mReleaseFence = aReleaseFence;
return false;
}
mReleaseFence = mergedFence;
}
mReleaseFence.Merge(aReleaseFence);
return true;
}
android::sp<android::Fence>
FenceHandle
TextureHostOGL::GetAndResetReleaseFence()
{
// Hold previous ReleaseFence to prevent Fence delivery failure via gecko IPC.
mPrevReleaseFence = mReleaseFence;
// Reset current ReleaseFence.
mReleaseFence = android::Fence::NO_FENCE;
return mPrevReleaseFence;
FenceHandle fence;
mReleaseFence.TransferToAnotherFenceHandle(fence);
return fence;
}
void
TextureHostOGL::SetAcquireFence(const android::sp<android::Fence>& aAcquireFence)
TextureHostOGL::SetAcquireFence(const FenceHandle& aAcquireFence)
{
mAcquireFence = aAcquireFence;
}
android::sp<android::Fence>
FenceHandle
TextureHostOGL::GetAndResetAcquireFence()
{
android::sp<android::Fence> fence = mAcquireFence;
// Reset current AcquireFence.
mAcquireFence = android::Fence::NO_FENCE;
return fence;
nsRefPtr<FenceHandle::FdObj> fdObj = mAcquireFence.GetAndResetFdObj();
return FenceHandle(fdObj);
}
void
TextureHostOGL::WaitAcquireFenceSyncComplete()
{
if (!mAcquireFence.get() || !mAcquireFence->isValid()) {
if (!mAcquireFence.IsValid()) {
return;
}
int fenceFd = mAcquireFence->dup();
if (fenceFd == -1) {
NS_WARNING("failed to dup fence fd");
return;
}
nsRefPtr<FenceHandle::FdObj> fence = mAcquireFence.GetAndResetFdObj();
int fenceFd = fence->GetAndResetFd();
EGLint attribs[] = {
LOCAL_EGL_SYNC_NATIVE_FENCE_FD_ANDROID, fenceFd,
@@ -200,11 +179,8 @@ TextureHostOGL::WaitAcquireFenceSyncComplete()
NS_ERROR("failed to wait native fence sync");
}
MOZ_ALWAYS_TRUE( sEGLLibrary.fDestroySync(EGL_DISPLAY(), sync) );
mAcquireFence = nullptr;
}
#endif
bool
TextureImageTextureSourceOGL::Update(gfx::DataSourceSurface* aSurface,
nsIntRegion* aDestRegion,