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

0029058: Coding rules, OpenGl_Window - eliminate memory leak after XGetVisualInfo

Browse Source 
Minor memory leak occurring at creation of the view is eliminated.
This commit is contained in:
kgv 2017-08-27 21:53:16 +03:00 committed by bugmaster
parent 2a9be0e22b
commit 2f690078d7
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/OpenGl/OpenGl_Window.cxx
View File

@ -25,6 +25,8 @@
#include <TCollection_ExtendedString.hxx> #include <TCollection_ExtendedString.hxx>
#include <Graphic3d_GraphicDriver.hxx> #include <Graphic3d_GraphicDriver.hxx>
#include <memory>
IMPLEMENT_STANDARD_RTTIEXT(OpenGl_Window,Standard_Transient) IMPLEMENT_STANDARD_RTTIEXT(OpenGl_Window,Standard_Transient)
#if defined(HAVE_EGL) #if defined(HAVE_EGL)
@ -477,14 +479,14 @@ OpenGl_Window::OpenGl_Window (const Handle(OpenGl_GraphicDriver)& theDriver,
aVisInfo.visualid = aWinAttribs.visual->visualid; aVisInfo.visualid = aWinAttribs.visual->visualid;
aVisInfo.screen = DefaultScreen (aDisp); aVisInfo.screen = DefaultScreen (aDisp);
int aNbItems; int aNbItems;
XVisualInfo* aVis = XGetVisualInfo (aDisp, VisualIDMask | VisualScreenMask, &aVisInfo, &aNbItems); std::unique_ptr<XVisualInfo, int(*)(void*)> aVis (XGetVisualInfo (aDisp, VisualIDMask | VisualScreenMask, &aVisInfo, &aNbItems), &XFree);
int isGl = 0; int isGl = 0;
if (aVis == NULL) if (aVis.get() == NULL)
{ {
throw Aspect_GraphicDeviceDefinitionError("OpenGl_Window::CreateWindow: XGetVisualInfo is unable to choose needed configuration in existing OpenGL context. "); throw Aspect_GraphicDeviceDefinitionError("OpenGl_Window::CreateWindow: XGetVisualInfo is unable to choose needed configuration in existing OpenGL context. ");
return; return;
} }
else if (glXGetConfig (aDisp, aVis, GLX_USE_GL, &isGl) != 0 || !isGl) else if (glXGetConfig (aDisp, aVis.get(), GLX_USE_GL, &isGl) != 0 || !isGl)
{ {
throw Aspect_GraphicDeviceDefinitionError("OpenGl_Window::CreateWindow: window Visual does not support GL rendering!"); throw Aspect_GraphicDeviceDefinitionError("OpenGl_Window::CreateWindow: window Visual does not support GL rendering!");
return; return;
@ -556,7 +558,7 @@ OpenGl_Window::OpenGl_Window (const Handle(OpenGl_GraphicDriver)& theDriver,
if (myOwnGContext if (myOwnGContext
&& aGContext == NULL) && aGContext == NULL)
{ {
aGContext = glXCreateContext (aDisp, aVis, aSlaveCtx, GL_TRUE); aGContext = glXCreateContext (aDisp, aVis.get(), aSlaveCtx, GL_TRUE);
if (aGContext == NULL) if (aGContext == NULL)
{ {
throw Aspect_GraphicDeviceDefinitionError("OpenGl_Window::CreateWindow: glXCreateContext failed."); throw Aspect_GraphicDeviceDefinitionError("OpenGl_Window::CreateWindow: glXCreateContext failed.");
@ -568,11 +570,11 @@ OpenGl_Window::OpenGl_Window (const Handle(OpenGl_GraphicDriver)& theDriver,
TCollection_ExtendedString aList; TCollection_ExtendedString aList;
int isDoubleBuffer = 0, isRGBA = 0, isStereo = 0; int isDoubleBuffer = 0, isRGBA = 0, isStereo = 0;
int aDepthSize = 0, aStencilSize = 0; int aDepthSize = 0, aStencilSize = 0;
glXGetConfig (aDisp, aVis, GLX_RGBA, &isRGBA); glXGetConfig (aDisp, aVis.get(), GLX_RGBA, &isRGBA);
glXGetConfig (aDisp, aVis, GLX_DOUBLEBUFFER, &isDoubleBuffer); glXGetConfig (aDisp, aVis.get(), GLX_DOUBLEBUFFER, &isDoubleBuffer);
glXGetConfig (aDisp, aVis, GLX_STEREO, &isStereo); glXGetConfig (aDisp, aVis.get(), GLX_STEREO, &isStereo);
glXGetConfig (aDisp, aVis, GLX_DEPTH_SIZE, &aDepthSize); glXGetConfig (aDisp, aVis.get(), GLX_DEPTH_SIZE, &aDepthSize);
glXGetConfig (aDisp, aVis, GLX_STENCIL_SIZE, &aStencilSize); glXGetConfig (aDisp, aVis.get(), GLX_STENCIL_SIZE, &aStencilSize);
if (aDepthSize < 1) addMsgToList (aList, "no depth buffer"); if (aDepthSize < 1) addMsgToList (aList, "no depth buffer");
if (aStencilSize < 1) addMsgToList (aList, "no stencil buffer"); if (aStencilSize < 1) addMsgToList (aList, "no stencil buffer");
if (isRGBA == 0) addMsgToList (aList, "no RGBA color buffer"); if (isRGBA == 0) addMsgToList (aList, "no RGBA color buffer");