OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-24 13:50:49 +03:00
Code Activity

0023172: Added workaround for BUGs in Intel OpenGL drivers

Browse Source 
Check GL context already bound before wglMakeCurrent() call.
This commit is contained in:
kgv
2012-05-24 10:03:23 +04:00
parent 90dc2e5b07
commit 86fa64d971
4 changed files with 81 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/OpenGl/OpenGl_Window.cxx
View File

@@ -400,8 +400,12 @@ OpenGl_Window::OpenGl_Window (const Handle(OpenGl_Display)& theDisplay,
myWindow = aParent;
#endif
#if (defined(_WIN32) || defined(__WIN32__))
myGlContext->Init (myWindow, myWindowDC, myGContext);
#else
myGlContext->Init (myWindow, myDisplay->GetDisplay(), myGContext);
#endif
Init();
myGlContext->Init();
}
// =======================================================================
@@ -463,28 +467,7 @@ OpenGl_Window::~OpenGl_Window()
// =======================================================================
Standard_Boolean OpenGl_Window::Activate()
{
DISPLAY* aDisp = (DISPLAY* )myDisplay->GetDisplay();
if (aDisp == NULL)
return Standard_False;
#if (defined(_WIN32) || defined(__WIN32__))
if (!wglMakeCurrent (myWindowDC, myGContext))
{
//GLenum errorcode = glGetError();
//const GLubyte *errorstring = gluErrorString(errorcode);
//printf("wglMakeCurrent failed: %d %s\n", errorcode, errorstring);
return Standard_False;
}
#else
if (!glXMakeCurrent (aDisp, myWindow, myGContext))
{
// if there is no current context it might be impossible to use glGetError correctly
//printf("glXMakeCurrent failed!\n");
return Standard_False;
}
#endif
return Standard_True;
return myGlContext->MakeCurrent();
}
// =======================================================================