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

0026128: Visualization, TKOpenGl - fix misprint in external GLX context initialization

Browse Source 
OpenGl_Window, GLX - push warning about missing caps in window Visual.
Allow initialization of alien GLX context.

Correction of misprinting
This commit is contained in:
solomin_s 2015-05-06 17:05:39 +03:00 committed by bugmaster
parent 1c22cc2d27
commit 95db72f1f6
1 changed files with 95 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
src/OpenGl/OpenGl_Window.cxx
View File

@ -459,11 +459,97 @@ OpenGl_Window::OpenGl_Window (const Handle(OpenGl_GraphicDriver)& theDriver,
aVis = XGetVisualInfo (aDisp, aVisInfoMask, &aVisInfo, &aNbItems); aVis = XGetVisualInfo (aDisp, aVisInfoMask, &aVisInfo, &aNbItems);
} }
#if defined(__linux) || defined(Linux) || defined(__APPLE__)
if (aVis != NULL)
{
// check Visual for OpenGl context's parameters compatibility
int isGl = 0, isDoubleBuffer = 0, isRGBA = 0, isStereo = 0;
int aDepthSize = 0, aStencilSize = 0;
if (glXGetConfig (aDisp, aVis, GLX_USE_GL, &isGl) != 0)
isGl = 0;
if (glXGetConfig (aDisp, aVis, GLX_RGBA, &isRGBA) != 0)
isRGBA = 0;
if (glXGetConfig (aDisp, aVis, GLX_DOUBLEBUFFER, &isDoubleBuffer) != 0)
isDoubleBuffer = 0;
if (glXGetConfig (aDisp, aVis, GLX_STEREO, &isStereo) != 0)
isStereo = 0;
if (glXGetConfig (aDisp, aVis, GLX_DEPTH_SIZE, &aDepthSize) != 0)
aDepthSize = 0;
if (glXGetConfig (aDisp, aVis, GLX_STENCIL_SIZE, &aStencilSize) != 0)
aStencilSize = 0;
if (!isGl)
{
XFree (aVis);
aVis = NULL;
if (myOwnGContext)
{
TCollection_ExtendedString aMsg ("OpenGl_Window::CreateWindow: window Visual does not support GL rendering!");
myGlContext->PushMessage (GL_DEBUG_SOURCE_APPLICATION_ARB,
GL_DEBUG_TYPE_OTHER_ARB,
0, GL_DEBUG_SEVERITY_HIGH_ARB, aMsg);
}
}
else
{
TCollection_ExtendedString aList;
if (aDepthSize < 1)
{
if (!aList.IsEmpty()) aList += ", ";
aList += "no depth buffer";
}
if (aStencilSize < 1)
{
if (!aList.IsEmpty()) aList += ", ";
aList += "no stencil buffer";
}
if (isRGBA == 0)
{
if (!aList.IsEmpty()) aList += ", ";
aList += "no RGBA color buffer";
}
if (isDoubleBuffer == 0)
{
if (!aList.IsEmpty()) aList += ", ";
aList += "no Double Buffer";
}
if (theCaps->contextStereo && isStereo == 0)
{
if (!aList.IsEmpty()) aList += ", ";
aList += "no Quad Buffer";
}
if (!theCaps->contextStereo && isStereo == 1)
{
if (!aList.IsEmpty()) aList += ", ";
aList += "extra Quad Buffer";
}
if (!aList.IsEmpty())
{
TCollection_ExtendedString aMsg = TCollection_ExtendedString ("OpenGl_Window::CreateWindow: window Visual is incomplete: ") + aList;
if (myOwnGContext)
{
XFree (aVis);
aVis = NULL;
}
myGlContext->PushMessage (GL_DEBUG_SOURCE_APPLICATION_ARB,
GL_DEBUG_TYPE_OTHER_ARB,
0, GL_DEBUG_SEVERITY_MEDIUM_ARB, aMsg);
}
}
}
#endif
if (!myOwnGContext) if (!myOwnGContext)
{ {
if (aVis != NULL) if (aVis == NULL)
{ {
Aspect_GraphicDeviceDefinitionError::Raise ("OpenGl_Window::CreateWindow: XGetVisualInfo failed."); Aspect_GraphicDeviceDefinitionError::Raise ("OpenGl_Window::CreateWindow: XGetVisualInfo is unable to choose needed configuration in existing OpenGL context. ");
return; return;
} }
@ -471,41 +557,6 @@ OpenGl_Window::OpenGl_Window (const Handle(OpenGl_GraphicDriver)& theDriver,
} }
else else
{ {
#if defined(__linux) || defined(Linux) || defined(__APPLE__)
if (aVis != NULL)
{
// check Visual for OpenGl context's parameters compatibility
int isGl = 0, isDoubleBuffer = 0, isRGBA = 0, isStereo = 0;
int aDepthSize = 0, aStencilSize = 0;
if (glXGetConfig (aDisp, aVis, GLX_USE_GL, &isGl) != 0)
isGl = 0;
if (glXGetConfig (aDisp, aVis, GLX_RGBA, &isRGBA) != 0)
isRGBA = 0;
if (glXGetConfig (aDisp, aVis, GLX_DOUBLEBUFFER, &isDoubleBuffer) != 0)
isDoubleBuffer = 0;
if (glXGetConfig (aDisp, aVis, GLX_STEREO, &isStereo) != 0)
isStereo = 0;
if (glXGetConfig (aDisp, aVis, GLX_DEPTH_SIZE, &aDepthSize) != 0)
aDepthSize = 0;
if (glXGetConfig (aDisp, aVis, GLX_STENCIL_SIZE, &aStencilSize) != 0)
aStencilSize = 0;
if (!isGl || !aDepthSize || !isRGBA || !aStencilSize ||
(isDoubleBuffer ? 1 : 0) != 1 ||
(isStereo ? 1 : 0) != (theCaps->contextStereo ? 1 : 0))
{
XFree (aVis);
aVis = NULL;
}
}
#endif
if (aVis == NULL) if (aVis == NULL)
{ {
int anIter = 0; int anIter = 0;
@ -557,6 +608,13 @@ OpenGl_Window::OpenGl_Window (const Handle(OpenGl_GraphicDriver)& theDriver,
Aspect_GraphicDeviceDefinitionError::Raise ("OpenGl_Window::CreateWindow: glXChooseVisual failed."); Aspect_GraphicDeviceDefinitionError::Raise ("OpenGl_Window::CreateWindow: glXChooseVisual failed.");
return; return;
} }
else
{
TCollection_ExtendedString aMsg ("OpenGl_Window::CreateWindow: child window has been created with better Visual.");
myGlContext->PushMessage (GL_DEBUG_SOURCE_APPLICATION_ARB,
GL_DEBUG_TYPE_OTHER_ARB,
0, GL_DEBUG_SEVERITY_MEDIUM_ARB, aMsg);
}
} }
if (!theShareCtx.IsNull()) if (!theShareCtx.IsNull())