Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-15 06:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 41f37e48b6e7 (bug 916264) for landing with the wrong bug # in the commit message.

Browse Source 
Landed as bug 909746.
This commit is contained in:
Ryan VanderMeulen 2013-09-17 14:28:29 -04:00
parent ba2e1fe070
commit c5731e7404
2 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gfx/layers/opengl/TextureHostOGL.cpp
View File

@ -172,7 +172,10 @@ CompositableQuirksGonkOGL::CompositableQuirksGonkOGL()
}
CompositableQuirksGonkOGL::~CompositableQuirksGonkOGL()
{
DeleteTextureIfPresent();
if (mTexture) {
gl()->MakeCurrent();
gl()->fDeleteTextures(1, &mTexture);
}
}
gl::GLContext*
@ -195,15 +198,6 @@ GLuint CompositableQuirksGonkOGL::GetTexture()
return mTexture;
}
void
CompositableQuirksGonkOGL::DeleteTextureIfPresent()
{
if (mTexture) {
gl()->MakeCurrent();
gl()->fDeleteTextures(1, &mTexture);
}
}
bool
TextureImageTextureSourceOGL::Update(gfx::DataSourceSurface* aSurface,
TextureFlags aFlags,
@ -506,19 +500,6 @@ TextureImageDeprecatedTextureHostOGL::UpdateImpl(const SurfaceDescriptor& aImage
return;
}
#ifdef MOZ_WIDGET_GONK
if (mQuirks) {
// on gonk, this class is used as a fallback from gralloc buffer.
// There is a case this class is used with GrallocDeprecatedTextureHostOGL
// under same CompositableHost. if it happens, a gralloc buffer of
// GrallocDeprecatedTextureHostOGL needs to be unbounded from a texture,
// when the gralloc buffer is not rendered.
// Establish the unbound by deleting the texture.
// See Bug 916264.
static_cast<CompositableQuirksGonkOGL*>(mQuirks.get())->DeleteTextureIfPresent();
}
#endif
AutoOpenSurface surf(OPEN_READ_ONLY, aImage);
nsIntSize size = surf.Size();
TextureImage::ImageFormat format = surf.ImageFormat();

1
gfx/layers/opengl/TextureHostOGL.h
View File

@ -71,7 +71,6 @@ public:
virtual void SetCompositor(Compositor* aCompositor) MOZ_OVERRIDE;
GLuint GetTexture();
void DeleteTextureIfPresent();
gl::GLContext* gl() const;
protected:
RefPtr<CompositorOGL> mCompositor;