From 4936fd47091b0e1ef6fa7c06eac9f23f2f7ef259 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 25 Aug 2020 00:56:42 -0700 Subject: [PATCH] mac ui kind of works (#2079) old-commit-hash: 7956bb6883c75d97ca823d33c038841ef9e9e679 --- Dockerfile.openpilot_base | 1 - selfdrive/ui/qt/ui.cc | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile.openpilot_base b/Dockerfile.openpilot_base index 06e2a95a09..4cec8a36a7 100644 --- a/Dockerfile.openpilot_base +++ b/Dockerfile.openpilot_base @@ -21,7 +21,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libffi-dev \ libglew-dev \ libgles2-mesa-dev \ - libglfw3-dev \ libglib2.0-0 \ liblzma-dev \ libomp-dev \ diff --git a/selfdrive/ui/qt/ui.cc b/selfdrive/ui/qt/ui.cc index 40ade50df0..2948a805a1 100644 --- a/selfdrive/ui/qt/ui.cc +++ b/selfdrive/ui/qt/ui.cc @@ -5,7 +5,13 @@ int main(int argc, char *argv[]) { 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); QApplication a(argc, argv);