mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 20:35:50 +00:00
Bug 592462 - fix fullscreen video with OpenGL on Maemo with Qt. r=jmuizelaar. a=blocking-fennec
--HG-- extra : rebase_source : 765979328a5337242c9b7a8bd837b92ed2ed4062
This commit is contained in:
parent
2f04ed9a59
commit
0031e81e55
@ -515,6 +515,7 @@ LayerManagerOGL::Render()
|
|||||||
// Default blend function implements "OVER"
|
// Default blend function implements "OVER"
|
||||||
mGLContext->fBlendFuncSeparate(LOCAL_GL_ONE, LOCAL_GL_ONE_MINUS_SRC_ALPHA,
|
mGLContext->fBlendFuncSeparate(LOCAL_GL_ONE, LOCAL_GL_ONE_MINUS_SRC_ALPHA,
|
||||||
LOCAL_GL_ONE, LOCAL_GL_ONE);
|
LOCAL_GL_ONE, LOCAL_GL_ONE);
|
||||||
|
mGLContext->fEnable(LOCAL_GL_BLEND);
|
||||||
|
|
||||||
DEBUG_GL_ERROR_CHECK(mGLContext);
|
DEBUG_GL_ERROR_CHECK(mGLContext);
|
||||||
|
|
||||||
|
@ -146,6 +146,8 @@ ThebesLayerBufferOGL::RenderTo(const nsIntPoint& aOffset,
|
|||||||
aManager->GetBasicLayerProgram(mLayer->CanUseOpaqueSurface(),
|
aManager->GetBasicLayerProgram(mLayer->CanUseOpaqueSurface(),
|
||||||
mTexImage->IsRGB());
|
mTexImage->IsRGB());
|
||||||
|
|
||||||
|
gl()->fActiveTexture(LOCAL_GL_TEXTURE0);
|
||||||
|
|
||||||
if (!mTexImage->InUpdate() || !mTexImage->EndUpdate()) {
|
if (!mTexImage->InUpdate() || !mTexImage->EndUpdate()) {
|
||||||
gl()->fBindTexture(LOCAL_GL_TEXTURE_2D, mTexImage->Texture());
|
gl()->fBindTexture(LOCAL_GL_TEXTURE_2D, mTexImage->Texture());
|
||||||
}
|
}
|
||||||
|
@ -341,6 +341,11 @@ nsWindow::Destroy(void)
|
|||||||
NS_IF_RELEASE(gMenuRollup);
|
NS_IF_RELEASE(gMenuRollup);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (mLayerManager) {
|
||||||
|
mLayerManager->Destroy();
|
||||||
|
}
|
||||||
|
mLayerManager = nsnull;
|
||||||
|
|
||||||
Show(PR_FALSE);
|
Show(PR_FALSE);
|
||||||
|
|
||||||
// walk the list of children and call destroy on them. Have to be
|
// walk the list of children and call destroy on them. Have to be
|
||||||
|
Loading…
Reference in New Issue
Block a user