summaryrefslogtreecommitdiff
path: root/common/headless_view.cpp
diff options
context:
space:
mode:
authorMike Morris <michael.patrick.morris@gmail.com>2014-09-10 18:53:20 -0400
committerMike Morris <michael.patrick.morris@gmail.com>2014-09-10 18:53:20 -0400
commit15564b81a37e097b52d1751b99dc91d36d37d66e (patch)
tree521a1949a89e55e6dbfb0dd7080e5bcdab1aac95 /common/headless_view.cpp
parent4316d2c40585e3d0dcdb25fa6f2341531025e20e (diff)
parent7a4c914d05cab81ca55ac3cde478997c6d32477e (diff)
downloadqtlocation-mapboxgl-15564b81a37e097b52d1751b99dc91d36d37d66e.tar.gz
Merge branch 'fix-context-shutdown-merge' into libuv-0.10-fix-context-shutdown
Conflicts: src/map/map.cpp
Diffstat (limited to 'common/headless_view.cpp')
-rw-r--r--common/headless_view.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/common/headless_view.cpp b/common/headless_view.cpp
index 0fce223986..0b4d7ce64a 100644
--- a/common/headless_view.cpp
+++ b/common/headless_view.cpp
@@ -181,6 +181,19 @@ void HeadlessView::make_active() {
#endif
}
+void HeadlessView::make_inactive() {
+#if MBGL_USE_CGL
+ CGLError error = CGLSetCurrentContext(nullptr);
+ if (error) {
+ fprintf(stderr, "Removing OpenGL context failed\n");
+ }
+#endif
+
+#if MBGL_USE_GLX
+ // no-op
+#endif
+}
+
void HeadlessView::swap() {}
unsigned int HeadlessView::root_fbo() {