summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2017-02-10 11:23:15 +0100
committerKonstantin Käfer <mail@kkaefer.com>2017-02-10 17:55:57 +0100
commite66f050b99984b23261bb49c770e76ad571ad558 (patch)
tree047a15f1626596cba3a64ced5c33155c8d5715d7
parentb1e623246f3dd6339f9e182fb5650bb4d7060059 (diff)
downloadqtlocation-mapboxgl-e66f050b99984b23261bb49c770e76ad571ad558.tar.gz
[glfw] use newer version that allows automated graphics switching on macOS
-rw-r--r--platform/glfw/glfw_view.cpp2
-rw-r--r--platform/linux/config.cmake2
-rw-r--r--platform/macos/config.cmake2
3 files changed, 4 insertions, 2 deletions
diff --git a/platform/glfw/glfw_view.cpp b/platform/glfw/glfw_view.cpp
index fdf82fda8f..0d83073952 100644
--- a/platform/glfw/glfw_view.cpp
+++ b/platform/glfw/glfw_view.cpp
@@ -42,6 +42,8 @@ GLFWView::GLFWView(bool fullscreen_, bool benchmark_)
height = videoMode->height;
}
+ glfwWindowHint(GLFW_COCOA_GRAPHICS_SWITCHING, GL_TRUE);
+
#ifdef DEBUG
glfwWindowHint(GLFW_OPENGL_DEBUG_CONTEXT, GL_TRUE);
#endif
diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake
index 7f32622596..5f2f41547a 100644
--- a/platform/linux/config.cmake
+++ b/platform/linux/config.cmake
@@ -1,4 +1,4 @@
-mason_use(glfw VERSION 3.2.1)
+mason_use(glfw VERSION 2017-02-09-77a8f10)
mason_use(mesa VERSION 13.0.4)
mason_use(boost_libprogram_options VERSION 1.62.0${MASON_CXXABI_SUFFIX})
mason_use(sqlite VERSION 3.14.2)
diff --git a/platform/macos/config.cmake b/platform/macos/config.cmake
index 46357d7d73..6ccec6465f 100644
--- a/platform/macos/config.cmake
+++ b/platform/macos/config.cmake
@@ -1,6 +1,6 @@
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.10)
-mason_use(glfw VERSION 3.2.1)
+mason_use(glfw VERSION 2017-02-09-77a8f10)
mason_use(boost_libprogram_options VERSION 1.62.0)
mason_use(gtest VERSION 1.8.0)
mason_use(benchmark VERSION 1.0.0-1)