Skip to content

Commit

Permalink
Restore most of the Bug 971914 - Don't set and restore state constant…
Browse files Browse the repository at this point in the history 
…ly inside CompositorOGL. r=nical
  • Loading branch information
@tmeshkova
tmeshkova committed Mar 27, 2014
1 parent 282a6a0 commit 22eb14d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 94 deletions.
6 changes: 5 additions & 1 deletion embedding/embedlite/embedthread/EmbedLiteCompositorParent.cpp
View file
Expand Up @@ -113,7 +113,11 @@ bool EmbedLiteCompositorParent::RenderGL()
if (!mActiveClipping.IsEmpty() && state->mLayerManager->GetRoot()) {
state->mLayerManager->GetRoot()->SetClipRect(&mActiveClipping);
}
CompositorParent::Composite();

{
ScopedScissorRect autoScissor(context);
CompositorParent::Composite();
}

if (context->IsOffscreen()) {
if (!context->PublishFrame()) {
Expand Down
99 changes: 6 additions & 93 deletions gfx/layers/opengl/CompositorOGL.cpp
View file
Expand Up @@ -138,15 +138,12 @@ DrawQuads(GLContext *aGLContext,
2, LOCAL_GL_FLOAT,
LOCAL_GL_FALSE,
0, BUFFER_OFFSET(bytes));
} else {
aGLContext->fDisableVertexAttribArray(texCoordAttribIndex);
}

aGLContext->fDrawArrays(aMode, 0, aRects.elements());

aGLContext->fDisableVertexAttribArray(vertAttribIndex);
if (texCoords) {
aGLContext->fDisableVertexAttribArray(texCoordAttribIndex);
}

aGLContext->fBindBuffer(LOCAL_GL_ARRAY_BUFFER, 0);
}

Expand Down Expand Up @@ -748,6 +745,8 @@ CompositorOGL::BeginFrame(const nsIntRegion& aInvalidRegion,
LOCAL_GL_ONE, LOCAL_GL_ONE);
mGLContext->fEnable(LOCAL_GL_BLEND);

mGLContext->fEnable(LOCAL_GL_SCISSOR_TEST);

if (aClipRectOut && !aClipRectIn) {
aClipRectOut->SetRect(0, 0, width, height);
}
Expand Down Expand Up @@ -916,77 +915,6 @@ CompositorOGL::GetShaderProgramFor(const ShaderConfigOGL &aConfig)
return shader;
}

struct MOZ_STACK_CLASS AutoBindTexture
: public ScopedGLWrapper<AutoBindTexture>
{
friend struct ScopedGLWrapper<AutoBindTexture>;

protected:
GLenum mTexUnit;
GLuint mOldTexId;

public:
explicit AutoBindTexture(GLContext* aGL)
: ScopedGLWrapper<AutoBindTexture>(aGL)
, mTexUnit(0)
, mOldTexId(GLuint(-1))
{ }

AutoBindTexture(GLContext* aGL, TextureSourceOGL* aTexture,
GLenum aTexUnit = LOCAL_GL_TEXTURE0)
: ScopedGLWrapper<AutoBindTexture>(aGL)
, mTexUnit(0)
, mOldTexId(GLuint(-1))
{
MOZ_ASSERT(aTexture);
MOZ_ASSERT(mOldTexId == GLuint(-1));
mTexUnit = aTexUnit;

ScopedBindTextureUnit autoBindTexUnit(mGL, aTexUnit);

mGL->GetUIntegerv(LOCAL_GL_TEXTURE_BINDING_2D, &mOldTexId);
aTexture->BindTexture(mTexUnit, gfx::Filter::LINEAR);
}

protected:
void UnwrapImpl()
{
if (mOldTexId == GLuint(-1))
return;

ScopedBindTextureUnit autoBindTexUnit(mGL, mTexUnit);
mGL->fBindTexture(LOCAL_GL_TEXTURE_2D, mOldTexId);
}
};

struct MOZ_STACK_CLASS AutoSaveTexture
: public ScopedGLWrapper<AutoSaveTexture>
{
friend struct ScopedGLWrapper<AutoSaveTexture>;

protected:
GLenum mTexUnit;
GLuint mOldTexId;

public:
AutoSaveTexture(GLContext* aGL, GLenum aTexUnit = LOCAL_GL_TEXTURE0)
: ScopedGLWrapper<AutoSaveTexture>(aGL)
, mTexUnit(aTexUnit)
, mOldTexId(GLuint(-1))
{
ScopedBindTextureUnit savedTexUnit(mGL, mTexUnit);
mGL->GetUIntegerv(LOCAL_GL_TEXTURE_BINDING_2D, &mOldTexId);
}

protected:
void UnwrapImpl()
{
ScopedBindTextureUnit savedTexUnit(mGL, mTexUnit);
mGL->fBindTexture(LOCAL_GL_TEXTURE_2D, mOldTexId);
}
};


void
CompositorOGL::DrawLines(const std::vector<gfx::Point>& aLines, const gfx::Rect& aClipRect,
const gfx::Color& aColor,
Expand Down Expand Up @@ -1024,12 +952,8 @@ CompositorOGL::DrawQuadInternal(const Rect& aRect,
IntRect intClipRect;
clipRect.ToIntRect(&intClipRect);

ScopedGLState scopedScissorTestState(mGLContext, LOCAL_GL_SCISSOR_TEST, true);
ScopedScissorRect autoScissor(mGLContext,
intClipRect.x,
FlipY(intClipRect.y + intClipRect.height),
intClipRect.width,
intClipRect.height);
gl()->fScissor(intClipRect.x, FlipY(intClipRect.y + intClipRect.height),
intClipRect.width, intClipRect.height);

LayerScope::SendEffectChain(mGLContext, aEffectChain,
aRect.width, aRect.height);
Expand Down Expand Up @@ -1110,7 +1034,6 @@ CompositorOGL::DrawQuadInternal(const Rect& aRect,
case EFFECT_SOLID_COLOR: {
program->SetRenderColor(color);

AutoSaveTexture bindMask(mGLContext, LOCAL_GL_TEXTURE0);
if (maskType != MaskNone) {
BindMaskForProgram(program, sourceMask, LOCAL_GL_TEXTURE0, maskQuadTransform);
}
Expand Down Expand Up @@ -1149,7 +1072,6 @@ CompositorOGL::DrawQuadInternal(const Rect& aRect,

program->SetTextureUnit(0);

AutoSaveTexture bindMask(mGLContext, LOCAL_GL_TEXTURE1);
if (maskType != MaskNone) {
BindMaskForProgram(program, sourceMask, LOCAL_GL_TEXTURE1, maskQuadTransform);
}
Expand Down Expand Up @@ -1183,7 +1105,6 @@ CompositorOGL::DrawQuadInternal(const Rect& aRect,

program->SetYCbCrTextureUnits(Y, Cb, Cr);

AutoSaveTexture bindMask(mGLContext, LOCAL_GL_TEXTURE3);
if (maskType != MaskNone) {
BindMaskForProgram(program, sourceMask, LOCAL_GL_TEXTURE3, maskQuadTransform);
}
Expand All @@ -1204,7 +1125,6 @@ CompositorOGL::DrawQuadInternal(const Rect& aRect,
program->SetTextureTransform(Matrix4x4());
program->SetTextureUnit(0);

AutoSaveTexture bindMask(mGLContext, LOCAL_GL_TEXTURE1);
if (maskType != MaskNone) {
sourceMask->BindTexture(LOCAL_GL_TEXTURE1, gfx::Filter::LINEAR);
program->SetMaskTextureUnit(1);
Expand Down Expand Up @@ -1242,7 +1162,6 @@ CompositorOGL::DrawQuadInternal(const Rect& aRect,
program->SetWhiteTextureUnit(1);
program->SetTextureTransform(gfx::Matrix4x4());

AutoBindTexture bindMask(mGLContext);
if (maskType != MaskNone) {
BindMaskForProgram(program, sourceMask, LOCAL_GL_TEXTURE2, maskQuadTransform);
}
Expand Down Expand Up @@ -1273,7 +1192,6 @@ CompositorOGL::DrawQuadInternal(const Rect& aRect,
break;
}

mGLContext->fActiveTexture(LOCAL_GL_TEXTURE0);
// in case rendering has used some other GL context
MakeCurrent();
}
Expand Down Expand Up @@ -1574,11 +1492,6 @@ CompositorOGL::BindAndDrawQuad(GLuint aVertAttribIndex,
} else {
mGLContext->fDrawArrays(aDrawMode, 0, 4);
}
mGLContext->fDisableVertexAttribArray(aVertAttribIndex);

if (aTexCoordAttribIndex != GLuint(-1)) {
mGLContext->fDisableVertexAttribArray(aTexCoordAttribIndex);
}
}

void
Expand Down

0 comments on commit 22eb14d

Please sign in to comment.