Bug 910488 - XSync can hang indefinitely with OMTC enabled (r=bjacob)

This commit is contained in:
Bill McCloskey 2013-08-30 14:30:10 -07:00
parent b283dbb4c7
commit 3484db98fc
2 changed files with 4 additions and 4 deletions

View File

@ -937,7 +937,7 @@ TRY_AGAIN_NO_SHARING:
bool TextureImageSupportsGetBackingSurface()
{
return mGLX->UseTextureFromPixmap();
return false;
}
virtual already_AddRefed<TextureImage>

View File

@ -45,6 +45,9 @@ namespace layers {
static bool
UsingXCompositing()
{
if (!PR_GetEnv("MOZ_LAYERS_ENABLE_XLIB_SURFACES")) {
return false;
}
return (gfxASurface::SurfaceTypeXlib ==
gfxPlatform::GetPlatform()->ScreenReferenceSurface()->GetType());
}
@ -117,9 +120,6 @@ ISurfaceAllocator::PlatformAllocSurfaceDescriptor(const gfxIntSize& aSize,
uint32_t aCaps,
SurfaceDescriptor* aBuffer)
{
if (!PR_GetEnv("MOZ_LAYERS_ENABLE_XLIB_SURFACES")) {
return false;
}
if (!UsingXCompositing()) {
// If we're not using X compositing, we're probably compositing on
// the client side, in which case X surfaces would just slow