Bug 1014614 - Do not try to use a temporary texture for SurfaceTexture r=jgilbert
authorJames Willcox <snorp@snorp.net>
Fri, 17 Oct 2014 10:35:11 -0500
changeset 210949 511dcc817f5d
parent 210948 2b72e71f1fdf
child 210950 c878e29fbef9
push id50598
push userjwillcox@mozilla.com
push date2014-10-17 15:36 +0000
treeherdermozilla-inbound@40f99ba7f616 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgilbert
bugs1014614
milestone36.0a1
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
@@ -445,20 +445,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);