author | peter chang <pchang@mozilla.com> |
Tue, 10 May 2016 15:10:49 +0800 | |
changeset 297489 | 09f4d5bad3544baef8dfacf29a35e6e303c7f1bf |
parent 297488 | 0f9a6f4ef56ec7111376d48c9ab845b24af5536c |
child 297490 | dd33f84a62e6918860e0b4e5ecf1489ffecad3a5 |
push id | 76755 |
push user | pchang@mozilla.com |
push date | Mon, 16 May 2016 01:25:12 +0000 |
treeherder | mozilla-inbound@dd33f84a62e6 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | jrmuizel |
bugs | 1265625 |
milestone | 49.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/gfx/layers/opengl/CompositorOGL.cpp +++ b/gfx/layers/opengl/CompositorOGL.cpp @@ -1244,28 +1244,16 @@ CompositorOGL::DrawQuad(const Rect& aRec static_cast<TexturedEffect*>(aEffectChain.mPrimaryEffect.get()); TextureSource *source = texturedEffect->mTexture; didSetBlendMode = SetBlendMode(gl(), blendMode, texturedEffect->mPremultiplied); gfx::Filter filter = texturedEffect->mFilter; Matrix4x4 textureTransform = source->AsSourceOGL()->GetTextureTransform(); -#ifdef MOZ_WIDGET_ANDROID - gfx::Matrix textureTransform2D; - if (filter != gfx::Filter::POINT && - aTransform.Is2DIntegerTranslation() && - textureTransform.Is2D(&textureTransform2D) && - textureTransform2D.HasOnlyIntegerTranslation()) { - // On Android we encounter small resampling errors in what should be - // pixel-aligned compositing operations. This works around them. This - // code should not be needed! - filter = gfx::Filter::POINT; - } -#endif source->AsSourceOGL()->BindTexture(LOCAL_GL_TEXTURE0, filter); program->SetTextureUnit(0); program->SetTextureTransform(textureTransform); if (maskType != MaskType::MaskNone) { BindMaskForProgram(program, sourceMask, LOCAL_GL_TEXTURE1, maskQuadTransform); }