derive wspinnyglsl and wvumeterglsl and QOpenGLFunctions and call ini…

…tOpenGLFunctions
m0dB · Sep 19, 2023 · 42fac9d · 42fac9d
1 parent ee90380
commit 42fac9d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/src/widget/wspinnyglsl.cpp b/src/widget/wspinnyglsl.cpp
@@ -155,6 +155,8 @@ void WSpinnyGLSL::paintGL() {
 }
 
 void WSpinnyGLSL::initializeGL() {
+    initializeOpenGLFunctions();
+
     updateTextures();
 
     m_pQTexture.reset(new QOpenGLTexture(QOpenGLTexture::Target2D));

diff --git a/src/widget/wspinnyglsl.h b/src/widget/wspinnyglsl.h
@@ -1,12 +1,13 @@
 #pragma once
 
+#include <QOpenGLFunctions>
 #include <QOpenGLTexture>
 
 #include "shaders/textureshader.h"
 #include "shaders/vinylqualityshader.h"
 #include "widget/wspinnybase.h"
 
-class WSpinnyGLSL : public WSpinnyBase {
+class WSpinnyGLSL : public WSpinnyBase, private QOpenGLFunctions {
   public:
     WSpinnyGLSL(QWidget* parent,
             const QString& group,

diff --git a/src/widget/wvumeterglsl.cpp b/src/widget/wvumeterglsl.cpp
@@ -22,6 +22,8 @@ void WVuMeterGLSL::draw() {
 }
 
 void WVuMeterGLSL::initializeGL() {
+    initializeOpenGLFunctions();
+
     m_pTextureBack.reset(createTexture(m_pPixmapBack));
     m_pTextureVu.reset(createTexture(m_pPixmapVu));
     m_textureShader.init();

diff --git a/src/widget/wvumeterglsl.h b/src/widget/wvumeterglsl.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <QOpenGLFunctions>
 #include <QOpenGLTexture>
 #include <memory>
 
@@ -8,7 +9,7 @@
 #include "widget/wvumeterbase.h"
 #include "widget/wwidget.h"
 
-class WVuMeterGLSL : public WVuMeterBase {
+class WVuMeterGLSL : public WVuMeterBase, private QOpenGLFunctions {
     Q_OBJECT
   public:
     explicit WVuMeterGLSL(QWidget* pParent = nullptr);