Commit 85c21641 authored by Ken Martin's avatar Ken Martin Committed by Kitware Robot

Merge topic 'change_osx_supports_opengl'

fad05318 make OSX use the generic superclass SupportsOpenGL
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Reviewed-by: Berk Geveci's avatarBerk Geveci <berk.geveci@kitware.com>
Merge-request: !1280
parents 3b5e34da fad05318
......@@ -188,10 +188,6 @@ public:
// Get report of capabilities for the render window
const char *ReportCapabilities();
// Description:
// Does this render window support OpenGL? 0-false, 1-true
int SupportsOpenGL();
// Description:
// Is this render window using hardware acceleration? 0-false, 1-true
int IsDirect();
......
......@@ -467,30 +467,6 @@ const char* vtkCocoaRenderWindow::ReportCapabilities()
return this->Capabilities;
}
//----------------------------------------------------------------------------
int vtkCocoaRenderWindow::SupportsOpenGL()
{
#ifdef GLEW_OK
this->CreateGLContext();
this->MakeCurrent();
GLenum result = glewInit();
bool m_valid = (result == GLEW_OK);
if (!m_valid)
{
return 0;
}
if (GLEW_VERSION_3_2 || (GLEW_VERSION_2_1 && GLEW_EXT_gpu_shader4))
{
return 1;
}
#endif
return 0;
}
//----------------------------------------------------------------------------
int vtkCocoaRenderWindow::IsDirect()
{
......
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