OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-05-21 10:55:33 +03:00
Code

0024297: OpenGl_Texture::Release() might call OpenGL functions without active context

Browse Source 
Add check to Release() method of OpenGl_Texture, OpenGl_ShaderObject, OpenGl_ShaderProgram
This commit is contained in:
kgv 2013-10-29 14:10:28 +04:00 committed by bugmaster
parent d0cc1cb7e0
commit ec2eeb2dfa
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/OpenGl/OpenGl_ShaderObject.cxx
View File

@ -139,7 +139,8 @@ void OpenGl_ShaderObject::Release (const OpenGl_Context* theCtx)
Standard_ASSERT_RETURN (theCtx != NULL, Standard_ASSERT_RETURN (theCtx != NULL,
"OpenGl_ShaderObject destroyed without GL context! Possible GPU memory leakage...",); "OpenGl_ShaderObject destroyed without GL context! Possible GPU memory leakage...",);
if (theCtx->core20 != NULL) if (theCtx->core20 != NULL
&& theCtx->IsValid())
{ {
theCtx->core20->glDeleteShader (myShaderID); theCtx->core20->glDeleteShader (myShaderID);
} }

3
src/OpenGl/OpenGl_ShaderProgram.cxx
View File

@ -1120,7 +1120,8 @@ void OpenGl_ShaderProgram::Release (const OpenGl_Context* theCtx)
anIter.ChangeValue().Nullify(); anIter.ChangeValue().Nullify();
} }
if (theCtx->core20 != NULL) if (theCtx->core20 != NULL
&& theCtx->IsValid())
{ {
theCtx->core20->glDeleteProgram (myProgramID); theCtx->core20->glDeleteProgram (myProgramID);
} }

5
src/OpenGl/OpenGl_Texture.cxx
View File

@ -111,7 +111,10 @@ void OpenGl_Texture::Release (const OpenGl_Context* theGlCtx)
Standard_ASSERT_RETURN (theGlCtx != NULL, Standard_ASSERT_RETURN (theGlCtx != NULL,
"OpenGl_Texture destroyed without GL context! Possible GPU memory leakage...",); "OpenGl_Texture destroyed without GL context! Possible GPU memory leakage...",);
glDeleteTextures (1, &myTextureId); if (theGlCtx->IsValid())
{
glDeleteTextures (1, &myTextureId);
}
myTextureId = NO_TEXTURE; myTextureId = NO_TEXTURE;
mySizeX = mySizeY = 0; mySizeX = mySizeY = 0;
} }