wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset f08ab0578efb (bug 929506) for breaking GLContext during a CLOSED TREE

Browse Source
This commit is contained in:
Wes Kocher 2013-11-21 14:55:22 -08:00
parent ac835b7740
commit 639f366712
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gfx/gl/GLTextureImage.cpp
View File

@ -72,8 +72,9 @@ BasicTextureImage::~BasicTextureImage()
// if we don't have a context (either real or shared),
// then they went away when the contex was deleted, because it
// was the only one that had access to it.
if (ctx && ctx->MakeCurrent()) {
ctx->fDeleteTextures(1, &mTexture);
if (ctx && !ctx->IsDestroyed()) {
mGLContext->MakeCurrent();
mGLContext->fDeleteTextures(1, &mTexture);
}
}
@ -697,9 +698,7 @@ CreateBasicTextureImage(GLContext* aGL,
TextureImage::ImageFormat aImageFormat)
{
bool useNearestFilter = aFlags & TextureImage::UseNearestFilter;
if (!aGL->MakeCurrent()) {
return nullptr;
}
aGL->MakeCurrent();
GLuint texture = 0;
aGL->fGenTextures(1, &texture);