Commit d684842a authored by Cory Quammen's avatar Cory Quammen Committed by Kitware Robot
Browse files

Merge topic 'add_apple_system_to_whitelist'

0e0760d5

 Added another valid OpenGL version string
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Reviewed-by: Ken Martin's avatarKen Martin <ken.martin@kitware.com>
Merge-request: !1245
parents 524ba39d 0e0760d5
......@@ -663,6 +663,7 @@ bool vtkOpenGLRenderer::HaveApplePrimitiveIdBug()
#ifdef __APPLE__
// working AMD APPLE systems
// OpenGL vendor string: ATI Technologies Inc.
// OpenGL version string: 4.1 ATI-1.38.3
// OpenGL version string: 4.1 ATI-1.40.15
// OpenGL renderer string: AMD Radeon R9 M370X OpenGL Engine
// OpenGL version string: 4.1 ATI-1.40.16
......@@ -686,7 +687,8 @@ bool vtkOpenGLRenderer::HaveApplePrimitiveIdBug()
std::string renderer = (const char *)glGetString(GL_RENDERER);
std::string version = (const char *)glGetString(GL_VERSION);
if (
(version.find("4.1 ATI-1.40.15") != std::string::npos &&
((version.find("4.1 ATI-1.38.3") != std::string::npos ||
version.find("4.1 ATI-1.40.15") != std::string::npos) &&
(renderer.find("AMD Radeon R9 M370X OpenGL Engine") != std::string::npos)) ||
(version.find("4.1 ATI-1.40.16") != std::string::npos &&
(renderer.find("ATI Radeon HD 5770 OpenGL Engine") != std::string::npos ||
......
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