From: Matt Keeter <matt.j.keeter@gmail.com>
Date: Fri, 21 Mar 2014 21:31:34 +0000 (-0400)
Subject: Use QGLFunctions to fix OpenGL calls
X-Git-Tag: v0.9.0~8^2~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2cabf7bf9350064253d15e77e2dbd559d75ed427;p=fstl

Use QGLFunctions to fix OpenGL calls
---

diff --git a/src/backdrop.cpp b/src/backdrop.cpp
index 7975f72..13d0aa3 100644
--- 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 53e0074..a2398c8 100644
--- 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 930fd2c..03f9376 100644
--- 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 810c334..64a8dd5 100644
--- 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 8e0cab3..7053809 100644
--- 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 01bf921..74a193f 100644
--- 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);