Bug 1028532 - Remove Fence::merge() on gonk r=jmuizelaar
authorSotaro Ikeda <sikeda@mozilla.com>
Wed, 25 Jun 2014 06:13:34 -0700
changeset 190777 b6f24fe7d7d502df3c7946e2ce379bfeedb60ad6
parent 190776 16bba8cfb81893a2e35a5eb2d03f46eade2be3d8
child 190778 8e069ea10ef1cadde66ae8e2160bf9c7409e107a
push id27016
push userkwierso@gmail.com
push dateThu, 26 Jun 2014 01:18:58 +0000
treeherdermozilla-central@464bca437658 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmuizelaar
bugs1028532
milestone33.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1028532 - Remove Fence::merge() on gonk r=jmuizelaar
gfx/layers/opengl/TextureHostOGL.cpp
--- a/gfx/layers/opengl/TextureHostOGL.cpp
+++ b/gfx/layers/opengl/TextureHostOGL.cpp
@@ -179,31 +179,17 @@ bool
 TextureHostOGL::SetReleaseFence(const android::sp<android::Fence>& aReleaseFence)
 {
   if (!aReleaseFence.get() || !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 = aReleaseFence;
   return true;
 }
 
 android::sp<android::Fence>
 TextureHostOGL::GetAndResetReleaseFence()
 {
   // Hold previous ReleaseFence to prevent Fence delivery failure via gecko IPC.
   mPrevReleaseFence = mReleaseFence;