Fix crash when no GL context is available

src/mixxxmainwindow.cpp

@@ -1,22 +1,25 @@
 #include "mixxxmainwindow.h"
 
+#include <QDebug>
 #include <QDesktopServices>
 #include <QFileDialog>
+#include <QOpenGLContext>
+#include <QUrl>
 
-#include "widget/wglwidget.h"
-
-#ifdef MIXXX_USE_QOPENGL
-#include "widget/tooltipqopengl.h"
-#include "widget/winitialglwidget.h"
-#else
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <QGLFormat>
 #endif
 
-#include <QUrl>
 #ifdef __LINUX__
 #include <QtDBus>
 #endif
-#include <QtDebug>
+
+#include "widget/wglwidget.h"
+
+#ifdef MIXXX_USE_QOPENGL
+#include "widget/tooltipqopengl.h"
+#include "widget/winitialglwidget.h"
+#endif
 
 #include "dialog/dlgabout.h"
 #include "dialog/dlgdevelopertools.h"
@@ -149,22 +152,36 @@ MixxxMainWindow::MixxxMainWindow(std::shared_ptr<mixxx::CoreServices> pCoreServi
 
 #ifdef MIXXX_USE_QOPENGL
 void MixxxMainWindow::initializeQOpenGL() {
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    // Qt 6 will nno longer crash if no GL is available and
+    // QGLFormat::hasOpenGL() has been removed.
+    if (!CmdlineArgs::Instance().getSafeMode() && QGLFormat::hasOpenGL()) {
+#else
     if (!CmdlineArgs::Instance().getSafeMode()) {
-        // This widget and its QOpenGLWindow will be used to query QOpenGL
-        // information (version, driver, etc) in WaveformWidgetFactory.
-        // The "SharedGLContext" terminology here doesn't really apply,
-        // but allows us to take advantage of the existing classes.
-        WInitialGLWidget* widget = new WInitialGLWidget(this);
-        widget->setGeometry(QRect(0, 0, 3, 3));
-        SharedGLContext::setWidget(widget);
-        // When the widget's QOpenGLWindow has been initialized, we continue
-        // with the actual initialization
-        connect(widget, &WInitialGLWidget::onInitialized, this, &MixxxMainWindow::initialize);
-        widget->show();
-        // note: the format is set in the WGLWidget's OpenGLWindow constructor
-    } else {
-        initialize();
+#endif
+        QSurfaceFormat format;
+        format.setVersion(2, 1);
+        format.setProfile(QSurfaceFormat::CoreProfile);
+        QOpenGLContext context;
+        context.setFormat(format);
+        if (context.create()) {
+            // This widget and its QOpenGLWindow will be used to query QOpenGL
+            // information (version, driver, etc) in WaveformWidgetFactory.
+            // The "SharedGLContext" terminology here doesn't really apply,
+            // but allows us to take advantage of the existing classes.
+            WInitialGLWidget* widget = new WInitialGLWidget(this);
+            widget->setGeometry(QRect(0, 0, 3, 3));
+            SharedGLContext::setWidget(widget);
+            // When the widget's QOpenGLWindow has been initialized, we continue
+            // with the actual initialization
+            connect(widget, &WInitialGLWidget::onInitialized, this, &MixxxMainWindow::initialize);
+            widget->show();
+            // note: the format is set in the WGLWidget's OpenGLWindow constructor
+            return;
+        }
     }
+    // Initialize without OpenGL.
+    initialize();
 }
 #endif
 

src/waveform/sharedglcontext.cpp

@@ -14,10 +14,7 @@ WGLWidget* SharedGLContext::s_pSharedGLWidget = nullptr;
 // static
 void SharedGLContext::setWidget(WGLWidget* pWidget) {
     s_pSharedGLWidget = pWidget;
-#ifdef MIXXX_USE_QOPENGL
-    qDebug() << "Set root GL Context widget valid:"
-             << pWidget << (pWidget && pWidget->isContextValid());
-#else
+#ifndef MIXXX_USE_QOPENGL
     qDebug() << "Set root GL Context widget valid:"
              << pWidget << (pWidget && pWidget->isValid());
     if (pWidget) {

src/waveform/waveformwidgetfactory.cpp

@@ -174,7 +174,6 @@ WaveformWidgetFactory::WaveformWidgetFactory()
             m_openGLVersion += majorVersion == 0 ? QString("None") : versionString;
 
             if (majorVersion * 100 + minorVersion >= 201) {
-                m_openGlAvailable = true;
                 if (pContext->isOpenGLES()) {
                     m_openGlesAvailable = true;
                 } else {
@@ -185,6 +184,8 @@ WaveformWidgetFactory::WaveformWidgetFactory()
             if (!rendererString.isEmpty()) {
                 m_openGLVersion += " (" + rendererString + ")";
             }
+        } else {
+            qDebug() << "QOpenGLContext::currentContext() returns nullptr";
         }
         widget->doneCurrent();
         widget->hide();
@@ -818,16 +819,15 @@ void WaveformWidgetFactory::swap() {
 }
 
 WaveformWidgetType::Type WaveformWidgetFactory::autoChooseWidgetType() const {
-    if (m_openGlAvailable) {
-        if (m_openGLShaderAvailable) {
+    if (isOpenGlShaderAvailable()) {
 #ifndef MIXXX_USE_QOPENGL
-            return WaveformWidgetType::GLSLRGBWaveform;
+        return WaveformWidgetType::GLSLRGBWaveform;
 #else
-            return WaveformWidgetType::AllShaderRGBWaveform;
+        return WaveformWidgetType::AllShaderRGBWaveform;
 #endif
-        } else {
-            return WaveformWidgetType::GLRGBWaveform;
-        }
+    }
+    if (isOpenGlAvailable() || isOpenGlesAvailable()) {
+        return WaveformWidgetType::GLRGBWaveform;
     }
     return WaveformWidgetType::RGBWaveform;
 }

src/waveform/widgets/glrgbwaveformwidget.cpp

@@ -14,10 +14,6 @@
 
 GLRGBWaveformWidget::GLRGBWaveformWidget(const QString& group, QWidget* parent)
         : GLWaveformWidgetAbstract(group, parent) {
-    qDebug() << "Created WGLWidget. Context"
-             << "Valid:" << isContextValid()
-             << "Sharing:" << isContextSharing();
-
     addRenderer<GLWaveformRenderBackground>();
     addRenderer<WaveformRendererEndOfTrack>();
     addRenderer<WaveformRendererPreroll>();

src/waveform/widgets/glsimplewaveformwidget.cpp

@@ -17,10 +17,6 @@
 
 GLSimpleWaveformWidget::GLSimpleWaveformWidget(const QString& group, QWidget* parent)
         : GLWaveformWidgetAbstract(group, parent) {
-    qDebug() << "Created WGLWidget. Context"
-             << "Valid:" << isContextValid()
-             << "Sharing:" << isContextSharing();
-
     addRenderer<GLWaveformRenderBackground>();
     addRenderer<WaveformRendererEndOfTrack>();
     addRenderer<WaveformRendererPreroll>();

src/waveform/widgets/glslwaveformwidget.cpp

@@ -38,9 +38,6 @@ GLSLWaveformWidget::GLSLWaveformWidget(
         QWidget* parent,
         GlslType type)
         : GLWaveformWidgetAbstract(group, parent) {
-    qDebug() << "Created WGLWidget. Context"
-             << "Valid:" << isContextValid()
-             << "Sharing:" << isContextSharing();
 
     makeCurrentIfNeeded();
 
@@ -97,15 +94,3 @@ void GLSLWaveformWidget::resize(int width, int height) {
     WaveformWidgetAbstract::resize(width, height);
     doneCurrent();
 }
-
-void GLSLWaveformWidget::mouseDoubleClickEvent(QMouseEvent *event) {
-    if (event->button() == Qt::RightButton) {
-        makeCurrentIfNeeded();
-#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
-        if (m_signalRenderer) {
-            m_signalRenderer->debugClick();
-        }
-#endif // !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
-        doneCurrent();
-    }
-}

src/waveform/widgets/glslwaveformwidget.h

@@ -23,12 +23,9 @@ class GLSLWaveformWidget : public GLWaveformWidgetAbstract {
   protected:
     void castToQWidget() override;
     void paintEvent(QPaintEvent* event) override;
-    void mouseDoubleClickEvent(QMouseEvent *) override;
     mixxx::Duration render() override;
 
   private:
-    GLSLWaveformRendererSignal* m_signalRenderer;
-
     friend class WaveformWidgetFactory;
 };
 

src/waveform/widgets/glvsynctestwidget.cpp

@@ -17,10 +17,6 @@
 
 GLVSyncTestWidget::GLVSyncTestWidget(const QString& group, QWidget* parent)
         : GLWaveformWidgetAbstract(group, parent) {
-    qDebug() << "Created WGLWidget. Context"
-             << "Valid:" << isContextValid()
-             << "Sharing:" << isContextSharing();
-
     addRenderer<GLWaveformRenderBackground>(); // 172 µs
     //  addRenderer<WaveformRendererEndOfTrack>(); // 677 µs 1145 µs (active)
     //  addRenderer<WaveformRendererPreroll>(); // 652 µs 2034 µs (active)

src/waveform/widgets/glwaveformwidget.cpp

@@ -19,10 +19,6 @@
 
 GLWaveformWidget::GLWaveformWidget(const QString& group, QWidget* parent)
         : GLWaveformWidgetAbstract(group, parent) {
-    qDebug() << "Created WGLWidget. Context"
-             << "Valid:" << isContextValid()
-             << "Sharing:" << isContextSharing();
-
     addRenderer<GLWaveformRenderBackground>();
     addRenderer<WaveformRendererEndOfTrack>();
     addRenderer<WaveformRendererPreroll>();

src/waveform/widgets/qtrgbwaveformwidget.cpp

@@ -16,10 +16,6 @@
 
 QtRGBWaveformWidget::QtRGBWaveformWidget(const QString& group, QWidget* parent)
         : GLWaveformWidgetAbstract(group, parent) {
-    qDebug() << "Created WGLWidget. Context"
-             << "Valid:" << isContextValid()
-             << "Sharing:" << isContextSharing();
-
     addRenderer<GLWaveformRenderBackground>();
     addRenderer<WaveformRendererEndOfTrack>();
     addRenderer<WaveformRendererPreroll>();

src/waveform/widgets/qtsimplewaveformwidget.cpp

@@ -18,10 +18,6 @@ QtSimpleWaveformWidget::QtSimpleWaveformWidget(
         const QString& group,
         QWidget* parent)
         : GLWaveformWidgetAbstract(group, parent) {
-    qDebug() << "Created WGLWidget. Context"
-             << "Valid:" << isContextValid()
-             << "Sharing:" << isContextSharing();
-
     addRenderer<GLWaveformRenderBackground>();
     addRenderer<WaveformRendererEndOfTrack>();
     addRenderer<WaveformRendererPreroll>();

src/waveform/widgets/qtvsynctestwidget.cpp

@@ -17,12 +17,7 @@
 
 QtVSyncTestWidget::QtVSyncTestWidget(const QString& group, QWidget* parent)
         : GLWaveformWidgetAbstract(group, parent) {
-    qDebug() << "Created WGLWidget. Context"
-             << "Valid:" << isContextValid()
-             << "Sharing:" << isContextSharing();
-
     addRenderer<QtVSyncTestRenderer>();
-
     m_initSuccess = init();
 }
 

src/waveform/widgets/qtwaveformwidget.cpp

@@ -17,10 +17,6 @@
 
 QtWaveformWidget::QtWaveformWidget(const QString& group, QWidget* parent)
         : GLWaveformWidgetAbstract(group, parent) {
-    qDebug() << "Created WGLWidget. Context"
-             << "Valid:" << isContextValid()
-             << "Sharing:" << isContextSharing();
-
     addRenderer<GLWaveformRenderBackground>();
     addRenderer<WaveformRendererEndOfTrack>();
     addRenderer<WaveformRendererPreroll>();

src/widget/wglwidgetqglwidget.cpp

@@ -20,10 +20,6 @@ bool WGLWidget::isContextValid() const {
     return context()->isValid();
 }
 
-bool WGLWidget::isContextSharing() const {
-    return context()->isSharing();
-}
-
 bool WGLWidget::shouldRender() const {
     return isValid() && isVisible() && windowHandle() && windowHandle()->isExposed();
 }

src/widget/wglwidgetqglwidget.h

@@ -11,10 +11,7 @@ class WGLWidget : public QGLWidget {
     WGLWidget(QWidget* pParent);
 
     bool isContextValid() const;
-    bool isContextSharing() const;
-
     bool shouldRender() const;
-
     void makeCurrentIfNeeded();
 
   protected:

src/widget/wglwidgetqopengl.cpp

@@ -58,10 +58,6 @@ bool WGLWidget::isContextValid() const {
     return m_pOpenGLWindow && m_pOpenGLWindow->context() && m_pOpenGLWindow->context()->isValid();
 }
 
-bool WGLWidget::isContextSharing() const {
-    return true;
-}
-
 void WGLWidget::makeCurrentIfNeeded() {
     if (m_pOpenGLWindow && m_pOpenGLWindow->context() != QOpenGLContext::currentContext()) {
         m_pOpenGLWindow->makeCurrent();

src/widget/wglwidgetqopengl.h

@@ -20,7 +20,6 @@ class WGLWidget : public QWidget {
     ~WGLWidget();
 
     bool isContextValid() const;
-    bool isContextSharing() const;
 
     bool shouldRender() const;
 

src/widget/wspinnybase.cpp

@@ -43,6 +43,7 @@ WSpinnyBase::WSpinnyBase(
           m_pVinylControlEnabled(nullptr),
           m_pSignalEnabled(nullptr),
           m_pSlipEnabled(nullptr),
+          m_pShowCoverProxy(nullptr),
           m_bShowCover(true),
           m_dInitialPos(0.),
           m_iVinylInput(-1),
@@ -73,9 +74,6 @@ WSpinnyBase::WSpinnyBase(
 #endif // __VINYLCONTROL__
     // Drag and drop
     setAcceptDrops(true);
-    qDebug() << "WSpinnyBase(): Created WGLWidget, Context"
-             << "Valid:" << isContextValid()
-             << "Sharing:" << isContextSharing();
 
     CoverArtCache* pCache = CoverArtCache::instance();
     if (pCache) {