Revert "qt: Disable OpenGL 3.0 renderer for macOS."

This reverts commit d3b00ff27b.

src/qt/CMakeLists.txt

@@ -49,6 +49,13 @@ add_library(ui STATIC
     qt_softwarerenderer.hpp
     qt_hardwarerenderer.cpp
     qt_hardwarerenderer.hpp
+    qt_openglrenderer.cpp
+    qt_openglrenderer.hpp
+    qt_opengloptions.cpp
+    qt_opengloptions.hpp
+    qt_opengloptionsdialog.cpp
+    qt_opengloptionsdialog.hpp
+    qt_opengloptionsdialog.ui
 
     qt_settings.cpp
     qt_settings.hpp
@@ -130,19 +137,6 @@ add_library(ui STATIC
     ../qt_resources.qrc
 )
 
-if(NOT APPLE)
-    target_sources(ui PRIVATE
-        qt_openglrenderer.cpp
-        qt_openglrenderer.hpp
-        qt_opengloptions.cpp
-        qt_opengloptions.hpp
-        qt_opengloptionsdialog.cpp
-        qt_opengloptionsdialog.hpp
-        qt_opengloptionsdialog.ui
-    )
-else()
-    target_sources(ui PRIVATE qt_opengldummy.hpp)
-endif()
 
 if(WIN32)
     enable_language(RC)

src/qt/qt_mainwindow.cpp

@@ -231,9 +231,6 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->actionHardware_Renderer_OpenGL_ES->setVisible(QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGLES);
     if (QOpenGLContext::openGLModuleType() != QOpenGLContext::LibGLES && vid_api == 2) vid_api = 1;
 #endif
-#ifdef Q_OS_MACOS
-    ui->actionOpenGL_3_0_Core->setVisible(false);
-#endif
 
     if (QApplication::platformName().contains("eglfs") && vid_api >= 1) {
         fprintf(stderr, "OpenGL renderers are unsupported on EGLFS.\n");

src/qt/qt_opengldummy.hpp

@@ -1,40 +0,0 @@
-#ifndef QT_OPENGLDUMMY_HPP
-#define QT_OPENGLDUMMY_HPP
-
-#include <QResizeEvent>
-#include <QWidget>
-#include <QWindow>
-
-#include <atomic>
-#include <tuple>
-#include <vector>
-
-#include "qt_renderercommon.hpp"
-
-/* Dummy implementation of OpenGLRenderer so macOS builds. */
-class OpenGLRenderer : public QWindow, public RendererCommon {
-    Q_OBJECT
-public:
-    OpenGLRenderer(QWidget *parent = nullptr) { emit errorInitializing(); }
-    virtual std::vector<std::tuple<uint8_t *, std::atomic_flag *>> getBuffers() { return std::vector<std::tuple<uint8_t *, std::atomic_flag *>>(); }
-
-signals:
-    void initialized();
-    void errorInitializing();
-
-public slots:
-    void onBlit(int buf_idx, int x, int y, int w, int h) { }
-
-protected:
-    void exposeEvent(QExposeEvent *event) override
-    {
-        if (!done)
-            emit errorInitializing();
-        done = true;
-    }
-
-private:
-    bool done = false;
-};
-
-#endif

src/qt/qt_rendererstack.cpp

@@ -22,13 +22,8 @@
 #include "ui_qt_rendererstack.h"
 
 #include "qt_hardwarerenderer.hpp"
-#include "qt_softwarerenderer.hpp"
-
-#ifndef Q_OS_MACOS
 #include "qt_openglrenderer.hpp"
-#else
+#include "qt_softwarerenderer.hpp"
-#    include "qt_opengldummy.hpp"
-#endif
 
 #include "qt_mainwindow.hpp"
 #include "qt_util.hpp"
@@ -36,7 +31,6 @@
 #include "evdev_mouse.hpp"
 
 #include <QScreen>
-#include <QTimer>
 
 #ifdef __APPLE__
 #    include <CoreGraphics/CoreGraphics.h>