summaryrefslogtreecommitdiffstats
path: root/src/waveform/renderers/glwaveformrenderersimplesignal.cpp
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2019-04-30 22:54:25 +0200
committerDaniel Schürmann <daschuer@mixxx.org>2019-05-08 00:26:33 +0200
commitb7ce2776303716956926e2722e8861a7021c94d2 (patch)
tree63ad4238cbaf6874c04f09160ce9f3153da75a2e /src/waveform/renderers/glwaveformrenderersimplesignal.cpp
parent452f64d21c8a6f350fcf59d7ca575f657ef526f8 (diff)
dynamic load gl functions, removed workaround with scons OpenGLES feature
Diffstat (limited to 'src/waveform/renderers/glwaveformrenderersimplesignal.cpp')
-rw-r--r--src/waveform/renderers/glwaveformrenderersimplesignal.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/waveform/renderers/glwaveformrenderersimplesignal.cpp b/src/waveform/renderers/glwaveformrenderersimplesignal.cpp
index 4ac046a589..e57673cf9a 100644
--- a/src/waveform/renderers/glwaveformrenderersimplesignal.cpp
+++ b/src/waveform/renderers/glwaveformrenderersimplesignal.cpp
@@ -6,12 +6,11 @@
#include "waveform/waveformwidgetfactory.h"
#include "util/math.h"
-#include <qgl.h>
GLWaveformRendererSimpleSignal::GLWaveformRendererSimpleSignal(
WaveformWidgetRenderer* waveformWidgetRenderer)
- : WaveformRendererSignalBase(waveformWidgetRenderer) {
-
+ : WaveformRendererSignalBase(waveformWidgetRenderer) {
+ initializeOpenGLFunctions();
}
GLWaveformRendererSimpleSignal::~GLWaveformRendererSimpleSignal() {
@@ -60,8 +59,6 @@ void GLWaveformRendererSimpleSignal::draw(QPainter* painter, QPaintEvent* /*even
// Reset device for native painting
painter->beginNativePainting();
-#ifndef __OPENGLES__
-
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -159,7 +156,5 @@ void GLWaveformRendererSimpleSignal::draw(QPainter* painter, QPaintEvent* /*even
glMatrixMode(GL_PROJECTION);
glPopMatrix();
-#endif
-
painter->endNativePainting();
}