Bug 1014614 - Do not try to use a temporary texture for SurfaceTexture r=jgilbert a=lsblakk
authorJames Willcox <snorp@snorp.net>
Wed, 05 Nov 2014 10:50:02 -0600
changeset 233637 1f11fc5647379cc5316dfb3ea13f14acf6d2da05
parent 233636 455ad700e6fad60928577e23203d157ae0576d50
child 233638 e861acefefe8e0c20085403cb73df32a371ce400
push id4187
push userbhearsum@mozilla.com
push dateFri, 28 Nov 2014 15:29:12 +0000
treeherdermozilla-beta@f23cc6a30c11 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgilbert, lsblakk
bugs1014614
milestone35.0a2
Bug 1014614 - Do not try to use a temporary texture for SurfaceTexture r=jgilbert a=lsblakk
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);