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

Bug 1484624 - Don't create texture sources if the compositor doesn't have a GL context. r=sotaro

Browse Source
This commit is contained in:
Nicolas Silva
2018-08-22 13:59:15 +02:00
parent 471b29525a
commit dbe2598583
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -340,7 +340,14 @@ DirectMapTextureSource::Update(gfx::DataSourceSurface* aSurface,
bool
DirectMapTextureSource::Sync(bool aBlocking)
{
gl()->MakeCurrent();
if (!gl() || !gl()->MakeCurrent()) {
// We use this function to decide whether we can unlock the texture
// and clean it up. If we return false here and for whatever reason
// the context is absent or invalid, the compositor will keep a
// reference to this texture forever.
return true;
}
if (!gl()->IsDestroyed()) {
if (aBlocking) {
gl()->fFinishObjectAPPLE(LOCAL_GL_TEXTURE, mTextureHandle);
@@ -357,7 +364,9 @@ DirectMapTextureSource::UpdateInternal(gfx::DataSourceSurface* aSurface,
gfx::IntPoint* aSrcOffset,
bool aInit)
{
gl()->MakeCurrent();
if (!gl() || !gl()->MakeCurrent()) {
return false;
}
if (aInit) {
gl()->fGenTextures(1, &mTextureHandle);