wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 711649 - Resolve OGL canvas layer in UpdateSurface - r=mattwoodrow

Browse Source
This commit is contained in:
Jeff Gilbert 2011-12-19 11:21:56 -08:00
parent 66d5362abb
commit 4eb57c769d
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gfx/layers/opengl/CanvasLayerOGL.cpp
View File

@ -159,6 +159,10 @@ CanvasLayerOGL::MakeTexture()
gl()->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_WRAP_T, LOCAL_GL_CLAMP_TO_EDGE);
}
/**
* Following UpdateSurface(), mTexture on context this->gl() should contain the data we want,
* unless mDelayedUpdates is true because of a too-large surface.
*/
void
CanvasLayerOGL::UpdateSurface()
{
@ -176,14 +180,17 @@ CanvasLayerOGL::UpdateSurface()
}
#endif
mOGLManager->MakeCurrent();
if (mCanvasGLContext &&
mCanvasGLContext->GetContextType() == gl()->GetContextType())
{
// Can texture share, just make sure it's resolved first
mCanvasGLContext->MakeCurrent();
mCanvasGLContext->GuaranteeResolve();
if (gl()->BindOffscreenNeedsTexture(mCanvasGLContext) &&
mTexture == 0)
{
mOGLManager->MakeCurrent();
MakeTexture();
}
} else {
@ -205,6 +212,7 @@ CanvasLayerOGL::UpdateSurface()
updatedAreaSurface = updatedAreaImageSurface;
}
mOGLManager->MakeCurrent();
mLayerProgram =
gl()->UploadSurfaceToTexture(updatedAreaSurface,
mBounds,
@ -241,10 +249,6 @@ CanvasLayerOGL::RenderLayer(int aPreviousDestination,
nsIntRect drawRect = mBounds;
if (useGLContext) {
mCanvasGLContext->MakeCurrent();
mCanvasGLContext->GuaranteeResolve();
gl()->MakeCurrent();
gl()->BindTex2DOffscreen(mCanvasGLContext);
program = mOGLManager->GetBasicLayerProgram(CanUseOpaqueSurface(), true);
} else if (mDelayedUpdates) {
@ -259,7 +263,8 @@ CanvasLayerOGL::RenderLayer(int aPreviousDestination,
true,
drawRect.TopLeft());
}
if (!program) {
if (!program) {
program = mOGLManager->GetColorTextureLayerProgram(mLayerProgram);
}