Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 977963 - Fix and re-enable linux glX texture_from_pixmap support r=mattwoodrow

Browse Source
This commit is contained in:
John Schoenick 2014-04-27 21:52:39 -07:00
parent 45d85dcd01
commit caf3e8009e
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gfx/layers/client/TextureClient.cpp
View File

@ -319,8 +319,6 @@ TextureClient::CreateTextureClientForDrawing(ISurfaceAllocator* aAllocator,
result = new TextureClientX11(aFormat, aTextureFlags);
}
#ifdef GL_PROVIDER_GLX
#if 0
// Bug 977963: Disabled for black layers
if (parentBackend == LayersBackend::LAYERS_OPENGL &&
type == gfxSurfaceType::Xlib &&
!(aTextureFlags & TEXTURE_ALLOC_FALLBACK) &&
@ -331,7 +329,6 @@ TextureClient::CreateTextureClientForDrawing(ISurfaceAllocator* aAllocator,
}
#endif
#endif
#endif
#ifdef MOZ_WIDGET_GONK
if (!DisableGralloc(aFormat, aSizeHint)) {

2
gfx/layers/opengl/X11TextureSourceOGL.cpp
View File

@ -54,7 +54,7 @@ X11TextureSourceOGL::BindTexture(GLenum aTextureUnit, gfx::Filter aFilter)
gl::sGLXLibrary.UpdateTexImage(mSurface->XDisplay(), mSurface->GetGLXPixmap());
}
ApplyFilterToBoundTexture(gl(), aFilter, LOCAL_GL_TEXTURE_RECTANGLE_ARB);
ApplyFilterToBoundTexture(gl(), aFilter, LOCAL_GL_TEXTURE_2D);
}
IntSize