Qt: fix OpenGL initialization on macOS

nba-emu · Dec 20, 2021 · 115bac1 · 115bac1
1 parent 7062818
commit 115bac1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -89,7 +89,7 @@ jobs:
       - name: Collect artifacts
         run: |
           mkdir upload
-          cp -r build/bin/sdl/{NanoBoyAdvance,config.toml,keymap.toml,shaders} upload
+          cp -r build/bin/qt/{NanoBoyAdvance,config.toml} upload
       - name: Upload artifacts
         uses: actions/upload-artifact@v2
         with:

diff --git a/src/platform/qt/src/main.cpp b/src/platform/qt/src/main.cpp
@@ -6,6 +6,7 @@
  */
 
 #include <QApplication>
+#include <QSurfaceFormat>
 #include <stdlib.h>
 
 #include "widget/main_window.hpp"
@@ -14,6 +15,14 @@ int main(int argc, char** argv) {
   // See: https://trac.wxwidgets.org/ticket/19023
 #if defined(__APPLE__)
   setenv("LC_NUMERIC", "C", 1);
+
+  // On macOS QSurfaceFormat::setDefaultFormat() must be called before constructing the QApplication.
+  auto format = QSurfaceFormat{};
+  format.setProfile(QSurfaceFormat::CoreProfile);
+  format.setMajorVersion(3);
+  format.setMinorVersion(3);
+  format.setSwapInterval(0);
+  QSurfaceFormat::setDefaultFormat(format);
 #endif
 
   QApplication app{ argc, argv };