Use QGLFunctions to fix OpenGL calls

diff --git a/src/backdrop.cpp b/src/backdrop.cpp
index 7975f72e5de8f0e1c7aed9fdc46c0189e2748d54..13d0aa39ae7e22b54978a79eaf4d661830d06ce1 100644 (file)
--- a/src/backdrop.cpp
+++ b/src/backdrop.cpp
@@ -2,6 +2,8 @@
 
 Backdrop::Backdrop()
 {
+    initializeGLFunctions();
+
     shader.addShaderFromSourceFile(QGLShader::Vertex, ":/gl/quad.vert");
     shader.addShaderFromSourceFile(QGLShader::Fragment, ":/gl/quad.frag");
     shader.link();

diff --git a/src/backdrop.h b/src/backdrop.h
index 53e007483af3093812b4e8aea1d9db78f6cb95c4..a2398c82ac546096997edd113a86b0601623c780 100644 (file)
--- a/src/backdrop.h
+++ b/src/backdrop.h
@@ -1,10 +1,11 @@
 #ifndef BACKDROP_H
 #define BACKDROP_H
 
+#include <QtOpenGL/QGLFunctions>
 #include <QtOpenGL/QGLShaderProgram>
 #include <QtOpenGL/QGLBuffer>
 
-class Backdrop
+class Backdrop : protected QGLFunctions
 {
 public:
     Backdrop();

diff --git a/src/canvas.cpp b/src/canvas.cpp
index 930fd2cde13402b6c0b2bbd37eb803103fdf6a6f..03f9376b763a633c6c228ffede233fc47dd03c93 100644 (file)
--- a/src/canvas.cpp
+++ b/src/canvas.cpp
@@ -49,6 +49,8 @@ void Canvas::clear_status()
 
 void Canvas::initializeGL()
 {
+    initializeGLFunctions();
+
     mesh_shader.addShaderFromSourceFile(QGLShader::Vertex, ":/gl/mesh.vert");
     mesh_shader.addShaderFromSourceFile(QGLShader::Fragment, ":/gl/mesh.frag");
     mesh_shader.link();

diff --git a/src/canvas.h b/src/canvas.h
index 810c334d7cb6acf531805b8f15d5277083235f19..64a8dd5cff71c8a2dd96fed7df664a4016e5d486 100644 (file)
--- a/src/canvas.h
+++ b/src/canvas.h
@@ -3,6 +3,7 @@
 
 #include <QWidget>
 #include <QtOpenGL/QGLWidget>
+#include <QtOpenGL/QGLFunctions>
 #include <QtOpenGL/QGLShaderProgram>
 #include <QMatrix4x4>
 
@@ -10,7 +11,7 @@ class GLMesh;
 class Mesh;
 class Backdrop;
 
-class Canvas : public QGLWidget
+class Canvas : public QGLWidget, protected QGLFunctions
 {
     Q_OBJECT
 

diff --git a/src/glmesh.cpp b/src/glmesh.cpp
index 8e0cab3a9f4f5fb14c550c69fd9aa8dce464a531..7053809e178f652c6500bb665e3b747853da96bb 100644 (file)
--- a/src/glmesh.cpp
+++ b/src/glmesh.cpp
@@ -4,6 +4,8 @@
 GLMesh::GLMesh(const Mesh* const mesh)
     : vertices(QGLBuffer::VertexBuffer), indices(QGLBuffer::IndexBuffer)
 {
+    initializeGLFunctions();
+
     vertices.create();
     indices.create();
 

diff --git a/src/glmesh.h b/src/glmesh.h
index 01bf921838224ca36766ed5fc2b38ca310a0043d..74a193f93dce7f5fede53c3dd91ef0885661b6a6 100644 (file)
--- a/src/glmesh.h
+++ b/src/glmesh.h
@@ -2,10 +2,11 @@
 #define GLMESH_H
 
 #include <QtOpenGL/QGLBuffer>
+#include <QtOpenGL/QGLFunctions>
 
 class Mesh;
 
-class GLMesh
+class GLMesh : protected QGLFunctions
 {
 public:
     GLMesh(const Mesh* const mesh);