b=773071; more incorrect merge fixup for KHR_fence_sync; r=vlad
authorVladimir Vukicevic <vladimir@pobox.com>
Mon, 30 Jul 2012 11:07:23 -0400
changeset 100880 5f72d5754b42a7442e479007f5a26402d512a75d
parent 100879 529d95d56e3da42827f16f2307621eb6936497d6
child 100881 efc3fb215b231e1335277bd0d359668b2a488da6
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersvlad
bugs773071
milestone17.0a1
b=773071; more incorrect merge fixup for KHR_fence_sync; r=vlad
gfx/gl/GLContextProviderEGL.cpp
--- a/gfx/gl/GLContextProviderEGL.cpp
+++ b/gfx/gl/GLContextProviderEGL.cpp
@@ -1054,16 +1054,17 @@ bool GLContextEGL::AttachSharedHandle(Te
         break;
     }
 #endif // MOZ_WIDGET_ANDROID
     
     case SharedHandleType::Image: {
         NS_ASSERTION(mShareWithEGLImage, "EGLImage not supported or disabled in runtime");
 
         EGLTextureWrapper* wrap = (EGLTextureWrapper*)aSharedHandle;
+        wrap->WaitSync();
         fEGLImageTargetTexture2D(LOCAL_GL_TEXTURE_2D, wrap->GetEGLImage());
         break;
     }
 
     default:
         NS_ERROR("Unknown shared handle type");
         return false;
     }