From 934e6b25927e13ad69a63c30b409b024c69d50f4 Mon Sep 17 00:00:00 2001 From: ccolin Date: Sat, 2 Jan 2021 16:00:44 +0100 Subject: [PATCH] improve opengl portability --- src/opengl_mesh.cc | 2 +- src/opengl_widget.hh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/opengl_mesh.cc b/src/opengl_mesh.cc index f2f0981..01a73ff 100644 --- a/src/opengl_mesh.cc +++ b/src/opengl_mesh.cc @@ -7,7 +7,7 @@ OpenGLMesh::OpenGLMesh(QVector verts, QOpenGLTexture *tex) :tex(tex) { OpenGLWidget::instance->makeCurrent(); - QOpenGLFunctions_4_4_Core *glf = OpenGLWidget::instance; + QOpenGLExtraFunctions *glf = OpenGLWidget::instance; nverts = verts.size() / 8; glf->glGenVertexArrays(1, &vao); glf->glBindVertexArray(vao); diff --git a/src/opengl_widget.hh b/src/opengl_widget.hh index 5ee1057..785a17f 100644 --- a/src/opengl_widget.hh +++ b/src/opengl_widget.hh @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include #include @@ -13,7 +13,7 @@ #define FOV 70 -class OpenGLWidget : public QOpenGLWidget, public QOpenGLFunctions_4_4_Core { +class OpenGLWidget : public QOpenGLWidget, public QOpenGLExtraFunctions { Q_OBJECT QMatrix4x4 rot, rot_start, proj;