Bug 876256 - Restore the previous scissor rect at the end of CompositorOGL::DrawQuad. r=mattwoodrow

This commit is contained in:
Markus Stange 2013-05-27 14:48:15 +02:00
parent c437a3a2c0
commit e2c9b54971

View File

@ -962,8 +962,8 @@ CompositorOGL::DrawQuad(const Rect& aRect, const Rect& aClipRect,
IntRect intClipRect;
aClipRect.ToIntRect(&intClipRect);
mGLContext->fScissor(intClipRect.x, intClipRect.y,
intClipRect.width, intClipRect.height);
mGLContext->PushScissorRect(nsIntRect(intClipRect.x, intClipRect.y,
intClipRect.width, intClipRect.height));
MaskType maskType;
EffectMask* effectMask;
@ -1198,6 +1198,7 @@ CompositorOGL::DrawQuad(const Rect& aRect, const Rect& aClipRect,
break;
}
mGLContext->PopScissorRect();
mGLContext->fActiveTexture(LOCAL_GL_TEXTURE0);
// in case rendering has used some other GL context
MakeCurrent();