qt/util.h : add new function setQtSurfaceFormat (#21206)

old-commit-hash: 9429bd2783

selfdrive/ui/main.cc

@@ -3,18 +3,11 @@
 
 #include "selfdrive/hardware/hw.h"
 #include "selfdrive/ui/qt/qt_window.h"
+#include "selfdrive/ui/qt/util.h"
 #include "selfdrive/ui/qt/window.h"
 
 int main(int argc, char *argv[]) {
-  QSurfaceFormat fmt;
+  setQtSurfaceFormat();
-#ifdef __APPLE__
-  fmt.setVersion(3, 2);
-  fmt.setProfile(QSurfaceFormat::OpenGLContextProfile::CoreProfile);
-  fmt.setRenderableType(QSurfaceFormat::OpenGL);
-#else
-  fmt.setRenderableType(QSurfaceFormat::OpenGLES);
-#endif
-  QSurfaceFormat::setDefaultFormat(fmt);
 
   if (Hardware::EON()) {
     QApplication::setAttribute(Qt::AA_ShareOpenGLContexts);

selfdrive/ui/qt/spinner.cc

@@ -12,6 +12,7 @@
 
 #include "selfdrive/hardware/hw.h"
 #include "selfdrive/ui/qt/qt_window.h"
+#include "selfdrive/ui/qt/util.h"
 
 TrackWidget::TrackWidget(QWidget *parent) : QWidget(parent) {
   setFixedSize(spinner_size);
@@ -114,15 +115,7 @@ void Spinner::update(int n) {
 }
 
 int main(int argc, char *argv[]) {
-  QSurfaceFormat fmt;
+  setQtSurfaceFormat();
-#ifdef __APPLE__
-  fmt.setVersion(3, 2);
-  fmt.setProfile(QSurfaceFormat::OpenGLContextProfile::CoreProfile);
-  fmt.setRenderableType(QSurfaceFormat::OpenGL);
-#else
-  fmt.setRenderableType(QSurfaceFormat::OpenGLES);
-#endif
-  QSurfaceFormat::setDefaultFormat(fmt);
 
   Hardware::set_display_power(true);
   Hardware::set_brightness(65);

selfdrive/ui/qt/util.h

@@ -42,3 +42,15 @@ inline QString timeAgo(const QDateTime &date) {
 
   return s;
 }
+
+inline void setQtSurfaceFormat() {
+  QSurfaceFormat fmt;
+#ifdef __APPLE__
+  fmt.setVersion(3, 2);
+  fmt.setProfile(QSurfaceFormat::OpenGLContextProfile::CoreProfile);
+  fmt.setRenderableType(QSurfaceFormat::OpenGL);
+#else
+  fmt.setRenderableType(QSurfaceFormat::OpenGLES);
+#endif
+  QSurfaceFormat::setDefaultFormat(fmt);
+}