diff options
author | Mike Morris <michael.patrick.morris@gmail.com> | 2014-09-16 18:00:52 -0400 |
---|---|---|
committer | Mike Morris <michael.patrick.morris@gmail.com> | 2014-09-16 18:00:52 -0400 |
commit | 9d369ec742f00e35fea97fe24415ecaaaad1f01a (patch) | |
tree | 2b8872a2a53d5eb72917b37895dd5598ff556d30 | |
parent | 70aaf8d343ab0dc80993038bd13148b20de0b83e (diff) | |
download | qtlocation-mapboxgl-9d369ec742f00e35fea97fe24415ecaaaad1f01a.tar.gz |
dont make_active when clearing buffers, call make_inactive at end of Map::prepare()
-rw-r--r-- | common/headless_view.cpp | 4 | ||||
-rw-r--r-- | src/map/map.cpp | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/common/headless_view.cpp b/common/headless_view.cpp index 355206a3ee..c2e402c0b6 100644 --- a/common/headless_view.cpp +++ b/common/headless_view.cpp @@ -113,8 +113,6 @@ void HeadlessView::resize(int width, int height) { } void HeadlessView::clear_buffers() { - make_active(); - #if MBGL_USE_CGL glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); @@ -181,8 +179,6 @@ void HeadlessView::make_active() { } void HeadlessView::make_inactive() { - clear_buffers(); - #if MBGL_USE_CGL CGLError error = CGLSetCurrentContext(nullptr); if (error) { diff --git a/src/map/map.cpp b/src/map/map.cpp index 10310ee165..64940af9e2 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -154,7 +154,6 @@ void Map::cleanup(uv_async_t *async, int status) { void Map::terminate() { view.make_active(); painter.terminate(); - view.make_inactive(); } void Map::render(uv_async_t *async, int status) { @@ -545,6 +544,8 @@ void Map::prepare() { spriteAtlas->update(*getSprite()); updateTiles(); + + view.make_inactive(); } void Map::render() { |