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:17:49 -0600
changeset 225938 6b03a2b8f2f4
parent 225937 9d1af2396d45
child 225939 bef38c92bab9
push id4076
push userjwillcox@mozilla.com
push date2014-11-05 21:30 +0000
treeherdermozilla-beta@5811de401315 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgilbert, lsblakk
bugs1014614
milestone34.0
Bug 1014614 - Do not try to use a temporary texture for SurfaceTexture r=jgilbert a=lsblakk --HG-- extra : rebase_source : 68e6f70fe1c1aa123c4a1e21b3d25b78bcff7ad1
gfx/layers/opengl/TextureHostOGL.cpp
--- a/gfx/layers/opengl/TextureHostOGL.cpp
+++ b/gfx/layers/opengl/TextureHostOGL.cpp
@@ -501,20 +501,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);