summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2017-02-21 11:16:28 -0800
committerDane Springmeyer <dane@mapbox.com>2017-04-07 17:44:11 -0700
commit70a0dfedab63720b061ee13690f605fc15077388 (patch)
tree001ced474e0835150f5db158615dd2d9fbe2e0be
parent6c30e03aa8ab6994e88adcb0241f14b9830d9c30 (diff)
downloadqtlocation-mapboxgl-70a0dfedab63720b061ee13690f605fc15077388.tar.gz
[linux] Don't manually activate context before destroying itnode-v3.4.4-islands2
-rw-r--r--platform/default/headless_backend_osmesa.cpp3
-rw-r--r--platform/linux/src/headless_backend_egl.cpp3
2 files changed, 0 insertions, 6 deletions
diff --git a/platform/default/headless_backend_osmesa.cpp b/platform/default/headless_backend_osmesa.cpp
index 081bddf170..8ec6079bd0 100644
--- a/platform/default/headless_backend_osmesa.cpp
+++ b/platform/default/headless_backend_osmesa.cpp
@@ -12,9 +12,6 @@ struct OSMesaImpl : public HeadlessBackend::Impl {
}
~OSMesaImpl() {
- if (glContext != OSMesaGetCurrentContext()) {
- activateContext();
- }
OSMesaDestroyContext(glContext);
}
diff --git a/platform/linux/src/headless_backend_egl.cpp b/platform/linux/src/headless_backend_egl.cpp
index 87e7c1d0ed..df0ecc8dff 100644
--- a/platform/linux/src/headless_backend_egl.cpp
+++ b/platform/linux/src/headless_backend_egl.cpp
@@ -31,9 +31,6 @@ struct EGLImpl : public HeadlessBackend::Impl {
}
~EGLImpl() {
- if (glContext != eglGetCurrentContext()) {
- activateContext();
- }
if (!eglDestroyContext(display, glContext)) {
throw std::runtime_error("Failed to destroy EGL context.\n");
}