Bug 1014614 - Do not try to use a temporary texture for SurfaceTexture r=jgilbert
authorJames Willcox <snorp@snorp.net>
Tue, 21 Oct 2014 08:53:01 -0500
changeset 211439 17f4e268f770
parent 211438 790d51993a39
child 211440 a94d1bedba0f
push id50717
push userjwillcox@mozilla.com
push date2014-10-21 13:54 +0000
treeherdermozilla-inbound@112be8f081b3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgilbert
bugs1014614
milestone36.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
Bug 1014614 - Do not try to use a temporary texture for SurfaceTexture r=jgilbert
gfx/layers/opengl/TextureHostOGL.cpp
--- a/gfx/layers/opengl/TextureHostOGL.cpp
+++ b/gfx/layers/opengl/TextureHostOGL.cpp
@@ -594,20 +594,18 @@ SurfaceTextureSource::SurfaceTextureSour
 
 void
 SurfaceTextureSource::BindTexture(GLenum aTextureUnit, gfx::Filter aFilter)
 {
   if (!gl()) {
     NS_WARNING("Trying to bind a texture without a GLContext");
     return;
   }
-  GLuint tex = mCompositor->GetTemporaryTexture(GetTextureTarget(), aTextureUnit);
 
   gl()->fActiveTexture(aTextureUnit);
-  gl()->fBindTexture(mTextureTarget, tex);
 #ifndef DEBUG
   // SurfaceTexture spams us if there are any existing GL errors, so
   // we'll clear them here in order to avoid that.
   gl()->GetAndClearError();
 #endif
   mSurfTex->UpdateTexImage();
 
   ApplyFilterToBoundTexture(gl(), aFilter, mTextureTarget);