Changed to simpler fix that doesn't require special version of GLEW

Signed-off-by: Matthew J. Milner <matterhorn103@proton.me>
OpenChemistry · Jan 18, 2024 · e0fd558 · e0fd558
1 parent cc77f32
commit e0fd558
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/avogadro/rendering/glrenderer.cpp b/avogadro/rendering/glrenderer.cpp
@@ -55,8 +55,8 @@ GLRenderer::~GLRenderer()
 
 void GLRenderer::initialize()
 {
-  GLenum result = glewContextInit();
-  m_valid = (result == GLEW_OK);
+  GLenum result = glewInit();
+  m_valid = (result == GLEW_OK || result == GLEW_ERROR_NO_GLX_DISPLAY);
   if (!m_valid) {
     m_error += "GLEW could not be initialized.\n";
     return;

diff --git a/avogadro/vtk/vtkAvogadroActor.cpp b/avogadro/vtk/vtkAvogadroActor.cpp
@@ -36,8 +36,8 @@ vtkAvogadroActor::~vtkAvogadroActor()
 int vtkAvogadroActor::RenderOpaqueGeometry(vtkViewport *)
 {
   if (!m_initialized) {
-    GLenum result = glewContextInit();
-    if (result != GLEW_OK) {
+    GLenum result = glewInit();
+    if (result != GLEW_OK && result != GLEW_ERROR_NO_GLX_DISPLAY) {
       cout << "Error, could not initialize GLEW." << endl;
       return 0;
     }