summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMike Morris <michael.patrick.morris@gmail.com>2014-09-19 16:16:44 -0400
committerMike Morris <michael.patrick.morris@gmail.com>2014-09-19 16:16:44 -0400
commit65df83ce4c0ccb410f3d6a9841aeea621483f0be (patch)
tree672295d4811baaeff02230184bea69df1271f03e /common
parentd48e5e72213851e4ffb443eae1b6243f491682c3 (diff)
downloadqtlocation-mapboxgl-65df83ce4c0ccb410f3d6a9841aeea621483f0be.tar.gz
bump mapnik-packaging, remove unnecessary view.make_active calls
Diffstat (limited to 'common')
-rw-r--r--common/headless_view.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/common/headless_view.cpp b/common/headless_view.cpp
index 8ea1b13709..4ad22da9a5 100644
--- a/common/headless_view.cpp
+++ b/common/headless_view.cpp
@@ -106,10 +106,7 @@ void HeadlessView::resize(int width, int height) {
#if MBGL_USE_GLX
x_pixmap = XCreatePixmap(x_display, DefaultRootWindow(x_display), width, height, 32);
glx_pixmap = glXCreateGLXPixmap(x_display, x_info, x_pixmap);
-
- make_active();
#endif
-
}
void HeadlessView::clear_buffers() {
@@ -132,6 +129,8 @@ void HeadlessView::clear_buffers() {
glDeleteRenderbuffersEXT(1, &fbo_depth_stencil);
fbo_depth_stencil = 0;
}
+
+ make_inactive();
#endif
#if MBGL_USE_GLX