Bug 971914 - Make TextureSourceOGL responsible for tracking filter state. r=nical

2014-03-13 13:37:17 +13:00
parent ea727b0a2a
commit c3d1f9c2f4
10 changed files with 74 additions and 57 deletions
--- a/gfx/layers/opengl/X11TextureSourceOGL.cpp
+++ b/gfx/layers/opengl/X11TextureSourceOGL.cpp
@@ -39,7 +39,7 @@ X11TextureSourceOGL::DeallocateDeviceData()
 }

 void
-X11TextureSourceOGL::BindTexture(GLenum aTextureUnit)
+X11TextureSourceOGL::BindTexture(GLenum aTextureUnit, gfx::Filter aFilter)
 {
  gl()->fActiveTexture(aTextureUnit);

@@ -54,7 +54,7 @@ X11TextureSourceOGL::BindTexture(GLenum aTextureUnit)
    gl::sGLXLibrary.UpdateTexImage(mSurface->XDisplay(), mSurface->GetGLXPixmap());
  }

-  gl()->fActiveTexture(LOCAL_GL_TEXTURE0);
+  ApplyFilterToBoundTexture(gl(), aFilter, LOCAL_GL_TEXTURE_RECTANGLE_ARB);
 }

 IntSize