Commit 050a4a94 authored by Peter Karasev's avatar Peter Karasev Committed by Kitware Robot

Merge topic 'qt5_win64_opengl_pixel_format_error'

b4138f4d STY: fix vtkErrorMacro and linelength
2f6915f6 remove incorrect error popup (QT5 + local build + OpenGL 4.x)
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !397
parents 8f68f6c1 b4138f4d
......@@ -690,17 +690,15 @@ void vtkWin32OpenGLRenderWindow::SetupPixelFormatPaletteAndContext(
{
DescribePixelFormat(hDC, currentPixelFormat,sizeof(pfd2), &pfd2);
if (!(pfd2.dwFlags & PFD_SUPPORT_OPENGL))
{
vtkDebugWithObjectMacro(this,"DescribePixelFormat failed; either invalid format or illegal multiple Win32 OpenGL initialize calls.");
{ // @note see https://msdn.microsoft.com/en-us/library/windows/desktop/dd369049(v=vs.85).aspx
// "Once a window's pixel format is set, it cannot be changed."
vtkErrorMacro("Call to DescribePixelFormat failed. "
"Illegal duplicate invocation or no OpenGL support.");
if (this->HasObserver(vtkCommand::ExitEvent))
{
this->InvokeEvent(vtkCommand::ExitEvent, NULL);
return;
}
else
{
return;
}
}
}
else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment