Ensure the default OpenGL profile exceeds our minimum

graphia-app · Oct 11, 2023 · fc11f21 · fc11f21
1 parent 007c876
commit fc11f21
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/source/app/main.cpp b/source/app/main.cpp
@@ -288,6 +288,8 @@ int start(int argc, char *argv[], ConsoleOutputFiles& consoleOutputFiles)
         return 1;
     }
 
+    OpenGLFunctions::requestMinimumFormat();
+
     configureXDG();
 
     qRegisterMetaType<size_t>("size_t");

diff --git a/source/app/rendering/openglfunctions.cpp b/source/app/rendering/openglfunctions.cpp
@@ -57,6 +57,17 @@ QSurfaceFormat OpenGLFunctions::minimumFormat()
     return format;
 }
 
+void OpenGLFunctions::requestMinimumFormat()
+{
+    auto defaultFormat = QSurfaceFormat::defaultFormat();
+    std::pair<int, int> defaultVersion = {defaultFormat.majorVersion(), defaultFormat.minorVersion()};
+    auto requestFormat = minimumFormat();
+    std::pair<int, int> requestVersion = {requestFormat.majorVersion(), requestFormat.minorVersion()};
+
+    if(defaultVersion < requestVersion)
+        QSurfaceFormat::setDefaultFormat(requestFormat);
+}
+
 class QueryFunctions
 {
 private:

diff --git a/source/app/rendering/openglfunctions.h b/source/app/rendering/openglfunctions.h
@@ -52,6 +52,7 @@ class OpenGLFunctions : public QOpenGLFunctions_3_3_Core
     static QString info();
 
     static QSurfaceFormat minimumFormat();
+    static void requestMinimumFormat();
 
 private:
     PFNGLMINSAMPLESHADINGARBPROC _glMinSampleShadingARBFnPtr = nullptr;