OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

0032221: Visualization, TKD3DHost - fix memory leak within D3DHost_FrameBuffer::Release()

Browse Source 
D3DHost_FrameBuffer - added missing color texture release within FBO destruction.
OpenGl_View::RedrawImmediate() - fixed unexpected window buffer swap while rendering into offscreen myFBO.
This commit is contained in:
kgv 2021-03-17 09:54:27 +03:00 committed by bugmaster
parent 9b329b9aa4
commit 655e883cb9
5 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/D3DHost/D3DHost_FrameBuffer.cxx
View File

@ -245,6 +245,7 @@ Standard_Boolean D3DHost_FrameBuffer::registerD3dBuffer (const Handle(OpenGl_Con
return Standard_False; return Standard_False;
} }
myIsOwnColor = true;
myColorTextures (0)->Release (theCtx.operator->()); myColorTextures (0)->Release (theCtx.operator->());
myColorTextures (0)->Create (theCtx); myColorTextures (0)->Create (theCtx);

20
src/D3DHost/D3DHost_View.cxx
View File

@ -87,11 +87,7 @@ D3DHost_View::D3DHost_View (const Handle(Graphic3d_StructureManager)& theMgr,
// ======================================================================= // =======================================================================
D3DHost_View::~D3DHost_View() D3DHost_View::~D3DHost_View()
{ {
if (!myD3dWglFbo.IsNull()) ReleaseGlResources (NULL);
{
myD3dWglFbo->Release (myWorkspace->GetGlContext().operator->());
myD3dWglFbo.Nullify();
}
if (myD3dDevice != NULL) if (myD3dDevice != NULL)
{ {
myD3dDevice->Release(); myD3dDevice->Release();
@ -104,6 +100,20 @@ D3DHost_View::~D3DHost_View()
} }
} }
// =======================================================================
// function : ReleaseGlResources
// purpose :
// =======================================================================
void D3DHost_View::ReleaseGlResources (const Handle(OpenGl_Context)& theCtx)
{
if (!myD3dWglFbo.IsNull())
{
myD3dWglFbo->Release (theCtx.get());
myD3dWglFbo.Nullify();
}
OpenGl_View::ReleaseGlResources (theCtx);
}
// ======================================================================= // =======================================================================
// function : D3dColorSurface // function : D3dColorSurface
// purpose : // purpose :

3
src/D3DHost/D3DHost_View.hxx
View File

@ -40,6 +40,9 @@ public:
//! Default destructor. //! Default destructor.
Standard_EXPORT virtual ~D3DHost_View(); Standard_EXPORT virtual ~D3DHost_View();
//! Release OpenGL resources.
Standard_EXPORT virtual void ReleaseGlResources (const Handle(OpenGl_Context)& theCtx) Standard_OVERRIDE;
//! Creates and maps rendering window to the view. //! Creates and maps rendering window to the view.
//! @param theWindow [in] the window. //! @param theWindow [in] the window.
//! @param theContext [in] the rendering context. If NULL the context will be created internally. //! @param theContext [in] the rendering context. If NULL the context will be created internally.

5
src/OpenGl/OpenGl_View.cxx
View File

@ -1847,6 +1847,7 @@ void OpenGl_View::RedrawImmediate()
Standard_True) || toSwap; Standard_True) || toSwap;
if (aStereoMode == Graphic3d_StereoMode_SoftPageFlip if (aStereoMode == Graphic3d_StereoMode_SoftPageFlip
&& toSwap && toSwap
&& myFBO.get() == NULL
&& !aCtx->caps->buffersNoSwap) && !aCtx->caps->buffersNoSwap)
{ {
aCtx->SwapBuffers(); aCtx->SwapBuffers();
@ -1914,7 +1915,9 @@ void OpenGl_View::RedrawImmediate()
aCtx->ShaderManager()->PushState (Handle(OpenGl_ShaderProgram)()); aCtx->ShaderManager()->PushState (Handle(OpenGl_ShaderProgram)());
} }
if (toSwap && !aCtx->caps->buffersNoSwap) if (toSwap
&& myFBO.get() == NULL
&& !aCtx->caps->buffersNoSwap)
{ {
aCtx->SwapBuffers(); aCtx->SwapBuffers();
} }

2
src/OpenGl/OpenGl_View.hxx
View File

@ -84,7 +84,7 @@ public:
Standard_EXPORT virtual ~OpenGl_View(); Standard_EXPORT virtual ~OpenGl_View();
//! Release OpenGL resources. //! Release OpenGL resources.
Standard_EXPORT void ReleaseGlResources (const Handle(OpenGl_Context)& theCtx); Standard_EXPORT virtual void ReleaseGlResources (const Handle(OpenGl_Context)& theCtx);
//! Deletes and erases the view. //! Deletes and erases the view.
Standard_EXPORT virtual void Remove() Standard_OVERRIDE; Standard_EXPORT virtual void Remove() Standard_OVERRIDE;