Added sensible destruction of vector array object to gl3widget

palaeoware · Apr 10, 2020 · a827cf4 · a827cf4
1 parent 7a1072e
commit a827cf4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/SPIERSview/src/gl3widget.cpp b/SPIERSview/src/gl3widget.cpp
@@ -67,6 +67,11 @@ GlWidget::~GlWidget()
     lightingShaderProgramForColour.release();
     lightingShaderProgram.deleteLater();
     lightingShaderProgramForColour.deleteLater();
+
+#ifdef __APPLE__
+    vao.release();
+    vao.deleteLater();
+#endif
 }
 
 /**
@@ -87,8 +92,8 @@ void GlWidget::initializeGL()
 #ifdef __APPLE__
     // OpenGL version 3.x+ requires the VertexArrayBuffer to be created and bound at initialization.
     // Current only needed for macOS
-    m_vao.create();
-    m_vao.bind();
+    vao.create();
+    vao.bind();
 #endif
 
 #ifdef __APPLE__

diff --git a/SPIERSview/src/gl3widget.h b/SPIERSview/src/gl3widget.h
@@ -59,7 +59,7 @@ class GlWidget : public QOpenGLWidget, protected QOpenGLFunctions
     int xdim;
     int ydim;
 
-    QOpenGLVertexArrayObject m_vao;
+    QOpenGLVertexArrayObject vao;
     QOpenGLFunctions *glfunctions;
     QOpenGLShaderProgram lightingShaderProgram;
     QOpenGLShaderProgram lightingShaderProgramForColour;